 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 |
 wanglinchun
|
d20114cc42
|
竞赛子站国际化完成
|
2014-05-26 19:51:20 +08:00 |
|
wanglinchun
|
4afc41a171
|
修改了编辑参赛作品不能更新托管项目的问题
|
2014-05-26 19:46:49 +08:00 |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
2014-05-26 19:19:11 +08:00 |
|
wanglinchun
|
8d77c62359
|
sdfd
|
2014-05-26 16:37:06 +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 |
|
wanglinchun
|
b416d69639
|
vxc
|
2014-05-26 11:01:17 +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 |
|
wanglinchun
|
b13638bb95
|
竞赛子站国际化
|
2014-05-24 11:11:11 +08:00 |
|
wanglinchun
|
7b6c96a8b6
|
view中contests中的文件已经全部国际化
|
2014-05-24 10:56:58 +08:00 |
|
wanglinchun
|
8b356cddb1
|
修改用户留言页面中未登录状态下的提示语位置
|
2014-05-24 09:30:23 +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 |
|
yanxd
|
f44b930037
|
233
|
2014-05-22 15:33:38 +08:00 |
|
ganyiang
|
f0f807b2de
|
修改OSP社区的态势分析图表显示；
仅供演示！
|
2014-05-22 15:14:26 +08:00 |
|
nwb
|
4f9625b265
|
修改BUG
|
2014-05-22 13:40:41 +08:00 |
|
wanglinchun
|
2f709c92ba
|
重构bid_helper，contest_helper以及application_helper中共同用到的方法
|
2014-05-22 12:38:30 +08:00 |
|
nwb
|
f51873d98b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-22 11:58:55 +08:00 |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
2014-05-22 11:58:43 +08:00 |
|
fanqiang
|
daa531268a
|
添加安全漏洞的关联表
帖子添加一个来源信息
|
2014-05-22 11:05:15 +08:00 |
|
yanxd
|
34aa8433de
|
import hubspot
|
2014-05-22 11:00:13 +08:00 |
|
fanqiang
|
0b79cbac32
|
修改帖子的链接，帖子不在自己社区显示，而是直接链接到其他的网站
|
2014-05-22 10:28:09 +08:00 |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
2014-05-22 09:58:19 +08:00 |
|
sw
|
7748704c3a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-22 09:51:05 +08:00 |
|
fanqiang
|
10aa8eee81
|
显示帖子的发布者和时间
|
2014-05-22 09:50:37 +08:00 |
|
wanglinchun
|
a22678f36f
|
彻底调好了新建参赛作品后弹出的提示框问题
|
2014-05-21 20:27:23 +08:00 |
|
wanglinchun
|
e10c6adf7a
|
隐藏掉新建参赛作品中完成后上传文件小框中出现的提示语
|
2014-05-21 20:24:45 +08:00 |
|
wanglinchun
|
88b7fd24b1
|
给新建参赛作品中托管项目添加默认选项，使用户自行选择是否需要将参赛作品托管到制定的项目中
|
2014-05-21 19:59:36 +08:00 |
|
nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-21 19:31:05 +08:00 |
|
nwb
|
1d6816419d
|
优化用户申请加入项目界面刷新
|
2014-05-21 19:30:49 +08:00 |
|
wanglinchun
|
56b66c8f5f
|
给参赛作品页面中托管项目添加超链接
|
2014-05-21 19:18:22 +08:00 |
|
z9hang
|
7d9b2c751b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-21 18:52:27 +08:00 |
|
z9hang
|
4fffd321d2
|
竞赛、课程主页贴吧动态及贴吧内帖子列表添加最后回复人
|
2014-05-21 18:52:15 +08:00 |
|
yanxd
|
3e8decf1d1
|
student user_course
|
2014-05-21 18:29:56 +08:00 |
|
yanxd
|
c5a3a5bac3
|
user_courses.html
|
2014-05-21 18:21:57 +08:00 |
|
z9hang
|
21e58ce3df
|
课程列表中课程成员数量显示n+（不显示精确数）
只有课程成员能点击教师数量学生数量的链接和查看已提交作业的列表
|
2014-05-21 17:33:02 +08:00 |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
2014-05-21 16:45:11 +08:00 |
|
yanxd
|
19aba25625
|
course revert search project
|
2014-05-21 15:31:10 +08:00 |
|
sw
|
8bb8de7d7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-21 15:31:05 +08:00 |
|
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
2014-05-21 14:44:53 +08:00 |
|
sw
|
c7b19d8f2e
|
修改作业提交流程
|
2014-05-21 14:10:11 +08:00 |
|
wanglinchun
|
12f3da8416
|
sdf
|
2014-05-21 11:34:04 +08:00 |
|
wanglinchun
|
518de57123
|
将参赛作品编辑更新后的提示语修改为汉语
|
2014-05-21 11:24:11 +08:00 |
|
wanglinchun
|
947c0f8f64
|
竞赛页面中添加参赛作品成功创建的提示语
|
2014-05-21 11:16:46 +08:00 |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-05-21 11:09:22 +08:00 |
|
nwb
|
0f340a7cda
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-21 11:04:36 +08:00 |
|
nwb
|
624a7f7bdd
|
还原资源文件管理的tag显示为一行
|
2014-05-21 11:03:16 +08:00 |
|
fanqiang
|
45fa8b384a
|
修改字体颜色
|
2014-05-21 10:24:34 +08:00 |
|
fanqiang
|
290d07ffdd
|
修改新建帖子bug（open_source_project）
|
2014-05-21 10:04:06 +08:00 |
|
fanqiang
|
c5dd0317c2
|
修改合并后的bug（open_source_project）
|
2014-05-21 09:54:05 +08:00 |
|
yanxd
|
0ab17f1e90
|
contest image show
|
2014-05-21 09:46:40 +08:00 |
|
wanglinchun
|
a5cb14274c
|
修改参赛作品页面中未登录状态下的提示
|
2014-05-21 09:43:42 +08:00 |
|
wanglinchun
|
dd43e2c3fc
|
竞赛页面我要参赛中添加判断，当用户未登录时提示登录后参赛
|
2014-05-21 09:38:08 +08:00 |
|
xianbo
|
e3fe69c445
|
Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/open_source_projects/_show_topics.html.erb
|
2014-05-21 08:25:20 +08:00 |
|
z9hang
|
45339e53d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-20 18:07:25 +08:00 |
|
fanqiang
|
973a59042c
|
修改帖子显示用户名与链接问题
|
2014-05-20 16:33:50 +08:00 |
|
wanglinchun
|
bcb3bf0c19
|
调整参赛作品编辑页面中托管项目列表的显示宽度
|
2014-05-20 16:13:59 +08:00 |
|
fanqiang
|
aed4b250a0
|
修改数据库后修复bug
|
2014-05-20 16:10:05 +08:00 |
|
wanglinchun
|
77b7da81fd
|
参赛作品页面编辑功能中添加修改托管项目列表完成
|
2014-05-20 15:58:34 +08:00 |