saurabhbhatia 72861f05a6 Merge branch 'development' of https://github.com/Rulingcom/orbit into development ... Conflicts: config/mongoid.yml		2013-07-09 14:40:39 +08:00
..
environments	Remove Syslog	2013-06-14 15:30:22 +08:00
initializers	from now on the rescue namespace will be decided by site object field: resque_namespace	2013-06-20 17:50:17 +08:00
locales	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
application.rb	fronted open switch and backend openness	2013-04-23 18:48:18 +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	fix object de-authorize failed.	2013-06-26 12:28:00 +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	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +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