jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,467 Commits 98 Branches 0 Tags 0 B
Commit Graph

66 Commits

Author SHA1 Message Date
guange d2dd77612b 将登录默认值改为自动登录 2015-04-22 12:42:22 +08:00
guange 02e83ea776 将邮件发送放到后台进程中 2015-03-31 11:51:34 +08:00
alan 48ac3dbea8 修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 16:07:48 +08:00
alan f374bfd7e2 修复《窗口跳转问题》 
Signed-off-by: alan <547533434@qq.com>
 2015-03-02 14:47:50 +08:00
z9hang db1cd8851c Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	db/schema.rb
 2015-01-23 16:51:40 +08:00
alan 40d6c3b19c 添加《邮箱地址验证是否存在及国际化的编写》功能 
Signed-off-by: alan <547533434@qq.com>
 2015-01-20 16:33:59 +08:00
z9hang 0f9915fc2a Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/bids_controller.rb
	app/controllers/users_controller.rb
	db/schema.rb
 2015-01-13 15:12:05 +08:00
alan f9a86356ad 添加《重新发送激活邮件》功能to注册模块 
Signed-off-by: alan <547533434@qq.com>
 2014-12-19 10:51:53 +08:00
= bb23468c7d Merge branch 'szzh' into api 
Conflicts:
	app/controllers/account_controller.rb
	app/controllers/courses_controller.rb
	db/schema.rb
 2014-12-17 16:41:28 +08:00
z9hang 36967eeec0 修改注册接口、添加作业列表接口 2014-12-15 13:44:26 +08:00
z9hang fa1e7c9a04 修正密码长度判断错误问题 2014-12-06 11:27:52 +08:00
z9hang 2a7e0365b8 注册修改 2014-12-04 15:53:47 +08:00
z9hang d71581d834 修正修改资料时报密码过短错误 2014-12-04 09:41:31 +08:00
z9hang f025922312 去掉部分无用的代码 2014-12-03 17:51:28 +08:00
z9hang c7ceea445a 修改注册方法，调用保存用户的公共方法 2014-12-03 17:50:35 +08:00
guange c303d2b4ca 将注册功能移动到UserService中 2014-12-03 17:29:03 +08:00
z9hang ec21a98e64 修改密码验证的方法 2014-12-03 16:14:11 +08:00
z9hang 843811cf99 添加创建于保存用户的方法 2014-12-03 11:16:14 +08:00
alan 526e9bc923 修改《IE登录不了》 
Signed-off-by: alan <547533434@qq.com>
 2014-11-24 10:48:53 +08:00
alan 6963d494ae 还原《注册》 
Signed-off-by: alan <547533434@qq.com>
 2014-11-23 10:44:51 +08:00
alan 949867c50b Signed-off-by: alan <547533434@qq.com> 2014-11-23 09:36:47 +08:00
alan 3417b2bce1 还原《登录跳转》 
Signed-off-by: alan <547533434@qq.com>
 2014-11-22 22:50:48 +08:00
alan 70e8c4ebe7 修改bug<注册后，用户第一次登陆都得转到《修改资料》页面> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-21 19:11:40 +08:00
alan b2ce8c78bd <修改资料>页面<课程成员><admin/settings>页面样式修改，注册后页面跳转路由修改 
Signed-off-by: alan <547533434@qq.com>
 2014-11-19 17:25:10 +08:00
alan baacf328b7 增加《注册跳转邮箱页面》 
Signed-off-by: alan <547533434@qq.com>
 2014-11-13 09:13:44 +08:00
alan 2cea3178d6 添加邮箱验证功能 
Signed-off-by: alan <547533434@qq.com>
 2014-11-11 17:01:07 +08:00
alan e044f5b615 修改contest中出现的逻辑错误 
Signed-off-by: alan <547533434@qq.com>
 2014-10-23 11:30:34 +08:00
sw 602982a124 龚乐鑫修改意见4：redirect_to后使用 url 2014-10-15 09:54:54 +08:00
linhk aabd183299 注册界面姓氏文本框内容修改 2014-09-16 14:08:44 +08:00
sw ea0b7ef3f1 Merge branch 'szzh' into develop 2014-08-08 16:42:41 +08:00
linhk 0028c11426 退出项目功能 2014-08-08 16:43:34 +08:00
linhk 387d482059 解决用户注册无地区、身份可注册成功 2014-08-07 15:58:00 +08:00
sw 08821b9391 Merge branch 'szzh' into develop 2014-08-07 14:03:06 +08:00
linhk 23c9d5381e 注册界面失败填写信息继续保留 
修改注册见面企业提交失败姓、名内容错误Bug
 2014-08-06 14:41:22 +08:00
linchun 9c5066b81c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	app/controllers/account_controller.rb
 2014-06-23 15:06:37 +08:00
sw 05659fa2db 修复注册后在”修改资料“中发现我在注册时选择的”学生“身份和地区信息以及学号信息都没有了，需要重新填写。 2014-06-20 14:45:41 +08:00
yanxd 2000f1ddf6 人物注册地址信息会保存两次的问题。 2014-06-17 14:42:08 +08:00
z9hang 0385013905 修复主页跳转 
去除老师删除项目型作业，优化代码
 2014-05-15 19:16:36 +08:00
yanxd be87e02e4c Revert "从主页登陆时跳转到个人主页" 
This reverts commit a794d612af.
 2014-05-15 17:41:53 +08:00
yanxd 53a9d29292 Revert "acount" 
This reverts commit 03dbcb1168.
 2014-05-15 17:41:45 +08:00
z9hang e0592cd6f8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-15 17:33:58 +08:00
z9hang 03dbcb1168 acount 2014-05-15 17:33:01 +08:00
z9hang a794d612af 从主页登陆时跳转到个人主页 2014-05-15 15:53:28 +08:00
yanxd 19ddb38e1b 异步验证注册字段合法 2014-05-10 09:22:45 +08:00
yanxd 4d8701220b -。- 
acoount.html对齐了一下
学校列表school/index.html默认显示全部学校
没有填写工作单位的用户强行跳转到修改资料页面
 2014-05-09 17:08:42 +08:00
yanxd 7e130ee89e 去掉login_flag 2014-04-04 12:33:12 +08:00
yanxd a1a58ee26c 加注释 2014-04-02 19:58:06 +08:00
yanxd 67216ca463 fix back_url bug 2013-10-30 20:56:24 +08:00
fanqiang 8e51ea7327 修改了企业注册与修改企业资料过程，以及一些企业主页中的显示细节 2013-10-08 16:31:28 +08:00
baiyu 436569c88d 1、修改了location和identity不能显示的问题 
2、修改了学号框样式
 2013-09-25 17:20:40 +08:00