This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.
orbit-4-1/app
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
..
assets new ui add setting to show in the member frontend 2014-01-03 16:35:52 +08:00
controllers Import Data, Sync Data 2014-01-13 15:57:48 +08:00
errors show error message when trying to show a not existed page 2013-01-03 13:50:27 +08:00
helpers Fix missing CSS and removed useless bad gems that cause error 2014-01-13 15:43:51 +08:00
jobs ask module: dropdown, icon, big5 encoding, redirect, admin, send mail 2013-06-07 13:03:59 +08:00
mailer Channel Videos Mobile Sites Partial 2013-12-03 15:50:27 +08:00
models Fix for submenu automation 2014-01-07 17:56:58 +08:00
uploaders Review of the uploaders 2013-10-20 16:07:20 +08:00
views Import Data, Sync Data 2014-01-13 15:57:48 +08:00