Commit Graph

4 Commits

Author SHA1 Message Date
saurabhbhatia cd1d4356fb Updated import data to get complete teacher and announcement data 2013-09-17 11:36:50 +08:00
saurabhbhatia 249644e72c Added method for importing page data 2013-09-17 11:36:35 +08:00
saurabhbhatia d2a07d9ffb Import Announcements, Journal Paper, Conference Data, book data
Conflicts:
	app/models/user/user.rb
2013-09-17 11:36:05 +08:00
saurabhbhatia 93909eeca0 Get data from database
Conflicts:
	app/controllers/admin/import_data_controller.rb

Conflicts:
	app/controllers/admin/import_data_controller.rb
	app/views/admin/import_data/get_teacher_data.html.erb
2013-09-17 11:36:02 +08:00