developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/app/views/admin/users_new_interface
History
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
..
_clear_filters.html.erb solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
_deled_quick_edit.html.erb Translation changes 2012-12-03 23:00:04 +08:00
_filter.html.erb new ui member bug and interface fix 2013-09-02 11:22:17 +08:00
_form.html.erb new ui member bug and interface fix 2013-09-02 11:22:17 +08:00
_index_paginator.html.erb solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
_info.html.erb solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
_infos.html.erb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
_js_and_css.html.erb new ui member bug and interface fix 2013-09-02 11:22:17 +08:00
_plugin_summary.html.erb Add Brief intro. for all personal plugins 2013-09-18 18:55:40 +08:00
_role.html.erb new ui member bug and interface fix 2013-09-02 11:22:17 +08:00
_roles.html.erb solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
_show_roles.html.erb new ui personal front_end page(member app) & users_new_interface show sub_roles fix 2013-08-21 14:13:36 +08:00
_show_sub_role.html.erb new ui personal front_end page(member app) & users_new_interface show sub_roles fix 2013-08-21 14:13:36 +08:00
_side_bar.html.erb new ui member bug and interface fix 2013-09-02 11:22:17 +08:00
_sort_headers.html.erb Updated Sidebar and Preferences 2013-09-09 10:18:14 +08:00
_temp_form.html.erb Translation changes 2012-12-03 23:00:04 +08:00
_temp_profile.html.erb new code for attribute fields and values for new member interface 2012-10-26 11:19:55 +08:00
_temp_sub_role_from.html.erb user new interface 70% 2012-10-09 06:40:18 +08:00
_user_basic.html.erb solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
_user_basic_passwd.html.erb solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
_user_for_listing.html.erb new ui member bug and interface fix 2013-09-02 11:22:17 +08:00
_user_for_summary.html.erb new ui member bug and interface fix 2013-09-02 11:22:17 +08:00
_user_for_thumbnail.html.erb new ui member bug and interface fix 2013-09-02 11:22:17 +08:00
_user_role.html.erb solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
destroy.js.erb new ui member bug and interface fix 2013-09-02 11:22:17 +08:00
edit.html.erb new ui member bug and interface fix 2013-09-02 11:22:17 +08:00
edit_passwd.html.erb solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
index.html.erb Import Announcements, Journal Paper, Conference Data, book data 2013-09-26 14:45:42 +08:00
index.js.erb basic function 2012-09-17 13:32:52 +08:00
index_summary.html.erb Add Brief intro. for all personal plugins 2013-09-18 18:55:40 +08:00
index_summary.js.erb basic function 2012-09-17 13:32:52 +08:00
index_thumbnail.html.erb Add Brief intro. for all personal plugins 2013-09-18 18:55:40 +08:00
index_thumbnail.js.erb basic function 2012-09-17 13:32:52 +08:00
new.html.erb new ui member bug and interface fix 2013-09-02 11:22:17 +08:00
plugin_dashbroad.html.erb fix for Spen's translation and Chris's tag error 2013-04-26 15:37:27 +08:00
show.html.erb Add Brief intro. for all personal plugins 2013-09-18 18:55:40 +08:00
temp_edit.html.erb fix for Spen's translation and Chris's tag error 2013-04-26 15:37:27 +08:00