Orbit/app/models/user
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
..
attribute.rb member role edit 2013-01-14 19:00:08 +08:00
attribute_field.rb member roles edit 2013-01-14 17:02:51 +08:00
attribute_value.rb solved conflict for member_new_ui 2013-08-12 15:40:34 +08:00
info.rb Change role structure 2011-12-10 18:12:39 +08:00
personal_plugin_intro.rb Add Brief intro. for all personal plugins 2013-09-18 18:55:40 +08:00
role.rb New UI changes(tags, categories, authorisations, module index…) 2013-07-02 16:46:44 +08:00
role_category.rb user id set & user fields set & role set & member frontend list & user translation & create new member bug fix 2013-04-25 19:59:59 +08:00
role_filter.rb user id set & user fields set & role set & member frontend list & user translation & create new member bug fix 2013-04-25 19:59:59 +08:00
role_status.rb user id set & user fields set & role set & member frontend list & user translation & create new member bug fix 2013-04-25 19:59:59 +08:00
status.rb for user new interface, member role is working. 2012-10-26 11:27:37 +08:00
sub_role.rb basic function 2012-09-17 13:32:52 +08:00
user.rb Import Announcements, Journal Paper, Conference Data, book data 2013-09-26 14:45:42 +08:00
user_action.rb user action 2013-05-23 11:55:57 +08:00