orbit-basic/config
Matthew K. Fu JuYuan b4a2737407 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts:
	app/helpers/attribute_fields_helper.rb
	app/views/admin/infos/_form.html.erb
	config/locales/zh_tw.yml
2012-11-16 15:42:39 +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 address field. js and style is broken 2012-11-12 10:41:41 +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 address field. js and style is broken 2012-11-12 10:41:41 +08:00
mongoid.yml Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 2012-11-16 15:42:39 +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 'master' into various_bugs 2012-11-06 11:44:00 +08:00
sunspot.yml merge 2012-10-01 21:09:09 +08:00