 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 |
 baiyu
|
436569c88d
|
1、修改了location和identity不能显示的问题
2、修改了学号框样式
|
2013-09-25 17:20:40 +08:00 |
xianbo
|
8ff8d0f4d4
|
modify some little bug && merge handle
|
2013-09-23 21:47:07 +08:00 |
|
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
|
2013-09-23 20:18:03 +08:00 |
baiyu
|
4fb040bc61
|
modify register bug
|
2013-09-23 16:42:19 +08:00 |
|
baiyu
|
6ce27271e3
|
修改了身份
增加了职称、学号
|
2013-09-23 09:41:36 +08:00 |
|
baiyu
|
a7b500f5e7
|
修正了“注册”和“我的账号”的显示格式
|
2013-09-16 21:56:12 +08:00 |
 huangjingquan
|
466922d13b
|
修改了上次会议提出的几点
|
2013-09-16 08:49:39 +08:00 |
|
baiyu
|
313e66537e
|
增加了“地区”
|
2013-09-13 22:47:14 +08:00 |
|
baiyu
|
3ae85e93ad
|
1、修复了丢失的国际化
2、增加了性别
|
2013-09-12 20:19:49 +08:00 |
|
huangjingquan
|
261c3fc337
|
new version
|
2013-09-12 10:41:15 +08:00 |
|
baiyu
|
a2cc191a4e
|
1、增加“我的账号”里的了工作单位
2、增加了“注册”里的“身份”
|
2013-09-12 08:38:47 +08:00 |
Administrator
|
8dd2d4a39a
|
修正版本库
|
2013-08-16 22:43:44 +08:00 |
|
Administrator
|
78c8e2a20d
|
新改
|
2013-08-15 18:50:44 +08:00 |
|
Administrator
|
90885a4eb5
|
修改版本库
|
2013-08-15 10:52:11 +08:00 |
|
Administrator
|
f08ab23492
|
修复版本库
|
2013-08-15 10:29:15 +08:00 |
|
huangjingquan
|
37e9e8395c
|
项目主页修改，我的账号，主页
|
2013-08-15 09:25:31 +08:00 |
|
huangjingquan
|
2fbf8e1901
|
修改问题权限，问题界面用户图像显示错误，个人配置信息按钮跳转
|
2013-08-14 21:47:46 +08:00 |
 william
|
7850a2e6f0
|
修改user_extension
|
2013-08-14 21:37:55 +08:00 |
|
Administrator
|
9b8c0f81b2
|
修复版本库
|
2013-08-14 20:56:20 +08:00 |
 nieguanghui
|
ca08efa7e5
|
修正了我的账户下弹出密码错误的bug；修正了普通用户修改资料的跳转路径
|
2013-08-13 11:14:25 +08:00 |
zhangyang
|
3d5b95cb7a
|
修正了“我的账户”下修改密码的显示问题
|
2013-08-07 21:10:37 +08:00 |
|
huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |