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
..
admin	Get data from database	2013-09-17 11:36:02 +08:00
default_widget	add search to archive	2013-06-05 18:03:09 +08:00
desktop	minimize bar updated to new style and more flexible.	2013-08-19 12:59:57 +08:00
desktop_apps	apps update -- app upload and activation	2013-07-30 16:42:50 +08:00
desktop_themes	new themes added to desktop plus theme uploader created	2013-07-30 16:43:32 +08:00
desktop_widgets	apps update -- app upload and activation	2013-07-30 16:42:50 +08:00
devise	member translation fix	2013-04-26 11:26:11 +08:00
front	ad_banner banner load fixed for test site	2013-09-13 14:23:44 +08:00
js	solved conflict for member_new_ui	2013-08-12 15:40:34 +08:00
kaminari	Add mobile but remove news in it	2013-01-07 03:03:38 +08:00
layouts	filemanager and some update for file uploader . added file uploader to kernel	2013-09-11 14:03:06 +08:00
mobile	Changes for mobile copyright	2013-02-04 18:02:11 +08:00
shared	new ui member bug and interface fix	2013-09-02 11:22:17 +08:00