linhk
|
b30bfd073c
|
1
|
11 years ago |
linhk
|
66dfa1ce4f
|
解决删除项目主留言分页Url错误和页数错误的Bug
|
11 years ago |
linhk
|
4c57136a1d
|
项目留言删除功能
|
11 years ago |
sw
|
46ba7f6a7b
|
Merge branch 'szzh' into develop
|
11 years ago |
z9hang
|
56aa2fb8dc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
z9hang
|
caed78327a
|
积分计算修改
|
11 years ago |
sw
|
ea0b7ef3f1
|
Merge branch 'szzh' into develop
|
11 years ago |
linhk
|
0028c11426
|
退出项目功能
|
11 years ago |
sw
|
08821b9391
|
Merge branch 'szzh' into develop
|
11 years ago |
z9hang
|
05186c8590
|
项目积分存数据库
有项目积分引起的系列bug
|
11 years ago |
z9hang
|
7907edf168
|
更新项目得分规则
调整项目列表显示样式
|
11 years ago |
sw
|
d66dc65cca
|
Merge branch 'szzh' into develop
|
11 years ago |
z9hang
|
8a9e2b47ad
|
调用存储过程刷新项目提交次数
|
11 years ago |
sw
|
2141fcc3ca
|
将是否启用DTS测试移入项目模块配置
|
11 years ago |
yanxd
|
979d6dd067
|
dts_test. controller ===> model
|
11 years ago |
nwb
|
1257e67380
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
z9hang
|
673ffb1819
|
提交次数刷新问题
|
11 years ago |
nwb
|
b7c4f87a8f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/index.html.erb
|
11 years ago |
sw
|
b142953a4b
|
1.创建项目增加功能:是否启动DTS测试,默认为不启用。根据用户选择,决定左侧DTS测试工具选项是否在该项目内显示
|
11 years ago |
sw
|
ef95835bc6
|
修复当前用户为超级管理员时,创建项目后,在个人信息的参与项目栏内无该项目的记录
|
11 years ago |
nwb
|
0031f90c64
|
1.课程动态中的私有的资源、文档进行权限判断
2.项目动态中的私有的资源、文档进行权限判断
|
11 years ago |
nwb
|
1d4dad22ad
|
Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
Conflicts:
ReadMe.txt
app/views/layouts/_base_footer.html.erb
|
11 years ago |
nwb
|
bdaf59513b
|
Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
Conflicts:
app/views/layouts/_base_footer.html.erb
|
11 years ago |
nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
11 years ago |
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
11 years ago |
z9hang
|
b87abf1f68
|
权限管理优化
|
11 years ago |
nwb
|
dd396a6da2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
z9hang
|
c709545809
|
提交后点击版本库才刷新项目积分问题(尚需测试)
|
11 years ago |
linchun
|
79f68c2231
|
Merge branch 'szzh' into develop
|
11 years ago |
z9hang
|
74603e1256
|
解决直接访问ajax链接地址报错问题
|
12 years ago |
nwb
|
7425178419
|
Merge branch 'CourseModify' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/layouts/base_homework.html.erb
app/views/projects/_course.html.erb
db/schema.rb
lib/redmine/activity/fetcher.rb
|
12 years ago |
linchun
|
c1e780a0f8
|
yan
|
12 years ago |
nwb
|
e367c03f6e
|
修正课程作业列表显示BUG
|
12 years ago |
nwb
|
099e8a0912
|
Merge branch 'szzh' into CourseModify
Conflicts:
app/controllers/application_controller.rb
app/views/attachments/upload.js.erb
app/views/courses/_homework_form.html.erb
app/views/layouts/base_courses.html.erb
app/views/users/_my_joinedcourse.html.erb
db/schema.rb
lib/redmine.rb
lib/redmine/access_control.rb
|
12 years ago |
nwb
|
9c3605320e
|
加入、退出课程逻辑优化
|
12 years ago |
z9hang
|
4478c86cea
|
添加课程 查看真名、查看成员、作业导出权限代码(未应用)
|
12 years ago |
z9hang
|
d83899e3e4
|
添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码(未应用)
|
12 years ago |
z9hang
|
2e36949604
|
添加课程列表查看权限(需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看)
|
12 years ago |
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
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 |
nwb
|
9c75b701f4
|
修改BUG
|
12 years ago |
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
12 years ago |
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
12 years ago |
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
12 years ago |
yanxd
|
a76620a741
|
welcome footer
判断成员列表的查看
|
12 years ago |
nwb
|
4f7087f9ae
|
课程修正为只有的教师才能查看学生学号
|
12 years ago |
z9hang
|
5649cc545e
|
修正项目列表界面搜索空值报错问题
|
12 years ago |
sw
|
5d2bb4ccbd
|
1.选择学校进入学校课程列表,点击更多由显示所有课程可能改为显示当前学校课程列表,之后排序也一样
2.当查询学校课程列表为空时,推荐改为本系统中本年度开设的最好的课程,同时加入课程改为关注课程。此时点击更多查看的为所有课程
3.查询出课程列表将学校和教师放在课程上面
|
12 years ago |
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
12 years ago |
yanxd
|
d257f4e853
|
随便关闭课程禁止//临时
|
12 years ago |