Matthew K. Fu JuYuan 3d573680b2 Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config ... Conflicts: app/models/user/attribute_value.rb app/views/layouts/_side_bar_content.html.erb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb		2012-11-26 17:55:53 +08:00
..
environments	Fix bugs on 172:180	2012-08-08 17:56:00 +08:00
initializers	Remove middle site	2012-11-20 10:06:07 +08:00
locales	address field. js and style is broken	2012-11-20 09:53:36 +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-20 09:53:36 +08:00
mongoid.yml	user roles starts	2012-11-22 21:10:35 +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	member selects	2012-11-26 10:25:34 +08:00
sunspot.yml	merge	2012-10-01 21:09:09 +08:00