 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 |
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
 fanqiang
|
9e05ecf5b4
|
修改主页展示部分
|
11 years ago |
|
fanqiang
|
150bb1ba1e
|
修改开源社区主页中的漏洞展示部分
|
11 years ago |
 wanglinchun
|
9f29a6c82a
|
将base的格式引入竞赛通知中，使其局部不同，接下来将通知的功能逐步引入
|
11 years ago |
|
wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
11 years ago |
 z9hang
|
2e36949604
|
添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看）
|
11 years ago |
 sw
|
3546355f70
|
增加修改昵称功能以及昵称是否重复的判断
|
11 years ago |
|
sw
|
218fb3f831
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
 nwb
|
b52690adc2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
61135a352a
|
上传文件表单支持添加文件标签
|
11 years ago |
|
yanxd
|
5d8edb218f
|
管理员查看user_projects 课程项目混淆的问题
|
11 years ago |
|
z9hang
|
cd333c8f35
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的，只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时，作业最终得分只显示一个分字
|
11 years ago |
|
xianbo
|
a70593ad76
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
yanxd
|
200c052bb4
|
watchers
|
11 years ago |
|
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
11 years ago |
|
xianbo
|
0f56d9e885
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
nwb
|
68b9a7efc5
|
修正批准成员申请未选择角色时的BUG
|
11 years ago |
|
fanqiang
|
fdf8b5640a
|
添加显示bug的页面
|
11 years ago |
|
wanglinchun
|
4afc41a171
|
修改了编辑参赛作品不能更新托管项目的问题
|
11 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
11 years ago |
|
z9hang
|
ddf5590c54
|
修复个人主页查看关注的项目时报user_id指代不明的sql错误
|
11 years ago |
|
wanglinchun
|
8d77c62359
|
sdfd
|
11 years ago |
|
z9hang
|
ab85ee5169
|
admin个人主页项目功能修正
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
|
11 years ago |
|
wanglinchun
|
b416d69639
|
vxc
|
11 years ago |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
7a4e5afba0
|
test
|
11 years ago |
|
z9hang
|
0e6d9a804a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
ee3a5f5719
|
代码修改
|
11 years ago |
|
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
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 |
|
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 |
|
nwb
|
4f9625b265
|
修改BUG
|
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 |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
11 years ago |
