ShengYue.Xu
|
e6c8dbef4f
|
修改了版权符号，由原来的@改成了©
|
2014-08-20 21:22:19 +08:00 |
xianbo
|
70d5ffd95e
|
Merge tag 'V20140708' of http://repository.trustie.net/xianbo/trustie2
升级权限功能、wiki、gtilab前的相对稳定版
|
2014-07-11 10:13:50 +08:00 |
 nwb
|
dd396a6da2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-07 16:27:49 +08:00 |
|
nwb
|
8b2199e28c
|
新建竞赛时的日期判断优化
|
2014-07-07 15:01:10 +08:00 |
|
nwb
|
ae32b310cd
|
新建竞赛时的日期信息提醒变更
|
2014-07-07 14:39:44 +08:00 |
|
nwb
|
431b4541c3
|
新建竞赛时奖励设置为不能为空
|
2014-07-07 14:37:32 +08:00 |
|
nwb
|
b4ee106ce9
|
竞赛搜索项为空时给出提示
|
2014-07-07 14:31:21 +08:00 |
|
nwb
|
bc179fbc39
|
右上角菜单增加二级菜单
|
2014-07-07 13:41:44 +08:00 |
|
nwb
|
633c4278d8
|
修改课程列表视图
|
2014-07-07 10:12:07 +08:00 |
|
nwb
|
0471446ac8
|
新增、修改缺陷发送邮件的缺陷编写优化
|
2014-07-07 10:07:50 +08:00 |
|
nwb
|
beeb707347
|
用户未登陆时首页不提示“该学校未开设任何课程”
|
2014-07-07 09:37:45 +08:00 |
|
nwb
|
5f18b1a38c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 15:11:57 +08:00 |
 z9hang
|
f5b69be967
|
新建贴吧描述为空不能新建、搜索空内容添加提示
|
2014-07-05 14:43:15 +08:00 |
|
nwb
|
fb8e97ff61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/show.html.erb
|
2014-07-05 13:51:41 +08:00 |
|
nwb
|
eb15edd5ff
|
1.添加文档
2.邮件中缺陷序号计算机制优化
2.项目、课程动态优化
|
2014-07-05 13:31:32 +08:00 |
|
z9hang
|
5c93442c79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 11:44:21 +08:00 |
|
z9hang
|
01da0852e3
|
新建贴吧错误提示修改
|
2014-07-05 11:44:05 +08:00 |
 sw
|
6365d01051
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 11:21:27 +08:00 |
|
sw
|
f1b8b7caed
|
t
|
2014-07-05 11:20:59 +08:00 |
|
z9hang
|
470f40db82
|
去除绝对网址
|
2014-07-05 11:00:01 +08:00 |
|
z9hang
|
011d161f8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 09:49:57 +08:00 |
 yanxd
|
db28ecd883
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-05 09:40:11 +08:00 |
|
yanxd
|
2fa9a4855c
|
最后创建人信息的正确显示（+去掉了乱78糟的table套table）
div-class内标明activity-title等，内嵌css属性等没有问题再移动出html文件
|
2014-07-05 09:39:58 +08:00 |
|
nwb
|
efbffa7436
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-05 09:34:34 +08:00 |
|
nwb
|
c927bb6fd6
|
首页课程列表修改
|
2014-07-05 09:33:52 +08:00 |
|
z9hang
|
8c65e1ac03
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 16:56:26 +08:00 |
|
z9hang
|
c709545809
|
提交后点击版本库才刷新项目积分问题（尚需测试）
|
2014-07-04 16:55:59 +08:00 |
|
sw
|
8b389776a1
|
打开缺陷列表改为从新建窗口打开
|
2014-07-04 16:14:11 +08:00 |
|
sw
|
65c25feabb
|
修复项目的缺陷模块改版之后，新增缺陷界面找不到的问题
|
2014-07-04 16:00:18 +08:00 |
|
nwb
|
fd25f42e61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 15:41:38 +08:00 |
|
nwb
|
2395ee4b1d
|
留言发送邮件优化
|
2014-07-04 15:41:26 +08:00 |
|
sw
|
eac725a0f4
|
修改作业、用户、课程界面中相关学校的链接
|
2014-07-04 15:21:56 +08:00 |
|
sw
|
698870ddee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 14:48:06 +08:00 |
|
sw
|
71b17cd98e
|
1
|
2014-07-04 14:47:38 +08:00 |
|
yanxd
|
8ccc39ae71
|
首页更多报错
|
2014-07-04 14:43:57 +08:00 |
|
nwb
|
b6ebbab830
|
项目版本库名称限定优化
|
2014-07-04 14:19:34 +08:00 |
|
sw
|
62bcccedea
|
新建作业时给必填项添加*号
|
2014-07-04 14:04:31 +08:00 |
|
sw
|
bc9f1e5a01
|
1.修改软件创客中每个用户内容显示不一致的BUG
2.去掉用户项目列表最后一个项目后的逗号
|
2014-07-04 13:59:08 +08:00 |
|
nwb
|
164d4f9e78
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-04 13:39:34 +08:00 |
|
nwb
|
b42605accd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 13:38:50 +08:00 |
|
nwb
|
864ef17941
|
清理课程状态表，修正同一课程出现多次的BUG
|
2014-07-04 13:38:34 +08:00 |
|
sw
|
b492ead0c0
|
修改学校链接
|
2014-07-04 11:51:26 +08:00 |
|
sw
|
a1920ca54c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 11:31:09 +08:00 |
|
yanxd
|
36c90f1dfd
|
取不到学校，再拿id直接空指针
|
2014-07-04 11:30:41 +08:00 |
|
sw
|
0e0b8fb8d8
|
历史数据中当课程名称字段为空时从项目列表里获取名称
|
2014-07-04 11:30:22 +08:00 |
|
sw
|
1e6693cdcf
|
1.取消软件创客界面2个个人得分显示
2.修复软件创客界面用户参与课程显示不正确的BUG
3.添加获取用户参与的未过期的项目列表
|
2014-07-04 11:26:37 +08:00 |
|
yanxd
|
d54f37e630
|
个人动态，判断留言人逻辑有误
|
2014-07-04 11:15:58 +08:00 |
|
nwb
|
3a7065bb2d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-04 11:12:27 +08:00 |
|
nwb
|
ff8994fc9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 11:11:38 +08:00 |
|
nwb
|
08a6dec39d
|
课程讨论区回复时主题只读
|
2014-07-04 11:11:27 +08:00 |