Orbit/app
saurabhbhatia 7990d4388c Import Announcements, Journal Paper, Conference Data, book data
Conflicts:
	app/models/user/user.rb

Updated import data controller to check for blank user_id

Updated import data controller to check the absense of title data

Updated route to get announcement data

Conflicts:
	config/routes.rb

Updated import data controller

Updated import data controller to import data correctly

Added method for importing page data

Updated import data with pages working

Updated Import data with page data importing successfully

Updated import controller

Updated import data to get complete teacher and announcement data
2013-09-26 14:45:42 +08:00
..
assets brief added to desktop for all plugins 2013-09-25 18:23:44 +08:00
controllers Import Announcements, Journal Paper, Conference Data, book data 2013-09-26 14:45:42 +08:00
errors show error message when trying to show a not existed page 2013-01-03 13:50:27 +08:00
helpers filemanager and some update for file uploader . added file uploader to kernel 2013-09-11 14:03:06 +08:00
jobs ask module: dropdown, icon, big5 encoding, redirect, admin, send mail 2013-06-07 13:03:59 +08:00
mailer Add mail_settings 2012-05-09 11:38:29 +08:00
models Import Announcements, Journal Paper, Conference Data, book data 2013-09-26 14:45:42 +08:00
uploaders Change ckeditor gem and kaminari in gemfile 2013-07-22 17:26:32 +08:00
views Import Announcements, Journal Paper, Conference Data, book data 2013-09-26 14:45:42 +08:00