 sw
|
86adfaecce
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
7bcb1cbe2e
|
修复个人主页中作业、项目介绍不正确的BUG
|
11 years ago |
|
sw
|
47ad20421e
|
修复当课程描述中有特殊标签是，课程列表描述显示有误的BUG
|
11 years ago |
|
sw
|
39434766e3
|
1.修复超级管理员无法访问课程作业列表的BUG
2.修改作业描述样式
|
11 years ago |
 yanxd
|
249ea19c0c
|
神坑，users和user_statuses表中，关注信息不同步，按照影响力排序还会有问题。以及users表中在us表没有对应条目，排序中是不会显示的
|
11 years ago |
|
yanxd
|
4dbe149b42
|
删掉user里的扩展表信息，防止第一次迁移失败
|
11 years ago |
 nwb
|
8b2199e28c
|
新建竞赛时的日期判断优化
|
11 years ago |
|
nwb
|
431b4541c3
|
新建竞赛时奖励设置为不能为空
|
11 years ago |
|
nwb
|
bc179fbc39
|
右上角菜单增加二级菜单
|
11 years ago |
|
nwb
|
0471446ac8
|
新增、修改缺陷发送邮件的缺陷编写优化
|
11 years ago |
|
nwb
|
5f18b1a38c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 z9hang
|
f5b69be967
|
新建贴吧描述为空不能新建、搜索空内容添加提示
|
11 years ago |
|
nwb
|
eb15edd5ff
|
1.添加文档
2.邮件中缺陷序号计算机制优化
2.项目、课程动态优化
|
11 years ago |
|
nwb
|
2395ee4b1d
|
留言发送邮件优化
|
11 years ago |
|
sw
|
698870ddee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
b6ebbab830
|
项目版本库名称限定优化
|
11 years ago |
|
nwb
|
b42605accd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
864ef17941
|
清理课程状态表，修正同一课程出现多次的BUG
|
11 years ago |
|
sw
|
b492ead0c0
|
修改学校链接
|
11 years ago |
|
sw
|
a1920ca54c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
0e0b8fb8d8
|
历史数据中当课程名称字段为空时从项目列表里获取名称
|
11 years ago |
|
nwb
|
ff8994fc9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
08a6dec39d
|
课程讨论区回复时主题只读
|
11 years ago |
|
z9hang
|
d525220aca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
2dd249a105
|
修正发帖不填主题报错问题，修正发帖内容为空可成功发布bug、修改主页贴吧动态里回帖数字颜色、修改昵称字符为不超过25个
|
11 years ago |
|
sw
|
740f6a19ec
|
项目名称唯一
|
11 years ago |
|
nwb
|
31e338f1e5
|
修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
|
11 years ago |
|
nwb
|
70dc5e2b49
|
去除主版本库标识允许为空的设置
|
11 years ago |
|
nwb
|
e8705bccb1
|
修改文件上传界面样式
|
11 years ago |
|
z9hang
|
d34ab220cc
|
登录名区分大小写
|
11 years ago |
|
z9hang
|
2e38f66899
|
搜索用户修改为按昵称搜索
|
11 years ago |
|
z9hang
|
a7fa444f9e
|
修正项目个人得分问题：统计时只计算项目成员，user_grade表user_id和project_id联合不重复验证，user_grade分数部位负验证
|
11 years ago |
|
z9hang
|
0bcc0beaf1
|
修复留言计分
|
11 years ago |
|
z9hang
|
33c883146a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
4906bad7d2
|
修正进项目报错异常
|
11 years ago |
|
nwb
|
671eaa8d45
|
测试
|
11 years ago |
|
z9hang
|
9a8c5ebecc
|
个人得分规则显示
留言回复未加分bug修改
|
11 years ago |
|
nwb
|
99c9f81aea
|
BUG修正
|
11 years ago |
|
nwb
|
ad97066a45
|
课程名称有效性判断
|
11 years ago |
|
nwb
|
c0f0e294e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
beeab518e8
|
课程动态中留言链接BUG修复
|
11 years ago |
|
z9hang
|
bc587f3e7d
|
屏蔽个人分数实时刷新功能
修复个人分数计分异常
|
11 years ago |
|
z9hang
|
2501f31ef1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
7399e1aca2
|
添加项目个人得分统计功能
|
11 years ago |
|
nwb
|
b4af75f289
|
部分界面优化
|
11 years ago |
|
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 |
|
nwb
|
a793b8923d
|
1.Non member角色添加add_couese权限
2.course_helper优化排序等相关函数
3.课程index界面修改
|
11 years ago |
|
nwb
|
f741b0581c
|
修改课程资源文件视图BUG
|
11 years ago |
|
nwb
|
a20feafa4e
|
1.添加课程动态model
2.优化课程动态逻辑及权限处理
|
11 years ago |
|
yanxd
|
541b22b84d
|
score statistics init
|
11 years ago |
|
z9hang
|
cae0893ea6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
