nwb
|
f4aa817f42
|
修改合并后首页出错的问题
|
11 years ago |
nwb
|
88c3347f7c
|
修正合并分支后的创建课程错误
|
11 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
|
11 years ago |
z9hang
|
57cdb55282
|
修正get_level方法是用错误
仿照用户得分规则实现项目个人得分
|
11 years ago |
z9hang
|
f16bec924c
|
处理undefined method `update_user_level' for nil:NilClass问题
|
11 years ago |
nwb
|
6039cf63af
|
课程讨论区文件上传权限优化
|
11 years ago |
z9hang
|
31049fcf4e
|
修复同时更新缺陷状态和缺陷完成度时只有缺陷完成度加分及记录分数变化细节,缺陷状态更改操作未加分及记录分数变化细节bug
|
11 years ago |
z9hang
|
3e37a54a0f
|
修复竞赛处不能留言问题
|
11 years ago |
z9hang
|
9061a77221
|
修改user.user_score为空问题的解决方式
|
11 years ago |
nwb
|
f5c9123647
|
管理员创建课程逻辑修改,管理员创建课程后成为该课程成员
|
11 years ago |
sw
|
efb6c1fd19
|
1.修改、新增作业增加提交项目选项(可以为空)
2.homework_attach与project增加关联关系
|
11 years ago |
z9hang
|
ab486aa811
|
补充user_score_details Model及数据迁移文件
|
11 years ago |
z9hang
|
50dbe3d04a
|
添加记录得分变化功能
|
11 years ago |
nwb
|
936c40b490
|
提交作业逻辑和视图修改
|
11 years ago |
nwb
|
78612488e5
|
1.修改新建作业及视图
2.修改编辑作业及视图
|
11 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
|
11 years ago |
z9hang
|
697a6034b2
|
新得分显示
|
11 years ago |
nwb
|
9c3605320e
|
加入、退出课程逻辑优化
|
11 years ago |
nwb
|
b4e78d2b0c
|
课程添加成员逻辑更改
|
11 years ago |
nwb
|
e698f3a6c6
|
修改新建课程成员时的唯一性判断
|
11 years ago |
nwb
|
59a261d96d
|
1.优化课程通知动态和权限判断
2.优化课程通知讨论区动态和权限判断
|
11 years ago |
nwb
|
755e758596
|
优化课程资源文件动态和权限判断
|
11 years ago |
yanxd
|
63cd19c15c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
yanxd
|
955fece267
|
merge develop
|
11 years ago |
z9hang
|
eae3918074
|
添加用户得数统计功能
帖子内的踩顶横排
|
11 years ago |
nwb
|
8a274981ce
|
修改课程动态
|
11 years ago |
yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
11 years ago |
z9hang
|
621346268f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
z9hang
|
e8d561b4ba
|
修正贴吧顶踩加分无效问题
|
11 years ago |
nwb
|
b178be984d
|
添加课程搜索处理
|
11 years ago |
z9hang
|
4fb96bacdc
|
修正更新用户等级方法,保证每个用户只有一条记录
|
11 years ago |
z9hang
|
a42c79cea2
|
添加用户升级功能(用户达到一定条件时自动升级,未在前端体现)
|
11 years ago |
yanxd
|
858a7936b5
|
revert userscore catch exception, added cache to footer.
|
11 years ago |
nwb
|
3933817570
|
1.修改课程配置界面
2.新增课程成员修改
3.删除课程成员修改
4.课程成员类型更改支持
|
11 years ago |
sw
|
9bd8132359
|
修复作业无法留言、无法综评的BUG
|
11 years ago |
z9hang
|
ebbd4b0642
|
课程讨论区踩顶帖子
会员等级计算(占位实现自动升级)
技术得分计算
|
11 years ago |
nwb
|
ae8fcca14f
|
1.课程接触视图修改
2.添加课程成员列表视图
|
11 years ago |
nwb
|
165dbc3f78
|
修改words_controller与课程相关方法及视图
|
11 years ago |
nwb
|
863dec03d2
|
添加课程讨论区show视图
|
11 years ago |
nwb
|
97d920c195
|
修改新增课程通知视图
|
11 years ago |
z9hang
|
a8670ba6fc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
nwb
|
d6280befca
|
修改新闻model、路由、index方法
|
11 years ago |
z9hang
|
e606fd89d2
|
被关注+2分、取消关注-2分
讨论区帖子加顶踩功能
顶踩帖子加减分接口
|
11 years ago |
nwb
|
3165d97417
|
1.迁移课程新闻数据
2.添加课程新闻index视图
|
11 years ago |
sw
|
872b7efb84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
nwb
|
59051972e1
|
1.修改课程资源删除
2.修改课程资源上传后的界面刷新
|
11 years ago |
sw
|
d0dd6eb781
|
1.修改作业时实现作业添加参与人员与删除参与人员
2.homework_attach、homework_user、users关系添加
3.优化页面显示
|
11 years ago |
nwb
|
cb2c5960fc
|
修改资源文件activity事件BUG
|
11 years ago |
nwb
|
b6c9415a4b
|
1.给各角色添加浏览课程资源文件权限
2.修改课程动态显示逻辑
|
11 years ago |
z9hang
|
7eb3c9f874
|
缺陷留言+1分、
更改缺陷状态+1分、
对留言回复+1分、
对帖子的回复+1分、
添加分数修正方法,分数为负时修正为0
|
11 years ago |