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 |
z9hang
|
ee030e6fb5
|
讨论区发帖协同得分+2
|
11 years ago |
nwb
|
8768193e72
|
添加课程资源文件全部列表视图
|
11 years ago |
nwb
|
2f3d9b1795
|
1.修改资源文件类index方法
2.添加课程资源文件index视图
|
11 years ago |
yanxd
|
5bc20cf6af
|
push code, add score.
|
11 years ago |
yanxd
|
6bd71ce9f1
|
人物分数统计,行为得分,项目相关。提交代码pending
user_scores表结构有问题,重新构建表结构
bundle exec rake db:migrate:down VERSION=20140410021724
bundle exec rake db:migrate:up VERSION=20140410021724
|
11 years ago |
nwb
|
54505340eb
|
1.修正新建课程错误
2.优化课程角色权限判断
|
11 years ago |
yanxd
|
c3865ab319
|
notificationcomments
|
11 years ago |
wanglinchun
|
45e12c4bef
|
xx
|
11 years ago |
wanglinchun
|
7f5fa8b9b8
|
dfd
|
11 years ago |
yanxd
|
61d0532f14
|
user
|
11 years ago |
yanxd
|
dfde06248c
|
打分初步
|
11 years ago |
yanxd
|
db61ecc255
|
合并user_score属性
|
11 years ago |
nwb
|
59742b9ddb
|
1.给各角色添加项目相关的权限
2.添加课程权限解析系统
|
11 years ago |
yanxd
|
174c5556a0
|
减少sql查询, logger ===> Rails.logger
|
11 years ago |
yanxd
|
7b98d01d8a
|
Merge branch 'develop' into szzh
|
11 years ago |
nwb
|
388d14f075
|
迁移课程原讨论区数据
|
11 years ago |
z9hang
|
c5fc1a8709
|
作业留言问题修复
|
11 years ago |
yanxd
|
1c7923e5bd
|
sql
|
11 years ago |
nwb
|
ebe771db88
|
创建课程修改
|
11 years ago |
wanglinchun
|
00b1a40345
|
修改了竞赛通知及评论相关文件代码
|
11 years ago |
nwb
|
d22ffa84b4
|
1.课程标签迁移,从项目中分离
2.标签control\view添加对课程类标签的处理
|
11 years ago |
nwb
|
cd3c69af94
|
课程资源文件迁移,从项目中分离
|
11 years ago |
wanglinchun
|
f17c01010f
|
werew
|
11 years ago |
nwb
|
6ff26d06ab
|
修改课程基础页面逻辑(base_courses.html.erb)
|
11 years ago |
wanglinchun
|
982bf17ebc
|
dfd
|
11 years ago |
wanglinchun
|
8b78929190
|
修改竞赛通知中评论的相关文件
|
11 years ago |
nwb
|
de201ae8f6
|
添加课程管理员表,并从项目管理员表中迁移原有数据
|
11 years ago |
wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
11 years ago |
yanxd
|
2e11d76652
|
lin
|
11 years ago |
wanglinchun
|
ae70081288
|
eter
|
11 years ago |
nwb
|
a49cf3eb6b
|
1.修改课程作业路由
2.课程control添加作业显示方法
|
11 years ago |
nwb
|
69e366d841
|
迁移课程作业数据
|
11 years ago |
nwb
|
0d99644fa7
|
1.用户课程表逻辑修改
2.添加link_to_course相关逻辑
|
11 years ago |
nwb
|
fb36a0d5ba
|
1.课程control添加create方法
2.课程model添加部分新列及相关逻辑
|
11 years ago |
yanxd
|
8fb82bbdc4
|
register Mod
|
11 years ago |
nwb
|
4404222437
|
0604
|
11 years ago |
nwb
|
c43bf84e42
|
课程所包含的子功能模块(enabled_modules)相关逻辑修改
|
11 years ago |
yanxd
|
51bfb6cae8
|
user model save bug
|
11 years ago |
nwb
|
d87b52bedd
|
课程成员迁移
|
11 years ago |
wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
11 years ago |
wanglinchun
|
a3fb48a4bb
|
0603
|
11 years ago |
yanxd
|
510b1c4233
|
merge gem
|
11 years ago |
yanxd
|
37232cd5b2
|
把所有user_extensions的逻辑移到了user中,业务代码还没有修改,下一步是user_score和projectxxx,先测测效果
|
11 years ago |
nwb
|
cd10dd5433
|
课程权限判断变更,从项目权限分离
|
11 years ago |
wanglinchun
|
81a45fe977
|
dfs
|
11 years ago |
nwb
|
7d3d406c00
|
新增部分课程所需的解析函数
|
11 years ago |
wanglinchun
|
528af32f91
|
修改forge,localhost首页不能显示的问题
|
11 years ago |
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
11 years ago |
z9hang
|
4747375499
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
z9hang
|
45d17db8b6
|
实现给教师发课程留言邮件时根据教师设置判断是否发送邮件
|
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 |
z9hang
|
866ae3a38d
|
发送邮件部分代码优化
|
11 years ago |
nwb
|
ea3b80fdc6
|
添加CourseStatus表和model
|
11 years ago |
nwb
|
f936c30ec9
|
添加与course.index相关的control、view、help等实现
|
11 years ago |
z9hang
|
2e36949604
|
添加课程列表查看权限(需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看)
|
11 years ago |
z9hang
|
2d77975221
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/courses_helper.rb
app/views/bids/_homework_list.html.erb
config/locales/en.yml
|
11 years ago |
sw
|
218fb3f831
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
z9hang
|
daecf1a53b
|
老师收到课程留言区的直接留言及对老师的回复的邮件提醒
|
11 years ago |
z9hang
|
31804b3d45
|
发邮件
|
11 years ago |
sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的,只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时,作业最终得分只显示一个分字
|
11 years ago |
fanqiang
|
4c3e2376f0
|
修改帖子页面
|
11 years ago |
yanxd
|
a9b88b8e66
|
issues#show words typo
|
11 years ago |
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500;
修改了作品删除功能报错
|
11 years ago |
t430
|
edfd7372bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
yanxd
|
3ae7729539
|
Merge branch 'szzh' into develop
|
11 years ago |
yanxd
|
213939b474
|
realname
|
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
|
598429695f
|
Merge branch 'develop' into szzh
|
11 years ago |
yanxd
|
62f9ed052b
|
issues#655
|
11 years ago |
fanqiang
|
d3ead651fe
|
动态显示安全问题
|
11 years ago |
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
sw
|
65c3bb5eb1
|
1.作业列表评分结果显示保留2位有效数字
2.互评界面显示最终评分数值
3.增加互评按钮,修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示,取消描述
|
11 years ago |
yanxd
|
f44b930037
|
233
|
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 |
fanqiang
|
daa531268a
|
添加安全漏洞的关联表
帖子添加一个来源信息
|
11 years ago |
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
11 years ago |
nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
yanxd
|
19aba25625
|
course revert search project
|
11 years ago |
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
11 years ago |
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
fanqiang
|
aed4b250a0
|
修改数据库后修复bug
|
11 years ago |
yanxd
|
c4bd9aaabd
|
Merge branch 'szzh' into develop
|
11 years ago |
nwb
|
4156983494
|
缺陷添加缩略图显示
|
11 years ago |
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
fanqiang
|
87a6dd4938
|
修改开源项目社区中 每个项目的结构, 不再是一对一的匹配帖子,而是添加了一个中间表
|
11 years ago |
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段:name,description,state
|
11 years ago |
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
11 years ago |
fanqiang
|
543a199c5f
|
添加一张连接表relative_memo_to_open_source_projects
|
11 years ago |
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
11 years ago |
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
11 years ago |
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
11 years ago |
t430
|
00b866f06a
|
Merge branch 'develop'
|
11 years ago |
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
sw
|
b27b3e0a5a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
sw
|
029eb1a195
|
作业回复
|
11 years ago |
nwb
|
f218b87338
|
修正项目动态中缺陷编号错误的问题
|
11 years ago |
nwb
|
f1b086ef90
|
资源类型添加对ppt文档的支持
|
11 years ago |
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
11 years ago |
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
11 years ago |
nwb
|
6f0e621f3c
|
添加项目成员界面,显示用户的account
|
11 years ago |
nwb
|
9c24102e65
|
清理部分不需要的文件
|
11 years ago |
nwb
|
b237f578f4
|
提交缺陷发送邮件,问题编号修改
|
11 years ago |
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址;
参赛应用页面添加所属项目网址;
|
11 years ago |
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
11 years ago |
wanglinchun
|
fc2f35f247
|
将关联功能整合到新建参赛作品中,可以直接关联到竞赛中
|
11 years ago |
nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
11 years ago |
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
11 years ago |