Orbit/app/views/admin
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
..
ad_banners Updated AdBanner index page and Ad Image index page, and edit pages 2013-08-09 15:22:06 +08:00
ad_images Updated AdBanner index page and Ad Image index page, and edit pages 2013-08-09 15:22:06 +08:00
app_auths Translation changes 2012-12-03 23:00:04 +08:00
asset_categories Translation changes 2012-12-03 23:00:04 +08:00
assets small bug fix for inserting and delete button. 2013-09-11 14:03:19 +08:00
attributes solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
authorizations New authorization 2013-08-21 13:42:29 +08:00
categories New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
components Translation changes 2012-12-03 23:00:04 +08:00
dashboards New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
default_index Updated Gallery with authorizations 2013-08-22 16:25:11 +08:00
designs Updated Sidebar and Preferences 2013-09-09 10:18:14 +08:00
import_data Import Announcements, Journal Paper, Conference Data, book data 2013-09-26 14:45:42 +08:00
items Fix structure edit 2013-09-14 17:26:16 +08:00
links Fix for structure 2013-07-29 18:46:38 +08:00
member_selects Add class for Ray's check-box 2013-07-31 00:08:15 +08:00
module_apps_new_interface Translation changes 2012-12-03 23:00:04 +08:00
module_store Redirect to designs after buying template 2012-12-07 09:07:49 +08:00
module_tags filemanager and some update for file uploader . added file uploader to kernel 2013-09-11 14:03:06 +08:00
object_auths_new_interface Translation changes 2012-12-03 23:00:04 +08:00
page_parts Ray's changes in structure 2013-07-22 14:06:58 +08:00
pages Fix structure edit 2013-09-14 17:26:16 +08:00
personal_plugin_intros Add Brief intro. for all personal plugins 2013-09-18 18:55:40 +08:00
plugins archive edit & plugins edit 2013-03-07 21:12:31 +08:00
purchases put add admin pages using orbit back end controller 2013-04-17 10:54:38 +08:00
role_filters solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
roles solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
sites Updated Preference Page 2013-09-09 11:29:46 +08:00
tags Add default delete modal usage: 2013-07-29 14:29:37 +08:00
template_store Redirect to designs after buying template 2012-12-07 09:07:49 +08:00
user_actions add user log link at site page 2013-06-14 15:24:04 +08:00
users_new_interface Import Announcements, Journal Paper, Conference Data, book data 2013-09-26 14:45:42 +08:00