Orbit/app/controllers
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
desktop move journal code to persional_journal modulaar 2013-01-14 17:53:59 +08:00
application_controller.rb Default Locale 2013-09-06 18:00:36 +08:00
default_widget_controller.rb fix default setting for partial category selection error,due to API changing. 2013-06-17 15:26:43 +08:00
desktop_apps_controller.rb Updated Desktop with new UI 2013-07-30 16:43:41 +08:00
desktop_appstore_controller.rb new page add and timeline changes 2012-06-28 17:31:48 +08:00
desktop_controller.rb brief added to desktop for all plugins 2013-09-25 18:23:44 +08:00
desktop_orbit_controller.rb design update 2012-09-12 01:58:23 +08:00
desktop_themes_controller.rb Updated Desktop Themes controller 2013-08-22 14:14:19 +08:00
desktop_widgets_controller.rb Updated Desktop with new UI 2013-07-30 16:43:41 +08:00
facebook_controller.rb new feature in desktop for uploading wallpapers or putting url link 2013-08-02 19:32:41 +08:00
front_controller.rb external links and link widget fixed for development 2013-09-24 15:37:40 +08:00
gridfs_controller.rb Multi language and side bar update 2012-08-20 23:14:11 +08:00
mobile_controller.rb Fix bug for mobile app routes 2013-02-04 18:01:03 +08:00
orbit_backend_controller.rb New authorization 2013-08-21 13:42:29 +08:00
orbit_frontend_component_controller.rb New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
orbit_frontend_controller.rb default widgets and sidebar. 2012-12-24 16:38:35 +08:00
orbit_member_controller.rb New authorization 2013-08-21 13:42:29 +08:00
orbit_widget_controller.rb apply tags and cates for fronted. from now app developer can use param category_id and tag_id freely. 2013-06-06 17:39:36 +08:00
otheraccounts_controller.rb update for desktop widgets 2012-11-05 11:40:11 +08:00
pages_controller.rb Default Locale 2013-09-06 18:00:36 +08:00