ganyiang
|
0335e06df0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-29 21:44:17 +08:00 |
|
ganyiang
|
c8ca5277a6
|
新增osp项目“聚焦”标签 （演示用）
|
2014-05-29 21:43:50 +08:00 |
 fanqiang
|
150bb1ba1e
|
修改开源社区主页中的漏洞展示部分
|
2014-05-29 20:48:51 +08:00 |
|
fanqiang
|
b47cec9c3a
|
修改bug展示界面问题
|
2014-05-29 20:01:52 +08:00 |
|
fanqiang
|
d17ce35596
|
修改项目展示界面中bug的链接问题，将会重新打开页面
|
2014-05-29 19:54:38 +08:00 |
|
fanqiang
|
91d61502a2
|
将软件漏洞改为软件态势
|
2014-05-29 19:49:33 +08:00 |
|
ganyiang
|
4b1212f279
|
修正OSP在rubymine下报红的小问题
删掉一些无用代码
|
2014-05-29 09:55:22 +08:00 |
|
xianbo
|
a70593ad76
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-27 17:26:24 +08:00 |
|
yanxd
|
200c052bb4
|
watchers
|
2014-05-27 17:14:37 +08:00 |
|
fanqiang
|
06a775e3f9
|
修改帖子显示数字错误
修改来源显示错误问题
|
2014-05-27 16:42:22 +08:00 |
|
xianbo
|
0f56d9e885
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-27 16:41:31 +08:00 |
|
fanqiang
|
4c3e2376f0
|
修改帖子页面
|
2014-05-27 16:25:43 +08:00 |
|
fanqiang
|
fdf8b5640a
|
添加显示bug的页面
|
2014-05-27 09:01:36 +08:00 |
|
yanxd
|
a9b88b8e66
|
issues#show words typo
|
2014-05-27 08:51:03 +08:00 |
|
fanqiang
|
6dba5aaae6
|
修改帖子中 回复，关注，浏览的链接错误
|
2014-05-27 08:16:35 +08:00 |
 yanxd
|
654cb404e2
|
bootstrap test
|
2014-05-26 11:27:10 +08:00 |
|
fanqiang
|
401f097079
|
项目展示页面添加帖子的发布者信息
|
2014-05-26 11:18:57 +08:00 |
|
fanqiang
|
f392fc244f
|
修改连接，进入帖子后应该进入新的界面
去掉项目展示部分的发布帖子连接
|
2014-05-26 11:05:02 +08:00 |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
2014-05-26 09:05:36 +08:00 |
|
yanxd
|
2273a6fd0b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-26 08:56:58 +08:00 |
|
yanxd
|
d77d7e14c7
|
home page memo css no wrap
|
2014-05-26 08:56:16 +08:00 |
|
yanxd
|
7a4e5afba0
|
test
|
2014-05-24 12:12:38 +08:00 |
 z9hang
|
0e6d9a804a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-24 09:03:38 +08:00 |
|
z9hang
|
ee3a5f5719
|
代码修改
|
2014-05-23 17:40:59 +08:00 |
|
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-05-23 17:12:10 +08:00 |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
2014-05-23 17:07:58 +08:00 |
|
xianbo
|
be1a0e0fea
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-23 14:32:26 +08:00 |
|
xianbo
|
734caef3dc
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-23 14:21:34 +08:00 |
|
xianbo
|
a3a95556a3
|
fix 王林春提交了冲突文件
|
2014-05-23 14:16:32 +08:00 |
|
z9hang
|
ad5ac329f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-23 11:50:48 +08:00 |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
2014-05-23 11:50:36 +08:00 |
|
t430
|
edfd7372bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-05-23 11:42:41 +08:00 |
|
yanxd
|
4eebd48f92
|
realname
|
2014-05-23 11:38:30 +08:00 |
|
yanxd
|
3ae7729539
|
Merge branch 'szzh' into develop
|
2014-05-23 11:00:46 +08:00 |
|
yanxd
|
213939b474
|
realname
|
2014-05-23 10:59:52 +08:00 |
 wanglinchun
|
4081ef93a3
|
参赛作品发布人不能打分和评论；
匿名用户隐藏打分功能
|
2014-05-23 10:51:07 +08:00 |
|
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
2014-05-23 09:49:36 +08:00 |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-23 09:44:33 +08:00 |
|
yanxd
|
6b5fda1c78
|
read txt attachment
|
2014-05-23 09:18:17 +08:00 |
 sw
|
0ec7d6b4e7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-22 20:01:34 +08:00 |
|
sw
|
71bbc50542
|
增加作业留言的分页显示
|
2014-05-22 20:01:26 +08:00 |
|
yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
2014-05-22 19:59:50 +08:00 |
|
yanxd
|
62f9ed052b
|
issues#655
|
2014-05-22 19:58:13 +08:00 |
 nwb
|
eb5138e103
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-22 18:59:18 +08:00 |
|
nwb
|
9c75b701f4
|
修改BUG
|
2014-05-22 18:59:09 +08:00 |
|
fanqiang
|
d3ead651fe
|
动态显示安全问题
|
2014-05-22 17:04:45 +08:00 |
|
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-22 16:38:04 +08:00 |
|
sw
|
65c3bb5eb1
|
1.作业列表评分结果显示保留2位有效数字
2.互评界面显示最终评分数值
3.增加互评按钮，修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示，取消描述
|
2014-05-22 16:37:39 +08:00 |
|
ganyiang
|
5374addb5a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-22 16:08:08 +08:00 |
|
ganyiang
|
c70352011d
|
修复buglist.css对整体界面的影响
|
2014-05-22 15:46:22 +08:00 |