saurabhbhatia 471987f800 Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb ... Conflicts: vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb		2013-09-27 11:10:07 +08:00
..
admin	Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb	2013-09-27 11:10:07 +08:00
default_widget	add search to archive	2013-06-05 18:03:09 +08:00
desktop	added sync for journal paper books and conference.. and also disabled the icons	2013-09-26 22:29:21 +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	sso for ntu mb all sites	2013-09-26 18:52:32 +08:00
front	Fix path of jquery.cycle.all.latest.js	2013-09-26 16:11:08 +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	sso for ntu mb all sites	2013-09-26 18:52:32 +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