 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 |
