 alan
|
48ac3dbea8
|
修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
f374bfd7e2
|
修复《窗口跳转问题》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
11 years ago |
|
alan
|
40d6c3b19c
|
添加《邮箱地址验证是否存在及国际化的编写》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
|
alan
|
f9a86356ad
|
添加《重新发送激活邮件》功能to注册模块
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 =
|
bb23468c7d
|
Merge branch 'szzh' into api
Conflicts:
app/controllers/account_controller.rb
app/controllers/courses_controller.rb
db/schema.rb
|
11 years ago |
|
z9hang
|
36967eeec0
|
修改注册接口、添加作业列表接口
|
11 years ago |
|
z9hang
|
fa1e7c9a04
|
修正密码长度判断错误问题
|
11 years ago |
|
z9hang
|
2a7e0365b8
|
注册修改
|
11 years ago |
|
z9hang
|
d71581d834
|
修正修改资料时报密码过短错误
|
11 years ago |
|
z9hang
|
f025922312
|
去掉部分无用的代码
|
11 years ago |
|
z9hang
|
c7ceea445a
|
修改注册方法，调用保存用户的公共方法
|
11 years ago |
guange
|
c303d2b4ca
|
将注册功能移动到UserService中
|
11 years ago |
|
z9hang
|
ec21a98e64
|
修改密码验证的方法
|
11 years ago |
|
z9hang
|
843811cf99
|
添加创建于保存用户的方法
|
11 years ago |
|
alan
|
526e9bc923
|
修改《IE登录不了》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
6963d494ae
|
还原《注册》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
949867c50b
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
3417b2bce1
|
还原《登录跳转》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
70e8c4ebe7
|
修改bug<注册后，用户第一次登陆都得转到《修改资料》页面>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
b2ce8c78bd
|
<修改资料>页面<课程成员><admin/settings>页面样式修改，注册后页面跳转路由修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
baacf328b7
|
增加《注册跳转邮箱页面》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
2cea3178d6
|
添加邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 sw
|
602982a124
|
龚乐鑫修改意见4：redirect_to后使用 url
|
11 years ago |
linhk
|
aabd183299
|
注册界面姓氏文本框内容修改
|
11 years ago |
|
sw
|
ea0b7ef3f1
|
Merge branch 'szzh' into develop
|
11 years ago |
|
linhk
|
0028c11426
|
退出项目功能
|
11 years ago |
|
linhk
|
387d482059
|
解决用户注册无地区、身份可注册成功
|
11 years ago |
|
sw
|
08821b9391
|
Merge branch 'szzh' into develop
|
11 years ago |
|
linhk
|
23c9d5381e
|
注册界面失败填写信息继续保留
修改注册见面企业提交失败姓、名内容错误Bug
|
11 years ago |
 linchun
|
9c5066b81c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
app/controllers/account_controller.rb
|
12 years ago |
|
sw
|
05659fa2db
|
修复注册后在”修改资料“中发现我在注册时选择的”学生“身份和地区信息以及学号信息都没有了，需要重新填写。
|
12 years ago |
 yanxd
|
2000f1ddf6
|
人物注册地址信息会保存两次的问题。
|
12 years ago |
|
z9hang
|
0385013905
|
修复主页跳转
去除老师删除项目型作业，优化代码
|
12 years ago |
|
yanxd
|
be87e02e4c
|
Revert "从主页登陆时跳转到个人主页"
This reverts commit a794d612af.
|
12 years ago |
|
yanxd
|
53a9d29292
|
Revert "acount"
This reverts commit 03dbcb1168.
|
12 years ago |
|
z9hang
|
e0592cd6f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
03dbcb1168
|
acount
|
12 years ago |
|
z9hang
|
a794d612af
|
从主页登陆时跳转到个人主页
|
12 years ago |
yanxd
|
19ddb38e1b
|
异步验证注册字段合法
|
12 years ago |
|
yanxd
|
4d8701220b
|
-。-
acoount.html对齐了一下
学校列表school/index.html默认显示全部学校
没有填写工作单位的用户强行跳转到修改资料页面
|
12 years ago |
|
yanxd
|
7e130ee89e
|
去掉login_flag
|
12 years ago |
|
yanxd
|
a1a58ee26c
|
加注释
|
12 years ago |
|
yanxd
|
67216ca463
|
fix back_url bug
|
12 years ago |
 fanqiang
|
8e51ea7327
|
修改了企业注册与修改企业资料过程，以及一些企业主页中的显示细节
|
12 years ago |
 baiyu
|
436569c88d
|
1、修改了location和identity不能显示的问题
2、修改了学号框样式
|
12 years ago |
xianbo
|
806fae7b19
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
Conflicts:
app/controllers/account_controller.rb
app/controllers/my_controller.rb
app/controllers/projects_controller.rb
app/controllers/users_controller.rb
app/helpers/projects_helper.rb
app/helpers/users_helper.rb
app/models/project.rb
app/models/user.rb
app/models/user_extensions.rb
app/views/account/register.html.erb
app/views/bids/_bid_show.html.erb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
app/views/files/index.html.erb
app/views/layouts/base_bids.html.erb
app/views/layouts/base_users.html.erb
app/views/my/account.html.erb
app/views/users/watch_bids.html.erb
config/locales/en.yml
config/locales/zh.yml
config/routes.rb
db/schema.rb
lib/redmine.rb
public/stylesheets/application.css
|
12 years ago |
|
baiyu
|
6ce27271e3
|
修改了身份
增加了职称、学号
|
12 years ago |
