This repository has been archived on 2024-03-16. You can view files and clone it. You cannot open issues or pull requests or push a commit.

saurabhbhatia 43da2eca79 Import Data, Sync Data ...

Conflicts:
	config/mongoid.yml
	vendor/built_in_modules/personal_book/app/models/writing_book.rb
	vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
	vendor/built_in_modules/personal_journal/app/models/writing_journal.rb

2014-01-13 15:57:48 +08:00

..

environments

Changed production settings for sendgrid

2014-01-03 09:44:46 +08:00

initializers

Fixed Forgot password

2014-01-02 17:53:05 +08:00

locales

new ui add setting to show in the member frontend

2014-01-03 16:35:52 +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

Import Data, Sync Data

2014-01-13 15:57:48 +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

resque.god

add god to monit sold

2013-06-20 17:50:18 +08:00

routes.rb

Import Data, Sync Data

2014-01-13 15:57:48 +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