daiao e2c15578c4 Merge branch 'dev_daiao' into develop ... Conflicts: app/controllers/managements_controller.rb config/routes.rb		2017-06-23 11:20:15 +08:00
..
_change_user_email.html.erb	立即激活邮箱	2017-06-02 17:51:13 +08:00
_has_authentication.html.erb	个人资料页面	2017-06-08 09:24:37 +08:00
_reset_psd_notice_box.html.erb	first commit	2017-04-07 10:16:13 +08:00
about_us.html.erb	first commit	2017-04-07 10:16:13 +08:00
agreement.html.erb	用户协议内容及样式修正	2017-05-27 17:10:36 +08:00
apply_trail.js.erb	使用弹框样式	2017-06-09 21:15:58 +08:00
authentication.html.erb	试用授权相关的遮罩页面	2017-06-07 14:56:46 +08:00
avatar.html.erb	上传头像点击确定跳转	2017-06-16 16:50:50 +08:00
change_or_bind.html.erb	修改资料的安全设置中，icon样式和显示问题	2017-05-26 17:04:22 +08:00
change_psd.html.erb	修改密码的“新密码”提示和check请修正、避免邮箱恶意注册，请增加验证块	2017-05-25 11:12:59 +08:00
email_activation.html.erb	立即激活邮箱	2017-06-02 17:51:13 +08:00
email_valid.html.erb	激活邮箱页面的帮助中心需要隐藏	2017-06-23 10:56:37 +08:00
login.html.erb	登录注册页面调整	2017-06-01 16:59:36 +08:00
logout.html.erb	first commit	2017-04-07 10:16:13 +08:00
lost_password.html.erb	找回密码页面需要加一个返回登录的按钮	2017-06-21 17:31:44 +08:00
password_recovery.html.erb	first commit	2017-04-07 10:16:13 +08:00
reset_psd.html.erb	修改密码的“新密码”提示和check请修正、避免邮箱恶意注册，请增加验证块	2017-05-25 11:12:59 +08:00
reset_psd.js.erb	first commit	2017-04-07 10:16:13 +08:00
security_settings.html.erb	实训的重置	2017-06-22 20:14:05 +08:00
user_join.html.erb	邮箱注册页面的服务条款字体应为蓝色	2017-06-21 17:33:25 +08:00
wechat_bind.html.erb	first commit	2017-04-07 10:16:13 +08:00