Matthew K. Fu JuYuan 49e6c33b57 Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config ... Conflicts: app/controllers/admin/object_auths_new_interface_controller.rb app/views/layouts/_side_bar_content.html.erb config/locales/zh_tw.yml config/routes.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb vendor/built_in_modules/announcement/init.rb vendor/built_in_modules/archive/init.rb vendor/built_in_modules/miss_module/config/locales/zh_tw.yml		2012-12-25 11:01:36 +08:00
..
environments	Fix bugs on 172:180	2012-08-08 17:56:00 +08:00
initializers	correct user passwd and sent json to front-end	2012-12-04 00:31:06 +08:00
locales	Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config	2012-12-25 11:01:36 +08:00
application.rb	Add path for i18n	2012-12-06 17:27:36 +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	put module app json into init,making orbit app work with module app.	2012-12-24 16:23:16 +08:00
mongoid.yml	first version of confined sidebar render	2012-12-24 16:17:00 +08:00
resque.god	merge	2012-10-01 21:09:09 +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
routes.rb	Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config	2012-12-25 11:01:36 +08:00
sunspot.yml	merge	2012-10-01 21:09:09 +08:00