 alan
|
4f5fe52485
|
基于苏稳添加的字段优化存储过程
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5874450d14
|
修改《学生列表排序用的存储过程》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 sw
|
05b9b26314
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
alan
|
fb398904b6
|
优化《学生列表》分页查询
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
0a58fce251
|
优化数据迁移效率
|
11 years ago |
|
sw
|
259799eb89
|
1.增加评分的model
2.修改评分表中为教师评分的历史数据的is_teacher_score的值
|
11 years ago |
|
sw
|
fa36e6d2b0
|
增加判断评分是不是老师评分的列
|
11 years ago |
|
alan
|
b79b08fa8f
|
编写《作业查询存储过程》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 =
|
bb23468c7d
|
Merge branch 'szzh' into api
Conflicts:
app/controllers/account_controller.rb
app/controllers/courses_controller.rb
db/schema.rb
|
11 years ago |
|
sw
|
2dab864199
|
#1689修改部分学生匿评得分大于5分
|
11 years ago |
|
alan
|
3d12d6f0e8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
Conflicts:
db/schema.rb
|
11 years ago |
 z9hang
|
29d4266c6c
|
引用次数的统计修改及按引用排序
|
11 years ago |
|
alan
|
63c9804da8
|
添加course_group表单到数据库中，并建立对应于members和courses之间的关联，
对相应页面的修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
www
|
53ecf8718f
|
[api]用户认证完成
|
11 years ago |
|
sw
|
bb1c1a0bb0
|
修改部分学生作业评分居然是6分
|
11 years ago |
|
z9hang
|
cf808598d2
|
全站搜索不在搜索非本人的私有资源，且他人的公开资源亦不能修改其公开私有属性2、添加迁移文件
|
11 years ago |
|
sw
|
91cb6e29d5
|
数据库增加是否开启匿评字段
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
|
11 years ago |
|
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
11 years ago |
|
sw
|
54a9044679
|
修改匿评个数可配置、以及增加其相关js验证
|
11 years ago |
|
alan
|
8cec84dca7
|
添加<公共贴吧 无帖子置顶功能 建议增加>，<管理员可以根据贴吧的热度选择将贴吧置顶>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 gonglexin
|
e8e7708d6e
|
作业匿评功能
|
11 years ago |
|
alan
|
12cf56d201
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
9c4c1679af
|
修改bug<有些课程school_id=0 或为空则课程进不去>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
c045b4682a
|
增加匿评分配作业表，以及和作业、作品、用户表关系键确认
|
11 years ago |
|
alan
|
bdc38014ac
|
修改bug《测试版：课程列表--点击个别课程返回500错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
94a4c0037a
|
修复bug《中国高校--地区列表无“港”、“澳”、“台” 建议增加》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
61815af8bd
|
添加港澳台高校信息
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
7e8ab97713
|
作业描述最大长度限制为3000个字符
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
f957666b25
|
部分网页标题不标准问题，补交之前漏掉未添加的文件
|
11 years ago |
|
sw
|
4957f6d55a
|
修改作业描述字段的类型，页面代码优化
|
11 years ago |
|
sw
|
341ee214c1
|
修复部分课程作业进入作业列表报错的BUG
|
11 years ago |
|
sw
|
b6551f8955
|
#1297修复学生能看到发布通知按钮的BUG
2.增加课程是否对学生开发的数据迁移
3.页面代码整理
解决方案：增加当前登录用户是否在课程有发布通知权限的判断
|
11 years ago |
|
sw
|
79f3c8efb3
|
删除错误迁移文件
|
11 years ago |
|
sw
|
d9fe607c5b
|
#1282 修复225号作业显示错误的BUG
解决方案：数据库问题
|
11 years ago |
|
sw
|
6b4e2ae37b
|
1.修改竞赛作品分类下拉列表选项
2.修改竞赛标题为全部显示
修改思路：更改数据库数据
|
11 years ago |
|
z9hang
|
62aa1d0ed5
|
提交迁移文件。。
|
11 years ago |
|
sw
|
445d29d036
|
1.修改新建帖子的长度上限设置，设置为2G
2.修改新建贴吧时贴吧的描述字段类型
|
11 years ago |
|
z9hang
|
56aa2fb8dc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
ef6f239182
|
增加课程资源分离出来相关表数据迁移
|
11 years ago |
|
sw
|
339a06007c
|
增加课程资源分离出来相关表
|
11 years ago |
|
sw
|
aa0caff077
|
修改部分项目讨论区描述仍为课程讨论区的描述
|
11 years ago |
|
sw
|
5564ca063b
|
整理迁移文件，修改迁移文件运行错误
|
11 years ago |
|
sw
|
a3cbcdad51
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
11 years ago |
|
sw
|
01ea6238a4
|
修复竞赛通知描述过长时报错的BUG
|
11 years ago |
|
z9hang
|
8871652e01
|
添加首页定制，设置是否显示"我的课程"功能
|
11 years ago |
|
z9hang
|
a1e06991d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
97531960da
|
首页定制添加剂修改图片大小功能
|
11 years ago |
|
sw
|
758541250f
|
插件数据增加迁移文件，确保数据库数据正确
|
11 years ago |
|
z9hang
|
138d90a887
|
添加数据迁移文件
|
11 years ago |
|
z9hang
|
f83336aed0
|
修改首页定制中热门项目排序方式的实现
|
11 years ago |
|
z9hang
|
4542b9e21a
|
积分修改
|
11 years ago |
|
z9hang
|
0b6168c7fd
|
添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
|
11 years ago |
 nwb
|
840a7b337b
|
添加课程资源内容类型更新脚本
|
11 years ago |
|
sw
|
c8aaa2776c
|
1.作品类别增加其他选项，当用户选择其他时，显示一编辑框用于用户输入其作品所属类别
2.添加竞赛支持自定义类别
|
11 years ago |
|
z9hang
|
376ba1d793
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
|
z9hang
|
5c0e3e96cc
|
修复不分页面导航栏缺失问题、修复部分域名错误问题、添加修复FirstPage表数据的迁移文件
|
11 years ago |
|
sw
|
79c76d26c8
|
创建作品分类表，并插入部分数据
|
11 years ago |
 yanxd
|
f5efaac93a
|
lunchun
|
11 years ago |
|
z9hang
|
d9e04bab0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
cc4bf3b328
|
添加超级管理员控制首页热门项目排序问题
|
11 years ago |
|
sw
|
4825c5287e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
53ff6ea335
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
6a45a0287d
|
添加删除图片功能，修复用户修改资料界面form.quene undefine的js错误（导致加载中不消失的原因）
|
11 years ago |
|
sw
|
b142953a4b
|
1.创建项目增加功能：是否启动DTS测试，默认为不启用。根据用户选择，决定左侧DTS测试工具选项是否在该项目内显示
|
11 years ago |
|
z9hang
|
cf339edb6c
|
添加首页定制的非空验证，长度验证
|
11 years ago |
|
nwb
|
0950ac2329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
3aab1b172c
|
修正执行数据迁移时的‘page_type=’ undefine错误
|
11 years ago |
|
nwb
|
87b623bc51
|
1.文档添加密级设置
2.新建文档、修改文档视图修改
|
11 years ago |
|
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
3dfcc90574
|
课程、竞赛首页定制
超级管理员账户中首页定制界面优化
|
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
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
11 years ago |
|
z9hang
|
9634046d11
|
权限管理机制优化
|
11 years ago |
|
z9hang
|
b87abf1f68
|
权限管理优化
|
11 years ago |
|
z9hang
|
5e3a763776
|
添加引用项目权限、修改引用判断
|
11 years ago |
|
nwb
|
864ef17941
|
清理课程状态表，修正同一课程出现多次的BUG
|
11 years ago |
|
sw
|
2bdb0e20e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/course.html.erb
|
11 years ago |
|
nwb
|
4d25ec1623
|
1.添加课程垃圾数据清理迁移文件
2.课程首页逻辑更改
|
11 years ago |
|
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
yanxd
|
e1d9d6ab45
|
tag查询崩溃
|
11 years ago |
|
nwb
|
cf00942261
|
更新迁移文件
|
11 years ago |
|
nwb
|
993ac23a36
|
课程各数据迁移时不再做验证，以兼容老数据
|
11 years ago |
|
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
11 years ago |
|
nwb
|
f8e5c2358a
|
学生角色添加回复讨论区权限
|
11 years ago |
|
nwb
|
f4aa817f42
|
修改合并后首页出错的问题
|
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 |
|
nwb
|
2a9d6eb012
|
迁移原课程资源文件类型数据
|
11 years ago |
|
nwb
|
80145c5c3b
|
修改课程列表动态数显示不正确的BUG
|
11 years ago |
|
nwb
|
f80e1f811a
|
修改作业数据迁移
|
11 years ago |
|
sw
|
8f78177d47
|
增加数据迁移文件
|
11 years ago |
|
nwb
|
0480405afb
|
1.修改原课程各数据迁移文件BUG
2.迁移课程学生数据
|
11 years ago |
|
sw
|
97a4aaf8ab
|
homework_attach增加列project_id及相关数据迁移
编辑作业页面增加选择关联项目，以及数据更新项目的实现
|
11 years ago |
|
z9hang
|
ab486aa811
|
补充user_score_details Model及数据迁移文件
|
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 |
|
nwb
|
2a4486bf0d
|
修改迁移文件
|
11 years ago |
|
nwb
|
e698f3a6c6
|
修改新建课程成员时的唯一性判断
|
11 years ago |
|
nwb
|
59a261d96d
|
1.优化课程通知动态和权限判断
2.优化课程通知讨论区动态和权限判断
|
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 |
|
nwb
|
3165d97417
|
1.迁移课程新闻数据
2.添加课程新闻index视图
|
11 years ago |
|
nwb
|
b6c9415a4b
|
1.给各角色添加浏览课程资源文件权限
2.修改课程动态显示逻辑
|
11 years ago |
|
nwb
|
a793b8923d
|
1.Non member角色添加add_couese权限
2.course_helper优化排序等相关函数
3.课程index界面修改
|
11 years ago |
|
nwb
|
f741b0581c
|
修改课程资源文件视图BUG
|
11 years ago |
|
yanxd
|
541b22b84d
|
score statistics init
|
11 years ago |
|
nwb
|
59742b9ddb
|
1.给各角色添加项目相关的权限
2.添加课程权限解析系统
|
11 years ago |
|
nwb
|
388d14f075
|
迁移课程原讨论区数据
|
11 years ago |
|
nwb
|
d22ffa84b4
|
1.课程标签迁移，从项目中分离
2.标签control\view添加对课程类标签的处理
|
11 years ago |
|
nwb
|
cd3c69af94
|
课程资源文件迁移，从项目中分离
|
11 years ago |
|
sw
|
81a97f6a5e
|
1.老师创建作业增加功能：是否启用互评，以及该功能的修改。对不启用互评的作业，学生不可下载作业，不可互相打分，但可以留言；老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
2.对启用互评的作业，每个用户只可以进行一次打分，打分后不可修改
|
11 years ago |
|
nwb
|
de201ae8f6
|
添加课程管理员表，并从项目管理员表中迁移原有数据
|
11 years ago |
 wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
11 years ago |
|
nwb
|
69e366d841
|
迁移课程作业数据
|
11 years ago |
|
nwb
|
fb36a0d5ba
|
1.课程control添加create方法
2.课程model添加部分新列及相关逻辑
|
11 years ago |
|
nwb
|
4404222437
|
0604
|
11 years ago |
|
nwb
|
d4bc8139a3
|
修改迁移文件
|
11 years ago |
|
nwb
|
d87b52bedd
|
课程成员迁移
|
11 years ago |
|
nwb
|
cd10dd5433
|
课程权限判断变更，从项目权限分离
|
11 years ago |
|
nwb
|
8460344043
|
课程讨论区逻辑更改
|
11 years ago |
|
nwb
|
e490f7979d
|
添加课程index界面
|
11 years ago |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
11 years ago |
|
nwb
|
77006198a1
|
1.导入项目表中已有课程至课程表
2.导入项目状态表至课程状态表
|
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 |
|
nwb
|
e15bad7462
|
course新增列并更改相关逻辑
|
11 years ago |
|
nwb
|
ea3b80fdc6
|
添加CourseStatus表和model
|
11 years ago |
|
sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的，只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时，作业最终得分只显示一个分字
|
11 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
11 years ago |
|
wanglinchun
|
8d77c62359
|
sdfd
|
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 |
 fanqiang
|
daa531268a
|
添加安全漏洞的关联表
帖子添加一个来源信息
|
11 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
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 |
|
fanqiang
|
a07ae9be58
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into 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 |
|
fanqiang
|
4ee9602621
|
..
|
11 years ago |
|
fanqiang
|
74169221a3
|
1234
|
11 years ago |
|
fanqiang
|
c6ee7e53e6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
fanqiang
|
1a7c82174c
|
修改表结构
|
11 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址；
参赛应用页面添加所属项目网址；
|
11 years ago |
|
yanxd
|
225f25f04c
|
指定utf8，中文编码出错
|
11 years ago |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
11 years ago |
