linhk
|
aa4b8c2da9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-21 16:56:22 +08:00 |
|
linhk
|
b30bfd073c
|
1
|
2014-08-21 16:55:46 +08:00 |
 sw
|
234a781342
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-21 15:41:23 +08:00 |
|
sw
|
4e49da836e
|
1.课程通知添加、修改填写字段时字段限制实时提示
2.修改通知时填写字段超出限制长度报错的修复
3.注释无效代码
|
2014-08-21 15:40:21 +08:00 |
 z9hang
|
644cfe6c21
|
项目成员列表按得分排序
|
2014-08-21 15:22:29 +08:00 |
|
z9hang
|
9ae553bace
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-21 14:57:05 +08:00 |
|
sw
|
16d86a1fbd
|
课程、项目模块增加分页功能
|
2014-08-21 10:37:53 +08:00 |
|
sw
|
8932633b23
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-21 09:56:14 +08:00 |
|
linhk
|
66dfa1ce4f
|
解决删除项目主留言分页Url错误和页数错误的Bug
|
2014-08-21 08:58:48 +08:00 |
 chenmin
|
86e377a228
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-20 11:40:14 +08:00 |
|
chenmin
|
73537a30cb
|
修复资源上传人不能下载项目讨论区非公开资源的问题
|
2014-08-20 11:39:41 +08:00 |
|
linhk
|
507235cd69
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-20 10:51:08 +08:00 |
|
linhk
|
4c57136a1d
|
项目留言删除功能
|
2014-08-20 10:50:29 +08:00 |
|
sw
|
f396a45e1f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-20 10:47:42 +08:00 |
|
sw
|
fae3c45920
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-20 10:46:50 +08:00 |
|
chenmin
|
80bd535b4f
|
课程讨论区回复帖子的内容增加删除附件功能；
增加可以编辑自己回复内容的功能；
|
2014-08-20 09:30:26 +08:00 |
|
z9hang
|
1e234a9adf
|
优化积分计算速度问题
|
2014-08-19 17:03:26 +08:00 |
|
sw
|
5fb1b220e5
|
#1369 修复查看作业列表错误的BUG
|
2014-08-18 16:46:34 +08:00 |
|
sw
|
1cd00f55fb
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-18 10:14:29 +08:00 |
|
z9hang
|
378c06379e
|
项目文档得分计算错误问题
|
2014-08-16 16:28:35 +08:00 |
|
sw
|
2b12654796
|
Merge branch 'szzh' into develop
|
2014-08-16 13:33:07 +08:00 |
|
z9hang
|
746022506d
|
用户列表排序问题、项目得分不一致问题
|
2014-08-15 17:43:10 +08:00 |
|
z9hang
|
2b6a376d31
|
修复数据库为初始状态时会出现的部分bug、去除部分连接的域名
|
2014-08-15 14:30:01 +08:00 |
|
z9hang
|
7b14be7310
|
错误提示页面导航栏丢失问题、新建问题跟踪red_project_scores问题
|
2014-08-15 08:54:19 +08:00 |
|
sw
|
46ba7f6a7b
|
Merge branch 'szzh' into develop
|
2014-08-14 15:55:43 +08:00 |
 zhanghaitao
|
88aa66b15b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-13 15:38:20 +08:00 |
|
zhanghaitao
|
4934c8c801
|
# 页面返回异常处理
|
2014-08-13 15:37:28 +08:00 |
|
z9hang
|
56aa2fb8dc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-08-13 11:21:37 +08:00 |
|
z9hang
|
caed78327a
|
积分计算修改
|
2014-08-13 11:17:22 +08:00 |
|
sw
|
ea0b7ef3f1
|
Merge branch 'szzh' into develop
|
2014-08-08 16:42:41 +08:00 |
|
linhk
|
044bba4d0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 16:44:00 +08:00 |
|
linhk
|
0028c11426
|
退出项目功能
|
2014-08-08 16:43:34 +08:00 |
|
z9hang
|
87f6f81279
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 15:09:48 +08:00 |
|
z9hang
|
f8c6b66119
|
修改密码处导航丢失问题
|
2014-08-08 15:09:32 +08:00 |
|
z9hang
|
683cd9f918
|
个人积分修改
|
2014-08-08 13:47:02 +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
|
b545c5034d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
|
2014-08-07 12:02:55 +08:00 |
|
z9hang
|
96fa28f70d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 11:36:08 +08:00 |
|
sw
|
b0b3f257a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 11:31:39 +08:00 |
|
z9hang
|
56a06c4a04
|
修复git说明页面导航丢失问题
修改个人得分
|
2014-08-07 11:28:58 +08:00 |
|
z9hang
|
eacc0fdf53
|
修复编辑作业提交时的bug
修改个人得分
|
2014-08-07 10:45:56 +08:00 |
|
sw
|
34af8053cc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-07 09:23:28 +08:00 |
|
z9hang
|
c6271e2aa9
|
修复由项目积分改动引起的一个页面无法查看bug、添加项目得分统计任务
|
2014-08-06 16:02:26 +08:00 |
|
sw
|
a4199e4c54
|
修改错误代码
|
2014-08-06 15:39:06 +08:00 |
|
z9hang
|
0eca547ec5
|
修复两个导航栏丢失问题、版本库=》查看差别，没有对应的文件或修订版本时报错问题
|
2014-08-06 15:03:43 +08:00 |
|
linhk
|
23c9d5381e
|
注册界面失败填写信息继续保留
修改注册见面企业提交失败姓、名内容错误Bug
|
2014-08-06 14:41:22 +08:00 |
|
z9hang
|
05186c8590
|
项目积分存数据库
有项目积分引起的系列bug
|
2014-08-06 11:46:38 +08:00 |
|
z9hang
|
1ca6447478
|
修复项目缺陷、新闻、讨论区等页面无法查看bug
|
2014-08-05 17:31:05 +08:00 |
|
z9hang
|
b4be18ab9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/files_controller.rb
|
2014-08-05 16:41:23 +08:00 |