 cxt
|
45f0234ff7
|
组织logo点击可编辑
|
2016-08-29 16:19:06 +08:00 |
|
cxt
|
5fbb9f56a6
|
Merge branch 'dev_shcool' into develop
|
2016-08-26 17:10:15 +08:00 |
|
cxt
|
6eb518c465
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/at/show.json.erb
app/views/layouts/new_base_user.html.erb
|
2016-08-26 16:23:07 +08:00 |
|
cxt
|
774b5eca89
|
课程和项目的头像点击可编辑
|
2016-08-26 14:31:14 +08:00 |
 daiao
|
d37cbaad61
|
1.完善资料流程优化；2.基本资料从业者单位保存丢失问题
|
2016-08-26 10:14:48 +08:00 |
|
daiao
|
4a9967674a
|
1. 强制编辑基本资料，在删除单位时给出消息通知
2. 单位名称申请提示一直显示
3. 申请单位的消息通知显示申请人头像，并连接到申请人主页
|
2016-08-13 14:29:33 +08:00 |
|
daiao
|
7fbca5f260
|
单位审查消息及其BUG修复
|
2016-08-05 16:14:26 +08:00 |
 yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
2016-06-30 16:08:36 +08:00 |
 huang
|
6b9a612594
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-11 17:58:37 +08:00 |
|
huang
|
0ac4821f14
|
修改密码导航栏错误
|
2015-12-11 17:56:26 +08:00 |
|
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2015-12-11 15:00:35 +08:00 |
|
huang
|
4e0b442309
|
修改邮箱的时候同步到gitlab
|
2015-12-10 10:50:15 +08:00 |
 lizanle
|
6c02115f3f
|
不允许修改登录名
|
2015-12-09 10:17:30 +08:00 |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
2015-10-15 12:04:55 +08:00 |
|
lizanle
|
244d5165e2
|
登录之后跳到个人主页
|
2015-08-29 15:25:58 +08:00 |
|
lizanle
|
cf12ee877e
|
编辑资料的时候个人说明隐藏
|
2015-08-26 09:11:03 +08:00 |
|
lizanle
|
5c43c902c4
|
编辑资料css
|
2015-08-25 19:07:59 +08:00 |
 yutao
|
3e3bcc32a6
|
个人主页
|
2015-07-18 13:23:48 +08:00 |
|
yutao
|
61b759b739
|
个人主页
|
2015-07-18 10:15:36 +08:00 |
|
yutao
|
5c011fd342
|
个人主页
|
2015-07-09 15:27:49 +08:00 |
 sw
|
f12a20f85e
|
用户修改资料保存报错
|
2015-05-08 16:32:55 +08:00 |
 guange
|
eed39ef0ef
|
上传头像会进行压缩
|
2015-05-08 14:28:17 +08:00 |
|
guange
|
9ba55296f5
|
修改密码完成后跳到个人资料
|
2015-05-06 15:17:42 +08:00 |
|
guange
|
86af233042
|
修正autologin多终端登录问题
|
2015-05-05 11:45:58 +08:00 |
|
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
2015-04-23 17:43:10 +08:00 |
 z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
2015-01-23 16:51:40 +08:00 |
 alan
|
b9ea3e589e
|
修改《邮件系统》页面
Signed-off-by: alan <547533434@qq.com>
|
2015-01-17 11:18:24 +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
|
74af44a826
|
修改《修改个人资料页面》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 18:01:41 +08:00 |
|
z9hang
|
96004b3270
|
修改密码接口
|
2014-12-10 16:26:09 +08:00 |
|
alan
|
1468f4a8df
|
修改《修改资料》页面
Signed-off-by: alan <547533434@qq.com>
|
2014-11-10 08:58:38 +08:00 |
|
alan
|
66aa72d210
|
Signed-off-by: alan <547533434@qq.com>
|
2014-10-23 18:49:14 +08:00 |
|
sw
|
0d0a16fdcd
|
编辑冲突
|
2014-10-23 14:36:14 +08:00 |
|
alan
|
6e77c5a0b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/my_controller.rb
app/views/contestnotifications/index.html.erb
app/views/courses/_join_private_course.html.erb
app/views/wiki/edit.html.erb
|
2014-10-23 11:41:15 +08:00 |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
2014-10-23 11:30:34 +08:00 |
|
sw
|
e9124c62ce
|
#1250修改帐号后将帐号更新成功放在一个显眼的位置
|
2014-10-23 09:22:41 +08:00 |
|
sw
|
602982a124
|
龚乐鑫修改意见4：redirect_to后使用 url
|
2014-10-15 09:54:54 +08:00 |
|
sw
|
7f08652cd1
|
#1250 修改资料保存后提示信息显示问题
解决方案：flash显示一次后自动清空
|
2014-10-09 17:49:16 +08:00 |
linhk
|
c55c6156d8
|
修改资料无效的用户昵称导航栏显示问题修复
|
2014-09-15 17:32:46 +08:00 |
 nwb
|
c8e895ec74
|
优化用户头像逻辑
|
2014-08-29 15:28:32 +08:00 |
|
sw
|
4998420410
|
修复修改密码时，错误信息在其他页面会提示的BUG
|
2014-08-22 16:52:47 +08:00 |
 zhanghaitao
|
b635a6b3c5
|
1.添加工作台分页处理操作
2.分页处理路由函数添加
|
2014-08-22 09:38:07 +08:00 |
|
sw
|
ea0b7ef3f1
|
Merge branch 'szzh' into develop
|
2014-08-08 16:42:41 +08:00 |
|
z9hang
|
f8c6b66119
|
修改密码处导航丢失问题
|
2014-08-08 15:09:32 +08:00 |
 yanxd
|
2000f1ddf6
|
人物注册地址信息会保存两次的问题。
|
2014-06-17 14:42:08 +08:00 |
|
sw
|
3546355f70
|
增加修改昵称功能以及昵称是否重复的判断
|
2014-05-28 17:07:23 +08:00 |
|
yanxd
|
62f9ed052b
|
issues#655
|
2014-05-22 19:58:13 +08:00 |
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
2014-04-17 17:36:41 +08:00 |
 fanqiang
|
962842d841
|
修改了提交作业数量显示问题，修改了创建需求的种类选择问题
|
2013-10-10 21:56:27 +08:00 |
|
fanqiang
|
8e51ea7327
|
修改了企业注册与修改企业资料过程，以及一些企业主页中的显示细节
|
2013-10-08 16:31:28 +08:00 |