Commit Graph

31 Commits

Author SHA1 Message Date
cxt a944456e57 Merge branch 'dev_cxt' into develop
Conflicts:
	app/views/subjects/_subject_list.html.erb
2017-08-25 16:13:46 +08:00
cxt 68a901a533 修改资料页面点击安全设置中绑定或更改,左边栏目会跳到“职业认证” 2017-08-24 20:12:27 +08:00
cxt 78f1fd3d1d 增加试用申请的留言功能 2017-08-22 16:27:28 +08:00
daiao 59c39f8c10 测试 2017-08-15 17:36:19 +08:00
daiao 504f220382 codepedia测试 2017-08-15 17:24:39 +08:00
daiao 41d38ac4e5 codepedia测试 2017-08-15 17:09:50 +08:00
daiao f2161e83e5 codepedia测试 2017-08-15 17:00:30 +08:00
daiao 6e97c409ff codepedia功能测试 2017-08-15 16:11:30 +08:00
daiao 5de3c44a95 codepedia登录验证 2017-08-15 15:12:16 +08:00
cxt c25b584898 实名认证和职业认证 2017-08-04 11:20:28 +08:00
cxt 60eab2a755 用户试用被拒绝后,重新申请可以一直申请,且超级管理员审批页面没有收到申请信息、试用授权的审批页面,点击同意后没有刷新 2017-07-14 15:41:31 +08:00
cxt 95ac6771c1 绑定邮箱的邮件发送失败 2017-07-03 15:46:54 +08:00
huang b3bac60f3f 实名认证 2017-06-09 20:35:58 +08:00
huang 891fb66699 用户认证 2017-05-31 17:15:29 +08:00
cxt 10218c756d Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-05-27 17:39:33 +08:00
huang f92a604ee7 用户协议内容及样式修正 2017-05-27 17:10:36 +08:00
cxt 8d0bb43e9c 修改密码页原始密码的验证有错 2017-05-27 11:15:06 +08:00
daiao f49f565c7e 底部导航栏固定在底部 2017-05-24 16:53:23 +08:00
cxt 66640b5a14 Merge branch 'dev_cxt' into develop
Conflicts:
	app/controllers/account_controller.rb
	app/views/layouts/base_edu.html.erb
	app/views/layouts/login_bigdata.html.erb
	public/stylesheets/css/edu-common.css
2017-05-05 20:21:15 +08:00
cxt 3fdec893c9 Merge branch 'dev_cxt' of https://bdgit.trustie.net/hushasha/bigdata into dev_cxt
Conflicts:
	app/views/layouts/base_edu.html.erb
	public/stylesheets/css/edu-public.css
2017-05-05 19:37:29 +08:00
cxt 5e82ef00ba 身份认证 2017-05-04 14:33:50 +08:00
huang 1b708c2646 区分注册的时候邮箱和手机积分 2017-05-04 10:07:00 +08:00
huang ec22329e5f 完善资料积分、积分不重复计算 2017-05-03 16:51:26 +08:00
huang 8a7cd59fc8 绑定邮箱添加事务处理及积分 2017-05-03 15:41:15 +08:00
huang 1aee70dc02 完成用户注册积分奖励 2017-05-03 15:23:01 +08:00
huang 6d5ecdf70c 解决首页无法退出登录的问题 2017-04-27 17:05:39 +08:00
cxt f653d694d6 安全设置 2017-04-21 22:03:51 +08:00
cxt 09482fea09 基本资料 2017-04-21 20:29:35 +08:00
cxt 046f73d2c6 新版个人首页 2017-04-20 17:17:02 +08:00
cxt 7b977e9fcc 基本资料相关后台开发 2017-04-11 16:19:35 +08:00
huang 1fc92c5c88 first commit 2017-04-07 10:16:13 +08:00