devin chen 9963395b05 'select2' minor update ... Conflicts: app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak		2013-07-30 16:42:40 +08:00
..
environments	'select2' minor update	2013-07-30 16:42:40 +08:00
initializers	Change ckeditor gem and kaminari in gemfile	2013-07-22 17:26:32 +08:00
locales	Breadcrumb for dashboard (tags and categories cannot link to original module index)	2013-07-29 17:34:03 +08:00
application.rb	Change ckeditor gem and kaminari in gemfile	2013-07-22 17:26:32 +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	change logger	2013-05-14 10:29:11 +08:00
ldap.yml	merge	2012-10-01 21:09:09 +08:00
list.yml	New widget for tag cloud	2013-06-06 17:17:45 +08:00
mongoid.yml	Remove some css causing errors in precompile	2013-07-25 13:15:49 +08:00
resque.god	add god to monit sold	2013-06-20 17:50:18 +08:00
resque_schedule.god	add god to monit sold	2013-06-20 17:50:18 +08:00
resque_schedule.yml	system preference	2013-04-24 19:21:11 +08:00
routes.rb	solved desktop conflict during cherry pick	2013-07-30 16:42:26 +08:00
solr.god	fix solr setting	2013-06-20 17:50:18 +08:00
sunspot.yml	remove useless setting for solar	2013-06-20 17:50:18 +08:00