chris 7d5531bf01 Merge branch 'nccu_master' into demo_site ...

Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb

2012-08-22 18:07:49 +08:00

..

_app_selector.html.erb

Fix parser_back_end & side_bar & meta

2012-03-30 15:51:29 +08:00

_edit.html.erb

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

2012-05-13 23:14:13 +08:00

_form.html.erb

Merge branch 'nccu_master' into demo_site

2012-08-22 18:07:49 +08:00

_frontend_fields.html.erb

widget & frontend field

2012-08-09 15:25:30 +08:00

_new.html.erb

Changes for structure

2012-05-22 14:45:49 +08:00

_show.html.erb

Changes for js and ccs load for site's pages

2012-04-26 01:49:02 +08:00

_themes_ddl.html.erb

structure.css -> default.css

2011-09-05 15:18:36 +08:00

create.js.erb

Fix missing modification for "panel_main" to "back_main"

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

delete.html.erb

Delete page.

2011-06-01 12:00:41 +08:00

delete.js.erb

Changes for structure

2012-05-22 14:45:49 +08:00

edit.html.erb

Merge with branch november_presentation

2011-12-01 13:50:49 +08:00

edit.js.erb

Fix missing modification for "panel_main" to "back_main"

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

new.html.erb

Items UI changes

2011-06-10 13:57:42 +08:00

new.js.erb

Fix missing modification for "panel_main" to "back_main"

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

reload_themes.js.erb

structure.css -> default.css

2011-09-05 15:18:36 +08:00

show.html.erb

Fix for structure js and css

2012-04-25 18:41:38 +08:00

show.js.erb

Fix missing modification for "panel_main" to "back_main"

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

update.js.erb

Fix missing modification for "panel_main" to "back_main"

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