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

rails 3.1 and designs (with bug)

2011-07-12 16:00:57 +08:00

config.yml

close alpha on nccu

2012-03-20 14:38:01 +08:00

database.yml.example

Add admin/pages scaffold and basic page render

2009-05-08 01:18:16 +08:00

environment.rb

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

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_schedule.god

add rescue job . can work with init script

2012-06-29 17:42:36 +08:00

resque_schedule.yml

fix over queue at resque

2012-07-03 10:51:26 +08:00

resque.god

merge

2012-10-01 21:09:09 +08:00

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