xianbo
|
be1a0e0fea
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
xianbo
|
734caef3dc
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
xianbo
|
a3a95556a3
|
fix 王林春提交了冲突文件
|
11 years ago |
 z9hang
|
ad5ac329f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
11 years ago |
|
t430
|
edfd7372bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
 yanxd
|
4eebd48f92
|
realname
|
11 years ago |
|
yanxd
|
3ae7729539
|
Merge branch 'szzh' into develop
|
11 years ago |
|
yanxd
|
213939b474
|
realname
|
11 years ago |
 wanglinchun
|
4081ef93a3
|
参赛作品发布人不能打分和评论；
匿名用户隐藏打分功能
|
11 years ago |
|
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
11 years ago |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
6b5fda1c78
|
read txt attachment
|
11 years ago |
 sw
|
0ec7d6b4e7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
71bbc50542
|
增加作业留言的分页显示
|
11 years ago |
|
yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
62f9ed052b
|
issues#655
|
11 years ago |
 nwb
|
eb5138e103
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
9c75b701f4
|
修改BUG
|
11 years ago |
 fanqiang
|
d3ead651fe
|
动态显示安全问题
|
11 years ago |
|
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
65c3bb5eb1
|
1.作业列表评分结果显示保留2位有效数字
2.互评界面显示最终评分数值
3.增加互评按钮，修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示，取消描述
|
11 years ago |
|
yanxd
|
2681c3ce88
|
...
|
11 years ago |
ganyiang
|
5374addb5a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
ganyiang
|
c70352011d
|
修复buglist.css对整体界面的影响
|
11 years ago |
|
yanxd
|
f44b930037
|
233
|
11 years ago |
|
ganyiang
|
f0f807b2de
|
修改OSP社区的态势分析图表显示；
仅供演示！
|
11 years ago |
|
nwb
|
4f9625b265
|
修改BUG
|
11 years ago |
|
wanglinchun
|
2f709c92ba
|
重构bid_helper，contest_helper以及application_helper中共同用到的方法
|
11 years ago |
|
nwb
|
f51873d98b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
11 years ago |
|
fanqiang
|
daa531268a
|
添加安全漏洞的关联表
帖子添加一个来源信息
|
11 years ago |
|
yanxd
|
34aa8433de
|
import hubspot
|
11 years ago |
|
fanqiang
|
0b79cbac32
|
修改帖子的链接，帖子不在自己社区显示，而是直接链接到其他的网站
|
11 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
7748704c3a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
fanqiang
|
10aa8eee81
|
显示帖子的发布者和时间
|
11 years ago |
|
wanglinchun
|
907960fe75
|
sdf
|
11 years ago |
|
wanglinchun
|
5c7040a66b
|
dsfsf
|
11 years ago |
|
wanglinchun
|
a22678f36f
|
彻底调好了新建参赛作品后弹出的提示框问题
|
11 years ago |
|
wanglinchun
|
e10c6adf7a
|
隐藏掉新建参赛作品中完成后上传文件小框中出现的提示语
|
11 years ago |
|
wanglinchun
|
88b7fd24b1
|
给新建参赛作品中托管项目添加默认选项，使用户自行选择是否需要将参赛作品托管到制定的项目中
|
11 years ago |
|
nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
1d6816419d
|
优化用户申请加入项目界面刷新
|
11 years ago |
|
wanglinchun
|
56b66c8f5f
|
给参赛作品页面中托管项目添加超链接
|
11 years ago |
|
z9hang
|
7d9b2c751b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
4fffd321d2
|
竞赛、课程主页贴吧动态及贴吧内帖子列表添加最后回复人
|
11 years ago |
|
yanxd
|
9edb8a49de
|
fontsize fix
|
11 years ago |
|
yanxd
|
3e8decf1d1
|
student user_course
|
11 years ago |
|
yanxd
|
c5a3a5bac3
|
user_courses.html
|
11 years ago |
