 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 |
|
yanxd
|
2681c3ce88
|
...
|
2014-05-22 16:12:42 +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
|
907960fe75
|
sdf
|
2014-05-22 09:46:00 +08:00 |
|
wanglinchun
|
5c7040a66b
|
dsfsf
|
2014-05-22 09:42:58 +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
|
9edb8a49de
|
fontsize fix
|
2014-05-21 18:38:46 +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 |