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
..
assets	Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb	2013-09-27 11:10:07 +08:00
controllers	Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb	2013-09-27 11:10:07 +08:00
errors	show error message when trying to show a not existed page	2013-01-03 13:50:27 +08:00
helpers	new ui member plugin sort fix and user show avatar fix	2013-09-27 11:04:52 +08:00
jobs	ask module: dropdown, icon, big5 encoding, redirect, admin, send mail	2013-06-07 13:03:59 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb	2013-09-26 20:31:46 +08:00
uploaders	new ui member plugin sort fix and user show avatar fix	2013-09-27 11:04:52 +08:00
views	Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb	2013-09-27 11:10:07 +08:00