Christophe Vilayphiou f9c5ee5d18 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard ...

Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
	vendor/built_in_modules/announcement/config/routes.rb

2012-03-27 18:37:14 +08:00

..

.DS_Store

adding files not commited from previous commit

2011-07-12 16:02:41 +08:00

ad_banner.js

fix js bugs,partial bugs

2012-02-06 16:17:07 +08:00

admin.js

Integration of pop-up and generic js.erb

2011-12-28 20:49:53 +08:00

ajax_form.js

Integration of pop-up and generic js.erb

2011-12-28 20:49:53 +08:00

application.js

Modify assets

2011-12-05 09:54:41 +08:00

attribute_form.js.erb

Merge with sub_roles

2011-12-23 18:34:21 +08:00

bootstrap.js

fix announcement & links

2012-03-27 14:19:58 +08:00

bulletin_form.js.erb

Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard

2012-03-27 18:37:14 +08:00

design.js

Modify assets

2011-12-05 09:54:41 +08:00

devise.js.erb

Changes for orbit bar, login

2012-02-19 16:33:22 +08:00

event.js

Add RSS event

2012-02-28 18:29:13 +08:00

html5.js

Changes for IE9 with html5

2012-03-21 15:51:55 +08:00

jquery.form.js

Integration of pop-up and generic js.erb

2011-12-28 20:49:53 +08:00

jquery.isotope.min.js

Add isotope, categories for announcement page, sort for announcement

2012-02-23 15:52:58 +08:00

jquery.tinyscrollbar.min.js

Orbit-bar in front-end and back-end, side-bar and drop-down menu

2012-02-15 00:34:22 +08:00

new_admin.js

Put tinymce in its own js file.

2012-03-21 12:41:32 +08:00

orbit_bar.js

Changes for orbit bar, login

2012-02-19 16:33:22 +08:00

orbit-1.0.js

Remove quick_edit on bulletin index load

2012-03-23 17:32:59 +08:00

page_edit.js

Add isotope, categories for announcement page, sort for announcement

2012-02-23 15:52:58 +08:00

plugin.js

Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD

2011-10-20 10:06:06 +08:00

rc.js

Ray's modification before redesign

2012-01-24 11:57:27 +08:00

rss.js

Ray's modification before redesign

2012-01-24 11:57:27 +08:00

side_bar_history.js

Fix missing modification for "panel_main" to "back_main"

2011-12-29 17:49:48 +08:00

site_editor.js

Fix bugs and changes for nccu

2012-02-27 18:50:56 +08:00

tinymce_orbit.js

Put tinymce in its own js file.

2012-03-21 12:41:32 +08:00

translation_page.js

Remove js from html

2011-12-05 10:36:25 +08:00

user_form.js

Merge with sub_roles

2011-12-23 18:34:21 +08:00