orbit-basic/app
Spen 00e9a5df5b new ui member settings account data
Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb
	config/locales/en.yml
	config/routes.rb
2013-10-18 22:28:27 +08:00
..
assets Update Ad_Banner for new jQuery 2013-10-16 12:28:21 +08:00
controllers new ui member settings account data 2013-10-18 22:28:27 +08:00
errors show error message when trying to show a not existed page 2013-01-03 13:50:27 +08:00
helpers Updated fixes for site info - desktop openess, title always displayed 2013-10-16 18:33:57 +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 Updated with some locale fixes in site preferences 2013-10-18 15:26:41 +08:00
uploaders new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
views new ui member settings account data 2013-10-18 22:28:27 +08:00