 sw
|
50171ad0f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 z9hang
|
3a80a80841
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
9bfe9ba1b2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
27be52e58d
|
老师的邮件中增加取消邮件通知链接
修复主页文件上传动态中点击进入附件跳转错误问题
|
11 years ago |
|
sw
|
5ef1332ded
|
实现修改、删除作业后页面跳转
|
11 years ago |
 yanxd
|
510b1c4233
|
merge gem
|
11 years ago |
|
yanxd
|
37232cd5b2
|
把所有user_extensions的逻辑移到了user中，业务代码还没有修改,下一步是user_score和projectxxx,先测测效果
|
11 years ago |
|
sw
|
1a0de23b38
|
修改作业在进行修改、删除、添加时的代码
|
11 years ago |
|
yanxd
|
7d6311f8e4
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
789a8d1392
|
tag_name从ProjectInfo取用户抛错的问题
不查询网站信息（删东西
gemfile加pry判定
|
11 years ago |
|
sw
|
cc5eb3d0af
|
1. 修复作业无附件时会将作业删除的问题
2.修复作业无附件时不会显示作业的问题
3.去除多余页面显示
|
11 years ago |
|
z9hang
|
2e9251530c
|
修改缺陷状态留言处引用的链接被遮住问题
|
11 years ago |
|
yanxd
|
bced2476cd
|
在更新下
|
11 years ago |
|
yanxd
|
d2b90b98cc
|
1, 调整了settting中的成员显示，去掉了冗余的计算逻辑，打开页面速度快多了
2, 管理员身份查看作业列表 ==> true
|
11 years ago |
|
z9hang
|
4747375499
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
8c33cf0afb
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
|
yanxd
|
6c5e7eca49
|
TODO
|
11 years ago |
|
z9hang
|
45d17db8b6
|
实现给教师发课程留言邮件时根据教师设置判断是否发送邮件
|
11 years ago |
|
yanxd
|
9194b32060
|
file/index上传文件功能里。 remote: true 文件是不能提交的！
|
11 years ago |
|
sw
|
22688dd5da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
ganyiang
|
44d24d038f
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
ganyiang
|
3c9279d285
|
修改标签错误
|
11 years ago |
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
ganyiang
|
e8b33bfd8f
|
修复osp主页index界面态势列表显示标题过长的问题
|
11 years ago |
|
ganyiang
|
e901e8046d
|
修改osp中allbug的显示界面
|
11 years ago |
|
ganyiang
|
a4d1e036f4
|
去除osp中“聚焦” 标签的链接（演示用）
|
11 years ago |
 fanqiang
|
9e05ecf5b4
|
修改主页展示部分
|
11 years ago |
|
ganyiang
|
0335e06df0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
ganyiang
|
c8ca5277a6
|
新增osp项目“聚焦”标签 （演示用）
|
11 years ago |
|
fanqiang
|
150bb1ba1e
|
修改开源社区主页中的漏洞展示部分
|
11 years ago |
 wanglinchun
|
9f29a6c82a
|
将base的格式引入竞赛通知中，使其局部不同，接下来将通知的功能逐步引入
|
11 years ago |
|
sw
|
96504d6806
|
1.修改作业提交流程，
2.增加修改作业、删除作业方法
3.修改作业页面显示
|
11 years ago |
|
wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
11 years ago |
|
fanqiang
|
b47cec9c3a
|
修改bug展示界面问题
|
11 years ago |
|
fanqiang
|
d17ce35596
|
修改项目展示界面中bug的链接问题，将会重新打开页面
|
11 years ago |
|
fanqiang
|
91d61502a2
|
将软件漏洞改为软件态势
|
11 years ago |
|
yanxd
|
006e4ae45e
|
user tab bar
|
11 years ago |
|
z9hang
|
866ae3a38d
|
发送邮件部分代码优化
|
11 years ago |
|
sw
|
86cb496f3f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
ganyiang
|
4b1212f279
|
修正OSP在rubymine下报红的小问题
删掉一些无用代码
|
11 years ago |
|
sw
|
5a2226af37
|
修改作业html
|
11 years ago |
|
z9hang
|
c4b292b711
|
个人主页项目课程动态，不能查看真名时不显示括号
|
11 years ago |
|
z9hang
|
4b119e2f00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
03c8f39729
|
1.修复登录提示描述不正确的问题
2.修改作业显示界面html
|
11 years ago |
|
z9hang
|
97ae2356bf
|
引用被遮住不能点问题
|
11 years ago |
|
sw
|
cbb2312047
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
b9550cedb9
|
课程作业显示界面修改
|
11 years ago |
|
z9hang
|
2e36949604
|
添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看）
|
11 years ago |
|
sw
|
91497d3f95
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
