saurabhbhatia d47b300dcf Import Data, Sync Data ...

Conflicts:

	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

2013-10-18 12:02:48 +08:00

..

environments

icons and theme minicolors fixed

2013-08-12 12:28:32 +08:00

initializers

Change ckeditor gem and kaminari in gemfile

2013-07-22 17:26:32 +08:00

locales

fixes in sitemap, site preference

2013-10-14 16:48:50 +08:00

application.rb

New authorization

2013-08-21 13:42:29 +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

Added Enable and disable terms of use, sitemap

2013-10-11 13:14:37 +00:00

mongoid.yml

Import Data, Sync Data

2013-10-18 12:02: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

2013-10-18 12:02:48 +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