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

..

_asset.html.erb

Remove i18n_variable for views

2012-07-27 19:13:39 +08:00

_edit.html.erb

Asset upload

2012-05-17 06:28:29 +08:00

_filter.html.erb

Change assets

2012-05-16 11:07:11 +08:00

_form.html.erb

Add time to announcement quick edit

2012-08-14 14:38:21 +08:00

_new.html.erb

Asset upload

2012-05-17 06:28:29 +08:00

_sort_headers.html.erb

Move delete checkboxes to js

2012-08-14 00:59:01 +08:00

create.html.erb

fix for ie8,9 for tinymce

2012-08-07 20:55:18 +08:00

create.js.erb

Merge branch 'nccu_master' into demo_site

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

edit.html.erb

Integration of pop-up and generic js.erb

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

file_upload.html.erb

form validation again

2012-08-14 01:02:45 +08:00

index.html.erb

Move delete checkboxes to js

2012-08-14 00:59:01 +08:00

index.js.erb

Asset upload

2012-05-17 06:28:29 +08:00

new.html.erb

popup fix..

2012-05-16 15:33:54 +08:00