Harry Bomrah b10a2edc22 redirects are ok now ... Conflicts: app/controllers/application_controller.rb app/controllers/confirmations_controller.rb		2013-11-29 18:52:57 +08:00
..
environments	Updated Production Settings with Sendgrid	2013-11-29 16:39:27 +08:00
initializers	Updated Remember me, and Homepage widget more link	2013-11-11 17:23:03 +08:00
locales	Enable Mobile Added to Site preferences	2013-11-20 16:21:05 +08:00
application.rb	changes for ad_banner	2013-10-19 19:17:04 +08:00
boot.rb	rails 3.1 and designs (with bug)	2011-07-12 16:00:57 +08:00
config.yml	new code logic for saving tree.. should work fine even if the node positions fail	2013-11-04 22:20:50 +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	Added Enable and disable terms of use, sitemap	2013-10-11 13:14:37 +00:00
mongoid.yml	more button works according to categories	2013-11-15 22:35:20 +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	redirects are ok now	2013-11-29 18:52:57 +08:00
solr.god	fix solr setting	2013-06-20 17:50:18 +08:00
sunspot.yml	Changed config/sunspot.yml to be compatible with sunspot v2.1.0	2013-11-19 16:58:37 +08:00