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

..

devise.en.yml

member translation fix

2013-04-26 11:26:11 +08:00

devise.zh_tw.yml

member translation fix

2013-04-26 11:26:11 +08:00

en.yml

new ui member settings account data

2013-10-18 22:28:27 +08:00

mobile.en.yml

Changes in I18n (except personal_conference and personal_journal)

2013-03-12 18:13:48 +08:00

mobile.zh_tw.yml

archive module: sort for backend/frontend. move get_sorted_and_filtered from orbit_backend_controller.rb to application_controller.rb

2013-06-06 19:20:21 +08:00

mongoid.zh_tw.yml

Changes in I18n (except personal_conference and personal_journal)

2013-03-12 18:13:48 +08:00

new_ui.en.yml

Fix tag page slide issues

2013-10-08 12:47:31 +08:00

new_ui.zh_tw.yml

Fix tag page slide issues

2013-10-08 12:47:31 +08:00

picker.en.yml

Changes in datetimepicker to accepts formats in options

2013-08-21 13:42:29 +08:00

picker.zh_tw.yml

Changes in datetimepicker to accepts formats in options

2013-08-21 13:42:29 +08:00

rails.zh_tw.yml

Clean translations

2012-12-04 00:17:12 +08:00

social_share_button.en.yml

first version of fb_share

2012-08-08 11:04:19 +08:00

social_share_button.zh-tw.yml

first version of fb_share

2012-08-08 11:04:19 +08:00

zh_tw.yml

new ui member settings account data

2013-10-18 22:28:27 +08:00