chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master ...

Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb

2012-10-29 16:10:07 +08:00

..

admin

Merge branch 'various_bugs' into nccu_master

2012-10-29 16:10:07 +08:00

application_controller.rb

Merge branch 'various_bugs' into nccu_master

2012-10-29 16:10:07 +08:00

desktop_appstore_controller.rb

new page add and timeline changes

2012-06-28 17:31:48 +08:00

desktop_controller.rb

Gallery started.

2012-08-20 23:14:10 +08:00

desktop_orbit_controller.rb

design update

2012-09-12 01:58:23 +08:00

desktop_publications_controller.rb

design update

2012-09-12 01:58:23 +08:00

desktop_research_controller.rb

Page added for desktop

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

gridfs_controller.rb

Multi language and side bar update

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

orbit_backend_controller.rb

guest user

2012-09-12 16:20:15 +08:00

orbit_frontend_component_controller.rb

Changes for widgets

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

orbit_frontend_controller.rb

First version for App and Object auth.Taking Announcement as experiment

2012-02-29 18:55:55 +08:00

orbit_widget_controller.rb

Change Obit to Orbit

2012-03-16 11:54:31 +08:00

otheraccounts_controller.rb

few experiments…

2012-05-16 11:18:54 +08:00

pages_controller.rb

first version for new member html

2012-09-14 00:02:21 +08:00