This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
environments	Fix bugs on 172:180	2012-08-08 17:56:00 +08:00
initializers	Merge branch 'various_bugs' into nccu_master	2012-10-29 16:10:07 +08:00
locales	Merge branch 'master' into various_bugs	2012-11-06 11:44:00 +08:00
application.rb	update for desktop widgets	2012-11-05 11:40:11 +08:00
boot.rb	…
config.yml	…
database.yml.example	…
environment.rb	…
ldap.yml	merge	2012-10-01 21:09:09 +08:00
list.yml	add new member with role interface. add more not usable.	2012-11-04 20:42:58 +08:00
mongoid.yml	Fix after merge from NCCU, the translations still need to be cleaned	2012-10-30 11:08:26 +08:00
resque.god	merge	2012-10-01 21:09:09 +08:00
resque_schedule.god	…
resque_schedule.yml	…
routes.rb	Merge branch 'master' into various_bugs	2012-11-06 11:44:00 +08:00
sunspot.yml	merge	2012-10-01 21:09:09 +08:00