Orbit/app/views
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
..
admin Import Announcements, Journal Paper, Conference Data, book data 2013-09-26 14:45:42 +08:00
default_widget add search to archive 2013-06-05 18:03:09 +08:00
desktop brief added to desktop for all plugins 2013-09-25 18:23:44 +08:00
desktop_apps apps update -- app upload and activation 2013-07-30 16:42:50 +08:00
desktop_themes new themes added to desktop plus theme uploader created 2013-07-30 16:43:32 +08:00
desktop_widgets apps update -- app upload and activation 2013-07-30 16:42:50 +08:00
devise member translation fix 2013-04-26 11:26:11 +08:00
front ad_banner banner load fixed for test site 2013-09-13 14:23:44 +08:00
js solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
kaminari Add mobile but remove news in it 2013-01-07 03:03:38 +08:00
layouts Add Brief intro. for all personal plugins 2013-09-18 18:55:40 +08:00
mobile Changes for mobile copyright 2013-02-04 18:02:11 +08:00
shared new ui member bug and interface fix 2013-09-02 11:22:17 +08:00