 z9hang
|
d83899e3e4
|
添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码（未应用）
|
12 years ago |
 yanxd
|
0d8b06ec87
|
e, bug
|
12 years ago |
|
yanxd
|
57994edc06
|
load user in homework
|
12 years ago |
|
yanxd
|
1c7923e5bd
|
sql
|
12 years ago |
 wanglinchun
|
ca01f5c9cc
|
rt
|
12 years ago |
|
wanglinchun
|
92cd6f2fdd
|
sd
|
12 years ago |
 sw
|
8e2288a362
|
1.封装获取作业平均评分方法
2.优化作业列表界面效率
|
12 years ago |
|
wanglinchun
|
00b1a40345
|
修改了竞赛通知及评论相关文件代码
|
12 years ago |
|
sw
|
999b856d84
|
优化打开作业列表界面效率
|
12 years ago |
|
wanglinchun
|
f1555bf134
|
dfg
|
12 years ago |
|
sw
|
81a97f6a5e
|
1.老师创建作业增加功能：是否启用互评，以及该功能的修改。对不启用互评的作业，学生不可下载作业，不可互相打分，但可以留言；老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
2.对启用互评的作业，每个用户只可以进行一次打分，打分后不可修改
|
12 years ago |
|
wanglinchun
|
8b78929190
|
修改竞赛通知中评论的相关文件
|
12 years ago |
|
sw
|
b0a88eb5ac
|
增加作业按评分排序
|
12 years ago |
|
wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
12 years ago |
|
wanglinchun
|
ae70081288
|
eter
|
12 years ago |
|
sw
|
af68d15451
|
作业的增、删、改、查以及作业资料的下载增加权限控制
|
12 years ago |
|
sw
|
94542e935a
|
增加点击作业名下载改作业下所有附件的功能
|
12 years ago |
|
sw
|
2bbcff54d3
|
取消作业提交形式选择，统一为提交文件
|
12 years ago |
|
sw
|
80afefcd28
|
修改可对文件进行增、删等操作
|
12 years ago |
|
sw
|
66c9de94a8
|
修复新增作业后页面不会跳转的问题
|
12 years ago |
|
sw
|
50171ad0f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
wanglinchun
|
9d783a7caa
|
修改竞赛通知等tab-menu的显示状态
|
12 years ago |
|
wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
12 years ago |
|
wanglinchun
|
a3fb48a4bb
|
0603
|
12 years ago |
|
z9hang
|
3a80a80841
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
9bfe9ba1b2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
27be52e58d
|
老师的邮件中增加取消邮件通知链接
修复主页文件上传动态中点击进入附件跳转错误问题
|
12 years ago |
|
sw
|
5ef1332ded
|
实现修改、删除作业后页面跳转
|
12 years ago |
|
sw
|
1a0de23b38
|
修改作业在进行修改、删除、添加时的代码
|
12 years ago |
|
wanglinchun
|
81a45fe977
|
dfs
|
12 years ago |
|
yanxd
|
7d6311f8e4
|
Merge branch 'develop' into szzh
|
12 years ago |
|
yanxd
|
789a8d1392
|
tag_name从ProjectInfo取用户抛错的问题
不查询网站信息（删东西
gemfile加pry判定
|
12 years ago |
|
wanglinchun
|
528af32f91
|
修改forge，localhost首页不能显示的问题
|
12 years ago |
|
sw
|
cc5eb3d0af
|
1. 修复作业无附件时会将作业删除的问题
2.修复作业无附件时不会显示作业的问题
3.去除多余页面显示
|
12 years ago |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
12 years ago |
|
yanxd
|
d2b90b98cc
|
1, 调整了settting中的成员显示，去掉了冗余的计算逻辑，打开页面速度快多了
2, 管理员身份查看作业列表 ==> true
|
12 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
12 years ago |
|
yanxd
|
6c5e7eca49
|
TODO
|
12 years ago |
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
 fanqiang
|
9e05ecf5b4
|
修改主页展示部分
|
12 years ago |
|
fanqiang
|
150bb1ba1e
|
修改开源社区主页中的漏洞展示部分
|
12 years ago |
|
wanglinchun
|
9f29a6c82a
|
将base的格式引入竞赛通知中，使其局部不同，接下来将通知的功能逐步引入
|
12 years ago |
|
sw
|
96504d6806
|
1.修改作业提交流程，
2.增加修改作业、删除作业方法
3.修改作业页面显示
|
12 years ago |
|
wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
12 years ago |
|
z9hang
|
2e36949604
|
添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看）
|
12 years ago |
|
sw
|
3546355f70
|
增加修改昵称功能以及昵称是否重复的判断
|
12 years ago |
|
sw
|
218fb3f831
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
config/locales/zh.yml
|
12 years ago |
 nwb
|
b52690adc2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
61135a352a
|
上传文件表单支持添加文件标签
|
12 years ago |
|
yanxd
|
5d8edb218f
|
管理员查看user_projects 课程项目混淆的问题
|
12 years ago |
|
z9hang
|
cd333c8f35
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的，只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时，作业最终得分只显示一个分字
|
12 years ago |
|
xianbo
|
a70593ad76
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
yanxd
|
200c052bb4
|
watchers
|
12 years ago |
|
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
12 years ago |
|
xianbo
|
0f56d9e885
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
nwb
|
68b9a7efc5
|
修正批准成员申请未选择角色时的BUG
|
12 years ago |
|
fanqiang
|
fdf8b5640a
|
添加显示bug的页面
|
12 years ago |
|
wanglinchun
|
4afc41a171
|
修改了编辑参赛作品不能更新托管项目的问题
|
12 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
12 years ago |
|
z9hang
|
ddf5590c54
|
修复个人主页查看关注的项目时报user_id指代不明的sql错误
|
12 years ago |
|
wanglinchun
|
8d77c62359
|
sdfd
|
12 years ago |
|
z9hang
|
ab85ee5169
|
admin个人主页项目功能修正
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
|
12 years ago |
|
wanglinchun
|
b416d69639
|
vxc
|
12 years ago |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
12 years ago |
|
yanxd
|
7a4e5afba0
|
test
|
12 years ago |
|
z9hang
|
0e6d9a804a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
ee3a5f5719
|
代码修改
|
12 years ago |
|
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
12 years ago |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
12 years ago |
|
z9hang
|
ad5ac329f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
12 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
|
12 years ago |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
6b5fda1c78
|
read txt attachment
|
12 years ago |
|
sw
|
0ec7d6b4e7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
sw
|
71bbc50542
|
增加作业留言的分页显示
|
12 years ago |
|
yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
12 years ago |
|
yanxd
|
62f9ed052b
|
issues#655
|
12 years ago |
|
nwb
|
eb5138e103
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
9c75b701f4
|
修改BUG
|
12 years ago |
|
fanqiang
|
d3ead651fe
|
动态显示安全问题
|
12 years ago |
|
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
nwb
|
4f9625b265
|
修改BUG
|
12 years ago |
|
nwb
|
f51873d98b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
12 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
sw
|
7748704c3a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
1d6816419d
|
优化用户申请加入项目界面刷新
|
12 years ago |
|
z9hang
|
7d9b2c751b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
yanxd
|
c5a3a5bac3
|
user_courses.html
|
12 years ago |
|
z9hang
|
21e58ce3df
|
课程列表中课程成员数量显示n+（不显示精确数）
只有课程成员能点击教师数量学生数量的链接和查看已提交作业的列表
|
12 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
12 years ago |
|
sw
|
8bb8de7d7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
12 years ago |
|
sw
|
c7b19d8f2e
|
修改作业提交流程
|
12 years ago |
|
wanglinchun
|
518de57123
|
将参赛作品编辑更新后的提示语修改为汉语
|
12 years ago |
|
wanglinchun
|
947c0f8f64
|
竞赛页面中添加参赛作品成功创建的提示语
|
12 years ago |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
12 years ago |
