chris b40d4702d5 Merge branch 'master' into various_bugs ... Conflicts: config/locales/en.yml config/locales/zh_tw.yml vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb		2012-11-06 11:44:00 +08:00
..
admin	Merge branch 'master' into various_bugs	2012-11-06 11:44:00 +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	Desktop Widgtes updates..	2012-11-06 10:36:34 +08:00
desktop_orbit_controller.rb	design update	2012-09-12 01:58:23 +08:00
desktop_publications_controller.rb	Desktop Widgtes updates..	2012-11-06 10:36:34 +08:00
desktop_research_controller.rb	Page added for desktop	2012-08-20 23:17:31 +08:00
desktop_widgets_controller.rb	Desktop Widgtes updates..	2012-11-06 10:36:34 +08:00
gridfs_controller.rb	Multi language and side bar update	2012-08-20 23:14:11 +08:00
orbit_backend_controller.rb	Fix bug: Fix the bug due to not finding the ModuleApp	2012-10-30 17:10:59 +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	update for desktop widgets	2012-11-05 11:40:11 +08:00
pages_controller.rb	first version for new member html	2012-09-14 00:02:21 +08:00