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

..

inc

clean up unless code

2012-05-22 14:59:54 +08:00

lib

Fix for banner on ie

2012-08-13 15:10:53 +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.erb

Add i18n for message in editor pop-up

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

application.js

first version of fb_share

2012-08-08 11:04:19 +08:00

attribute_form.js.erb

Merge with sub_roles

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

bootstrap.js

Fix js for ie in list

2012-08-16 01:09:45 +08:00

bulletin_form.js.erb

nccu fix

2012-08-13 18:35:47 +08:00

design.js

Modify assets

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

desktop.js

Timeline ajax loading

2012-07-02 21:06:36 +08:00

desktopload.js.erb

Dock change and getting values from db

2012-04-06 17:49:22 +08:00

devise.js.erb

Changes for orbit bar, login

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

event.js

Ray's changes

2012-05-09 04:15:02 +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.miniColors.min.js

custom theme settings

2012-04-10 17:44:36 +08:00

jquery.mu.image.resize.degsin.js

demo site widget

2012-07-26 16:39:29 +08:00

jquery.mu.image.resize.js

demo site widget

2012-07-26 16:39:29 +08:00

jquery.tinyscrollbar.js

tinyscrollbar extension

2012-08-20 23:11:32 +08:00

jquery.tinyscrollbar.min.js

Ray's changes for structure and web_links

2012-04-27 11:02:56 +08:00

module.js.erb

Changes for widgets

2012-05-13 21:55:39 +08:00

new_admin.js

Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie

2012-08-08 10:53:04 +08:00

news_bulletin_form.js.erb

nccu fix

2012-08-13 18:35:47 +08:00

orbit_bar.js

Ray's changes

2012-05-04 19:11:28 +08:00

orbit-1.0.js

Ray's changes

2012-05-04 19:11:28 +08:00

orbit-bar-member.js

Ray's changes in tags, css and js

2012-04-02 02:55:36 +08:00

orbit-bar-search.js

Ray's changes

2012-05-04 19:11:28 +08:00

orbitdesktop.js

Page added for desktop

2012-08-20 23:17:31 +08:00

orbitdesktopAPI.js

Timeline design and timescale update

2012-07-06 16:11:03 +08:00

orbitTimeline.js

Scroll down fixes

2012-07-09 16:11:31 +08:00

page_edit.js.erb

demo site widget

2012-07-26 16:39:29 +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

authorization

2012-08-20 23:18:50 +08:00

side_bar_history.js

Changes for structure

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

site_editor.js

Add drag and drop to structure side_bar

2012-05-11 10:00:45 +08:00

sort_header.js.erb

Fix js for ie in list

2012-08-16 01:09:45 +08:00

tinymce_orbit.js.erb

Merge branch 'nccu_master' into demo_site

2012-08-22 18:07:49 +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