 z9hang
|
05186c8590
|
项目积分存数据库
有项目积分引起的系列bug
|
11 years ago |
|
z9hang
|
1ca6447478
|
修复项目缺陷、新闻、讨论区等页面无法查看bug
|
11 years ago |
|
z9hang
|
b4be18ab9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/files_controller.rb
|
11 years ago |
|
z9hang
|
7907edf168
|
更新项目得分规则
调整项目列表显示样式
|
11 years ago |
 sw
|
c155ebdfd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
 chenmin
|
fbe3e535b4
|
修复课程资源排序bug
修复课程动态时间段约束bug
|
11 years ago |
linhk
|
3862f857f7
|
解决当帖子回复条件为空排列次序错误
|
11 years ago |
|
chenmin
|
8b217735c3
|
1029 修复部分课程资源排序不可用问题
|
11 years ago |
|
z9hang
|
2c77d1b4cf
|
访问资源库问题
|
11 years ago |
|
z9hang
|
426ea23d6e
|
回复帖子内容为空时报错问题
|
11 years ago |
|
sw
|
9cb026ed39
|
增加竞赛删除评论的功能
|
11 years ago |
|
z9hang
|
80b2a2dc45
|
修正公共贴吧新建帖子问题
修正课程列表错误
|
11 years ago |
|
sw
|
c5a7497910
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
acb41158e7
|
错误提示页面导航栏添加
登陆时自动忽略登陆名前后空格
|
11 years ago |
|
z9hang
|
0d46c63c54
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
9e5f7e6fc6
|
取消主页加入课程链接
|
11 years ago |
|
z9hang
|
2ad51d7afe
|
修改引用的留言为不能修改
|
11 years ago |
|
sw
|
d66dc65cca
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
d5ac443f90
|
修复竞赛列表搜索结果不正确的BUG
|
11 years ago |
|
sw
|
8b80d99a70
|
修复资源标记搜索不正确的BUG issues#1089
|
11 years ago |
|
z9hang
|
27feeee03f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
8a9e2b47ad
|
调用存储过程刷新项目提交次数
|
11 years ago |
|
sw
|
a3cbcdad51
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
31e8ad98ae
|
1.修复竞赛作品每次修改之后，都会吧图片清空的BUG
2.修改删除竞赛作品图片功能
|
11 years ago |
|
z9hang
|
4dc2a23f9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
11 years ago |
 yanxd
|
281c48c0b3
|
.
|
11 years ago |
|
z9hang
|
5800cf5fff
|
修正登陆错误
|
11 years ago |
|
z9hang
|
952fcce0de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
c60188038e
|
得分机制修改
|
11 years ago |
|
sw
|
28606f030d
|
修复搜索参赛作品结果翻页跳转不正确的BUG
|
11 years ago |
|
sw
|
c4aa9aadbe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
3119d9a9aa
|
增加竞赛作品的搜索功能
|
11 years ago |
 nwb
|
81b77bc870
|
文件删除修改
|
11 years ago |
|
sw
|
e7503237f1
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
z9hang
|
d8fcf8eb9b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
52dcc6d1a1
|
讨论区帖子添加回复时，取消修改帖子的更新时间。项目最新动态只显示最新的回复，不将帖子创建重复显示
|
11 years ago |
|
sw
|
e344f16f5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
2141fcc3ca
|
将是否启用DTS测试移入项目模块配置
|
11 years ago |
|
nwb
|
9da116c0e3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
cb4efd914e
|
修正项目文档删除BUG
|
11 years ago |
|
yanxd
|
bf9a992399
|
活跃度排序不一致
|
11 years ago |
|
z9hang
|
90a35fa24a
|
竞赛、课程首页，贴吧动态名字过长显示问题
课程、项目编辑贴子导航丢失问题
|
11 years ago |
|
nwb
|
2c79a51e48
|
优化文件读取编码解析
|
11 years ago |
|
nwb
|
74de064cca
|
1.文件删除权限判断优化
2.课程通知附件删除BUG修改
|
11 years ago |
|
z9hang
|
1daec14ab5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
8871652e01
|
添加首页定制，设置是否显示"我的课程"功能
|
11 years ago |
|
yanxd
|
979d6dd067
|
dts_test. controller ===> model
|
11 years ago |
|
nwb
|
f052d0d461
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
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 |
|
nwb
|
c0ac9924e7
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
2a4daf04f9
|
删除资源文件修改
|
11 years ago |
|
nwb
|
1257e67380
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
735d7f2c1f
|
文件下载权限判断优化
|
11 years ago |
|
z9hang
|
5a0d76c1e0
|
竞赛通知发布完成
|
11 years ago |
|
z9hang
|
673ffb1819
|
提交次数刷新问题
|
11 years ago |
|
nwb
|
2bfc7aa93f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
z9hang
|
42f0c49093
|
作业打包下载错误提示页无导航问题
|
11 years ago |
|
z9hang
|
7eb1a76734
|
修改编辑贴吧无导航栏、提交失败无提示bug
|
11 years ago |
|
z9hang
|
3b54def1c7
|
首页定制修改
|
11 years ago |
|
z9hang
|
6ad3a1128e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
f83336aed0
|
修改首页定制中热门项目排序方式的实现
|
11 years ago |
|
yanxd
|
6a14676248
|
remove pry
|
11 years ago |
|
yanxd
|
1755d7a790
|
issues controller & unit testing, word log print.
|
11 years ago |
|
nwb
|
8b0b31f749
|
附件下载更新
|
11 years ago |
|
z9hang
|
80b5871756
|
竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
添加新的表记录个人得分相关细节，及各种得分更新方法
|
11 years ago |
|
z9hang
|
fb6cd2e9d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
0b6168c7fd
|
添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
|
11 years ago |
|
nwb
|
0a06e2033f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
5d22bc5510
|
文件上传修改
|
11 years ago |
|
yanxd
|
ee95d9b115
|
user_activity page
|
11 years ago |
|
yanxd
|
18d096f0d8
|
删除项目，竞赛表project_id会置空，projecting_softapplications模型不知道干嘛用，此表也不存在
|
11 years ago |
|
yanxd
|
cccbd941ce
|
用户删除，管理界面用户去排序，删除后跳转，去无效参数
|
11 years ago |
|
nwb
|
f22a39fbfa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
a5d829b95e
|
1.优化课程通知模块
2.优化文件上传
|
11 years ago |
|
z9hang
|
41ea3a1baf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
dee09aad75
|
修复导航bug
|
11 years ago |
|
sw
|
47ae398748
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
de17a84061
|
增加异常捕获，当作业未找到相应文件时，跳到文件未找到页面(不报500错误)
|
11 years ago |
|
nwb
|
42c2f6c2ee
|
更改项目文档按作者排序
|
11 years ago |
|
nwb
|
3ba8ba010d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
sw
|
d9b9b2152f
|
增加教师功能用户打包下载所有作业的功能
|
11 years ago |
|
nwb
|
68be9c25b8
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/contest.html.erb
|
11 years ago |
|
sw
|
58c3e98a21
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
ab55043880
|
修复当作业附件列表为空时，点击打包下载会报500错的BUG
|
11 years ago |
|
nwb
|
5954ba1788
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
cf11cac0ad
|
项目文档权限判断优化
|
11 years ago |
|
yanxd
|
edee2b2327
|
删掉welcome没用的方法
|
11 years ago |
|
nwb
|
67dfd72845
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
518edeac68
|
项目文档浏览BUG修改
|
11 years ago |
|
z9hang
|
513fd32ec5
|
修复查看个人动态无权限bug
|
11 years ago |
|
z9hang
|
221aef4a7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
3e79dd6e32
|
竞赛通知鼠标悬停
导航丢失问题
|
11 years ago |
|
nwb
|
b49344107c
|
用户动态权限判定修改
|
11 years ago |
|
nwb
|
79eac39dc2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
sw
|
6e954d314f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
774eed0dbf
|
优化公开资源的下载权限判断
|
11 years ago |
|
sw
|
b1251db30c
|
1.修改竞赛作品时增加作品类别下拉框选择
2.修改竞赛作品时增加获取选择其他时作品类别
|
11 years ago |
|
sw
|
c8aaa2776c
|
1.作品类别增加其他选项，当用户选择其他时，显示一编辑框用于用户输入其作品所属类别
2.添加竞赛支持自定义类别
|
11 years ago |
|
yanxd
|
fb138d1593
|
remove user_activities path, 3path bug.
|
11 years ago |
|
nwb
|
222959d1da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
27fda1f938
|
竞赛首页修改
|
11 years ago |
|
yanxd
|
472b61fefe
|
删除了不能通过的测试，修改user_activities。所有原路由测试可以通过。
|
11 years ago |
|
nwb
|
aea41ba997
|
修改竞赛首页搜索功能
|
11 years ago |
|
nwb
|
5adac1a32a
|
课程讨论区回复内容为空时提示
|
11 years ago |
|
nwb
|
35ab3a2c7d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
ec71e8eeeb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
c7f80effb7
|
修正课程讨论区删除帖子BUG
|
11 years ago |
|
z9hang
|
5e4571d6af
|
修复部分页面导航丢失问题
|
11 years ago |
|
nwb
|
f20f0aaa45
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
z9hang
|
4bd083b059
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/show.html.erb
|
11 years ago |
|
z9hang
|
bd43ef5d61
|
网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
|
11 years ago |
|
nwb
|
b655f0c7b0
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
7898bc1dd7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
046142f437
|
优化students_for_courses表相关逻辑
|
11 years ago |
|
yanxd
|
df848ca756
|
print tag exception, course name valid test.
|
11 years ago |
|
nwb
|
b7c4f87a8f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/index.html.erb
|
11 years ago |
|
nwb
|
ed00adb3ba
|
优化下载权限判断
|
11 years ago |
|
nwb
|
f4d6696d2e
|
优化资源搜索界面
|
11 years ago |
|
nwb
|
615b3ac2ac
|
课程界面调整
|
11 years ago |
|
nwb
|
6a65b2a84b
|
去掉测试代码
|
11 years ago |
|
nwb
|
0dc2466539
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
b60a0ddf59
|
1.添加给gitlab项目新增用户及赋权限接口
2.添加给gitlab项目删除用户接口
|
11 years ago |
|
yanxd
|
12fb6bf5ca
|
.
|
11 years ago |
|
nwb
|
3d8571b59e
|
1.实现新增gitlab用户接口
2.实现删除gitlab用户接口
|
11 years ago |
|
nwb
|
1f5d792783
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
6dcc50e60b
|
添加gitlab创建项目(版本库)接口
|
11 years ago |
|
z9hang
|
2cab9f7895
|
热门项目排序添加空值判断，默认按活跃度排序
|
11 years ago |
|
z9hang
|
ab05bf6f36
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
494d3af9a4
|
修复贴吧分页问题
|
11 years ago |
|
nwb
|
36ab954cf9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
297fe9a3f4
|
添加gitlab远程登录接口
|
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 |
|
nwb
|
13a3725b06
|
BUG修改
|
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
|
121ffa0342
|
修改缺陷时增加跟踪者的删除和增加功能
|
11 years ago |
|
sw
|
b142953a4b
|
1.创建项目增加功能：是否启动DTS测试，默认为不启用。根据用户选择，决定左侧DTS测试工具选项是否在该项目内显示
|
11 years ago |
|
sw
|
61ba2c47ee
|
1.修改历史数据中作业为项目时作业显示列表未改变的问题
2.修改作业列表关联项目过长，增加省略号显示和鼠标移动到相应位置的气泡显示
|
11 years ago |
|
sw
|
8f8fb79a63
|
1.软件创客搜索功能修改表单提交为在js中提交
2.增加判断搜索条件是不是为空
|
11 years ago |
|
z9hang
|
cf339edb6c
|
添加首页定制的非空验证，长度验证
|
11 years ago |
|
nwb
|
2a1a051362
|
课程资源文件密级BUG修正
|
11 years ago |
|
sw
|
ef95835bc6
|
修复当前用户为超级管理员时，创建项目后，在个人信息的参与项目栏内无该项目的记录
|
11 years ago |
|
nwb
|
0950ac2329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
0031f90c64
|
1.课程动态中的私有的资源、文档进行权限判断
2.项目动态中的私有的资源、文档进行权限判断
|
11 years ago |
|
sw
|
59a5541e45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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
|
1d4dad22ad
|
Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
Conflicts:
ReadMe.txt
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
nwb
|
6d698cb5d8
|
下载添加权限判断
|
11 years ago |
|
nwb
|
bdaf59513b
|
Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
Conflicts:
app/views/layouts/_base_footer.html.erb
|
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 |
|
sw
|
86adfaecce
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
yanxd
|
056f86caad
|
can't download, html. after exception return;
|
11 years ago |
|
sw
|
39434766e3
|
1.修复超级管理员无法访问课程作业列表的BUG
2.修改作业描述样式
|
11 years ago |
|
yanxd
|
803e9cbdb5
|
globel issue#858, 中国高校--输入无效条件点击搜索，建议给出提示信息
|
11 years ago |
|
yanxd
|
e573438e43
|
eager_load
|
11 years ago |
|
yanxd
|
249ea19c0c
|
神坑，users和user_statuses表中，关注信息不同步，按照影响力排序还会有问题。以及users表中在us表没有对应条目，排序中是不会显示的
|
11 years ago |
|
yanxd
|
91eb7751da
|
issue global 859. 搜索处理空格
|
11 years ago |
|
z9hang
|
4d75fbfcb8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
9634046d11
|
权限管理机制优化
|
11 years ago |
|
yanxd
|
0998438e67
|
bootstrap fine tuning.
|
11 years ago |
|
yanxd
|
4259f63fbf
|
预览在issue和new里报错
|
11 years ago |
|
z9hang
|
fd71435b30
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
38b3e86e62
|
ip=nil
|
11 years ago |
|
z9hang
|
b87abf1f68
|
权限管理优化
|
11 years ago |
|
z9hang
|
4c6fb2a266
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
xianbo
|
25ee1d8672
|
for adjust test domain and give a setting reposwq
|
11 years ago |
|
z9hang
|
0fa552c8d3
|
软件众包中点击我要参与报无权限问题
|
11 years ago |
|
z9hang
|
b4bf320c2e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
5e3a763776
|
添加引用项目权限、修改引用判断
|
11 years ago |
|
yanxd
|
ab03962e9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
aca63146e9
|
搜索文件归属，课程相关逻辑修改，查询把过滤去掉了。暂时没想有什么过滤的好办法
|
11 years ago |
|
nwb
|
dd396a6da2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
b4ee106ce9
|
竞赛搜索项为空时给出提示
|
11 years ago |
|
z9hang
|
f5b69be967
|
新建贴吧描述为空不能新建、搜索空内容添加提示
|
11 years ago |
|
z9hang
|
5c93442c79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
01da0852e3
|
新建贴吧错误提示修改
|
11 years ago |
|
sw
|
6365d01051
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
f1b8b7caed
|
t
|
11 years ago |
|
z9hang
|
470f40db82
|
去除绝对网址
|
11 years ago |
|
nwb
|
efbffa7436
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
z9hang
|
c709545809
|
提交后点击版本库才刷新项目积分问题（尚需测试）
|
11 years ago |
|
yanxd
|
8ccc39ae71
|
首页更多报错
|
11 years ago |
|
nwb
|
b6ebbab830
|
项目版本库名称限定优化
|
11 years ago |
|
nwb
|
164d4f9e78
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
yanxd
|
36c90f1dfd
|
取不到学校，再拿id直接空指针
|
11 years ago |
|
nwb
|
3a7065bb2d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
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 |
|
nwb
|
dc0180988f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
d001b4416a
|
1.优化课程首页
2.优化课程首页搜索逻辑
|
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 |
|
sw
|
3e185c3a4b
|
修改学校链接
|
11 years ago |
|
nwb
|
1a666900c0
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
98ba57b819
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4d25ec1623
|
1.添加课程垃圾数据清理迁移文件
2.课程首页逻辑更改
|
11 years ago |
|
yanxd
|
271af6ead5
|
Merge branch 'szzh' into develop
|
11 years ago |
|
yanxd
|
0e2b7ba362
|
tag search fix
|
11 years ago |
|
sw
|
5abee0a06c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
ae8093c400
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
2a6cbe28f0
|
修正课程首页错误
|
11 years ago |
|
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
f664ec10b4
|
Merge branch 'szzh' into develop
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
11 years ago |
|
z9hang
|
050a780b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
6f5d6c382b
|
给用户留言的回复若为查看计入新留言数
|
11 years ago |
|
nwb
|
e8705bccb1
|
修改文件上传界面样式
|
11 years ago |
|
nwb
|
fb0597ab4a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
2b855badf9
|
修正课程资源库关联已有资源功能
|
11 years ago |
yanxd
|
e1d9d6ab45
|
tag查询崩溃
|
11 years ago |
|
z9hang
|
a7fa444f9e
|
修正项目个人得分问题：统计时只计算项目成员，user_grade表user_id和project_id联合不重复验证，user_grade分数部位负验证
|
11 years ago |
|
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
11 years ago |
|
sw
|
bb86ef4612
|
修复获取作业列表时课程老师参数获取不正确的问题
|
11 years ago |
|
sw
|
bc434a82a4
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
98d2c144ae
|
修改时间排序为升序排序
|
11 years ago |
|
sw
|
d03718e30f
|
修复新评分规则下按分数排序不正确的问题
|
11 years ago |
|
nwb
|
6141cc56e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e863c30352
|
部分BUG修正
|
11 years ago |
|
sw
|
be2faea15b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/bids_controller.rb
app/views/courses/new_homework.html.erb
|
11 years ago |
 linchun
|
79f68c2231
|
Merge branch 'szzh' into develop
|
12 years ago |
|
nwb
|
917288c84c
|
修正课程讨论区、课程通知等创建时BUG修正
|
12 years ago |
|
sw
|
3f8f141107
|
修复 创建作业时，由于输入参数错误导致保存失败后，再次输入错误参数会报错。如再次输入参数正确，会进入一个空白页面 的BUG
|
12 years ago |
|
nwb
|
99c9f81aea
|
BUG修正
|
12 years ago |
|
nwb
|
3565b9da88
|
修正用户课程界面关闭、重启课程，数据刷新不及时的问题
|
12 years ago |
|
sw
|
745727b8e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
d57688413e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
74603e1256
|
解决直接访问ajax链接地址报错问题
|
12 years ago |
|
sw
|
08bfb8e80a
|
修复教师评分后星星显示不正常的BUG
|
12 years ago |
|
nwb
|
38baa247bf
|
BUG修正
|
12 years ago |
|
sw
|
392dc0c365
|
增加访问作业显示列表的权限
|
12 years ago |
|
sw
|
dbd5c49246
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
a115edea9d
|
修改课程标签页选中状态
|
12 years ago |
|
sw
|
ed9b97f987
|
增加访问作业显示列表的权限
|
12 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
|
12 years ago |
|
nwb
|
ae3457e68b
|
1.添加代码评审(CodeReview)插件
2.添加代码评审插件使用文档
|
12 years ago |
|
nwb
|
6a2c486f62
|
修改作业数为10倍数时的显示BUG
|
12 years ago |
|
linchun
|
c1e780a0f8
|
yan
|
12 years ago |
|
linchun
|
0c501022fd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
12 years ago |
|
nwb
|
e367c03f6e
|
修正课程作业列表显示BUG
|
12 years ago |
|
linchun
|
9c5066b81c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
app/controllers/account_controller.rb
|
12 years ago |
|
z9hang
|
773b728828
|
修改：自己不能踩或顶自己
|
12 years ago |
|
z9hang
|
24172c85c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
f9612ca63f
|
实时刷新（ajax轮询）
|
12 years ago |
|
sw
|
05659fa2db
|
修复注册后在”修改资料“中发现我在注册时选择的”学生“身份和地区信息以及学号信息都没有了，需要重新填写。
|
12 years ago |
|
z9hang
|
54d4b957ee
|
修复竖排的踩顶图标在踩或顶完后变成横排问题
|
12 years ago |
|
sw
|
600ec536b3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
2ee5b422fb
|
RolesController.rb移回app/controls
|
12 years ago |
|
sw
|
463edeee71
|
1.修复未开启互评功能作业总评得分计算不正确的问题
2.修复未选择项目新建、修改有误的BUG
|
12 years ago |
|
sw
|
e43a84ab4b
|
1.修复作业无关联项目是进入编辑界面报错的问题
2.修复作业综评页面不会及时更新的问题
|
12 years ago |
|
sw
|
f3f303e6e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
ef234d8c50
|
1.按照新的评分规则修改作业得分
2.修改作业列表显示界面
3.增加获取作业的互评得分、教师评分、最终评分方法
|
12 years ago |
|
z9hang
|
9061a77221
|
修改user.user_score为空问题的解决方式
|
12 years ago |
|
nwb
|
f5c9123647
|
管理员创建课程逻辑修改，管理员创建课程后成为该课程成员
|
12 years ago |
|
nwb
|
e17090d506
|
修改课程通知show方法，并添加独立视图
|
12 years ago |
|
nwb
|
80145c5c3b
|
修改课程列表动态数显示不正确的BUG
|
12 years ago |
|
nwb
|
0480405afb
|
1.修改原课程各数据迁移文件BUG
2.迁移课程学生数据
|
12 years ago |
|
sw
|
efb6c1fd19
|
1.修改、新增作业增加提交项目选项(可以为空)
2.homework_attach与project增加关联关系
|
12 years ago |
|
sw
|
872357cdf4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
97a4aaf8ab
|
homework_attach增加列project_id及相关数据迁移
编辑作业页面增加选择关联项目，以及数据更新项目的实现
|
12 years ago |
|
yanxd
|
8840a11a99
|
attachments error
|
12 years ago |
|
yanxd
|
9b707f2b5a
|
a
|
12 years ago |
|
z9hang
|
1cb1eeeb1d
|
个人主页：姓名、工作单位
课程主页：课程名称、教师单位
项目主页：项目名称
竞赛主页：竞赛名称
主页：课程列=>单位名称
修复部分个人主页报错问题
|
12 years ago |
|
nwb
|
726697a69b
|
BUG修改
|
12 years ago |
|
nwb
|
ec72bb2904
|
编辑作业逻辑修改
|
12 years ago |
|
nwb
|
936c40b490
|
提交作业逻辑和视图修改
|
12 years ago |
|
yanxd
|
2000f1ddf6
|
人物注册地址信息会保存两次的问题。
|
12 years ago |
|
nwb
|
78612488e5
|
1.修改新建作业及视图
2.修改编辑作业及视图
|
12 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
|
12 years ago |
|
z9hang
|
697a6034b2
|
新得分显示
|
12 years ago |
|
nwb
|
9c3605320e
|
加入、退出课程逻辑优化
|
12 years ago |
|
nwb
|
2a4486bf0d
|
修改迁移文件
|
12 years ago |
|
nwb
|
59a261d96d
|
1.优化课程通知动态和权限判断
2.优化课程通知讨论区动态和权限判断
|
12 years ago |
|
yanxd
|
63cd19c15c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
b727d023b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
yanxd
|
b356145d71
|
course logo
|
12 years ago |
|
nwb
|
b2756650cf
|
修正课程留言动态引起的首页错误
|
12 years ago |
|
z9hang
|
eae3918074
|
添加用户得数统计功能
帖子内的踩顶横排
|
12 years ago |
|
yanxd
|
7456e37e8a
|
home
|
12 years ago |
|
yanxd
|
eff2da732b
|
home
|
12 years ago |
|
nwb
|
8a274981ce
|
修改课程动态
|
12 years ago |
|
yanxd
|
ceef85719e
|
contest fix
|
12 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
|
12 years ago |
|
yanxd
|
362570e34b
|
contestnotification_edit function
|
12 years ago |
|
nwb
|
b178be984d
|
添加课程搜索处理
|
12 years ago |
|
nwb
|
c8900c279c
|
课程标签增加、删除
|
12 years ago |
|
nwb
|
3933817570
|
1.修改课程配置界面
2.新增课程成员修改
3.删除课程成员修改
4.课程成员类型更改支持
|
12 years ago |
|
sw
|
f4961cbc50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
a100193373
|
1.作业参与人员可以对作业进行修改，但不能进行删除
2.作业成员(发布人员和参与人员)不能对作业进行评分
3.修改进行作业删除、添加、修改、添加成员等方法的权限判断
|
12 years ago |
|
nwb
|
ae8fcca14f
|
1.课程接触视图修改
2.添加课程成员列表视图
|
12 years ago |
|
sw
|
d832a5eecf
|
rake db:migrate
|
12 years ago |
|
nwb
|
165dbc3f78
|
修改words_controller与课程相关方法及视图
|
12 years ago |
|
nwb
|
517a29116f
|
修改message_controller与课程相关方法及视图
|
12 years ago |
|
nwb
|
70901832a8
|
1.修改课程讨论区control index、show方法及路由
2.BoardsHelper添加课程相关方法
|
12 years ago |
|
nwb
|
814233d245
|
1.修改课程通知保存功能
|
12 years ago |
|
nwb
|
97d920c195
|
修改新增课程通知视图
|
12 years ago |
|
z9hang
|
a8670ba6fc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
d6280befca
|
修改新闻model、路由、index方法
|
12 years ago |
|
z9hang
|
e606fd89d2
|
被关注+2分、取消关注-2分
讨论区帖子加顶踩功能
顶踩帖子加减分接口
|
12 years ago |
|
sw
|
29fa624e9d
|
封装获取作业成员的方法
|
12 years ago |
|
sw
|
19fc84afee
|
作业增加成员、删除成员增加权限控制
|
12 years ago |
|
nwb
|
3165d97417
|
1.迁移课程新闻数据
2.添加课程新闻index视图
|
12 years ago |
|
nwb
|
7677e092e0
|
添加课程资源文件分类显示视图
|
12 years ago |
|
sw
|
872b7efb84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
2abd8187d0
|
增加搜索用户功能
|
12 years ago |
|
nwb
|
59051972e1
|
1.修改课程资源删除
2.修改课程资源上传后的界面刷新
|
12 years ago |
|
sw
|
d0dd6eb781
|
1.修改作业时实现作业添加参与人员与删除参与人员
2.homework_attach、homework_user、users关系添加
3.优化页面显示
|
12 years ago |
|
nwb
|
149d7ef1f4
|
修改课程资源文件上传功能
|
12 years ago |
|
nwb
|
b6c9415a4b
|
1.给各角色添加浏览课程资源文件权限
2.修改课程动态显示逻辑
|
12 years ago |
|
z9hang
|
7eb3c9f874
|
缺陷留言+1分、
更改缺陷状态+1分、
对留言回复+1分、
对帖子的回复+1分、
添加分数修正方法，分数为负时修正为0
|
12 years ago |
|
sw
|
130f9f87c2
|
1.实现作业添加成员的翻页功能
2.美化作业成员界面显示
|
12 years ago |
|
nwb
|
a793b8923d
|
1.Non member角色添加add_couese权限
2.course_helper优化排序等相关函数
3.课程index界面修改
|
12 years ago |
|
nwb
|
f741b0581c
|
修改课程资源文件视图BUG
|
12 years ago |
|
sw
|
cbb348dc0e
|
实现给作业增加用户页面相关js代码及css代码
|
12 years ago |
|
nwb
|
a20feafa4e
|
1.添加课程动态model
2.优化课程动态逻辑及权限处理
|
12 years ago |
|
yanxd
|
541b22b84d
|
score statistics init
|
12 years ago |
|
sw
|
787e043650
|
1.修改下载作业时的错误
2.修改判断是不是为当前课程学生、老师的方法
|
12 years ago |
|
sw
|
26b933dddb
|
t
|
12 years ago |
|
sw
|
e5fec207aa
|
1.修改判断当前用户是否为指定课程成员、学生、老师的方法
2.新建作业时获取当前项目学生方法
3.增加checkbox生成方法
|
12 years ago |
|
nwb
|
8768193e72
|
添加课程资源文件全部列表视图
|
12 years ago |
|
sw
|
58bb6d269d
|
取消名字前面的时间
|
12 years ago |
|
nwb
|
2f3d9b1795
|
1.修改资源文件类index方法
2.添加课程资源文件index视图
|
12 years ago |
|
z9hang
|
f383f501ec
|
修改权限代码:判断用户是否为项目的管理员、判断用户是否为课程的老师、学生由根据role_id判断改为根据其权限判断
|
12 years ago |
|
sw
|
2827bd0c21
|
1.修改下载一个人作业所有文件的传递参数
2.减少下载后作业的打包次数
|
12 years ago |
|
nwb
|
54505340eb
|
1.修正新建课程错误
2.优化课程角色权限判断
|
12 years ago |
|
sw
|
bef37e5c0f
|
增加作业显示列表首先按评分排序，然后按时间排序
|
12 years ago |
|
wanglinchun
|
467f8f54e1
|
sdf
|
12 years ago |
|
yanxd
|
c3865ab319
|
notificationcomments
|
12 years ago |
|
wanglinchun
|
45e12c4bef
|
xx
|
12 years ago |
|
wanglinchun
|
545e5c5941
|
ert
|
12 years ago |
|
wanglinchun
|
7f5fa8b9b8
|
dfd
|
12 years ago |
|
z9hang
|
47535ce101
|
修改竞赛中的role_id==xxx代码
|
12 years ago |
|
wanglinchun
|
1c28edd5d4
|
修改竞赛通知相关文件
|
12 years ago |
|
nwb
|
59742b9ddb
|
1.给各角色添加项目相关的权限
2.添加课程权限解析系统
|
12 years ago |
|
z9hang
|
4478c86cea
|
添加课程 查看真名、查看成员、作业导出权限代码（未应用）
|
12 years ago |
|
sw
|
8f94985186
|
1.添加作业时权限判断
2.增加作业成员tab页
|
12 years ago |
|
nwb
|
388d14f075
|
迁移课程原讨论区数据
|
12 years ago |
|
z9hang
|
09368442c6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
d83899e3e4
|
添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码（未应用）
|
12 years ago |
|
yanxd
|
0d8b06ec87
|
e, bug
|
12 years ago |
|
yanxd
|
57994edc06
|
load user in homework
|
12 years ago |
|
yanxd
|
1c7923e5bd
|
sql
|
12 years ago |
|
nwb
|
ebe771db88
|
创建课程修改
|
12 years ago |
|
wanglinchun
|
ca01f5c9cc
|
rt
|
12 years ago |
|
wanglinchun
|
92cd6f2fdd
|
sd
|
12 years ago |
|
sw
|
8e2288a362
|
1.封装获取作业平均评分方法
2.优化作业列表界面效率
|
12 years ago |
|
wanglinchun
|
00b1a40345
|
修改了竞赛通知及评论相关文件代码
|
12 years ago |
|
nwb
|
c1f9f389b7
|
修改课程讨论区视图，从项目中分离
|
12 years ago |
|
nwb
|
d22ffa84b4
|
1.课程标签迁移，从项目中分离
2.标签control\view添加对课程类标签的处理
|
12 years ago |
|
sw
|
999b856d84
|
优化打开作业列表界面效率
|
12 years ago |
|
wanglinchun
|
f1555bf134
|
dfg
|
12 years ago |
|
sw
|
81a97f6a5e
|
1.老师创建作业增加功能：是否启用互评，以及该功能的修改。对不启用互评的作业，学生不可下载作业，不可互相打分，但可以留言；老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
2.对启用互评的作业，每个用户只可以进行一次打分，打分后不可修改
|
12 years ago |
|
nwb
|
6ff26d06ab
|
修改课程基础页面逻辑(base_courses.html.erb)
|
12 years ago |
|
wanglinchun
|
8b78929190
|
修改竞赛通知中评论的相关文件
|
12 years ago |
|
nwb
|
de201ae8f6
|
添加课程管理员表，并从项目管理员表中迁移原有数据
|
12 years ago |
|
sw
|
b0a88eb5ac
|
增加作业按评分排序
|
12 years ago |
|
nwb
|
529cf4f4f8
|
修改重启课程
|
12 years ago |
|
nwb
|
6a9037dde5
|
修改关闭课程逻辑
|
12 years ago |
|
wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
12 years ago |
|
wanglinchun
|
ae70081288
|
eter
|
12 years ago |
|
nwb
|
a49cf3eb6b
|
1.修改课程作业路由
2.课程control添加作业显示方法
|
12 years ago |
|
nwb
|
0d99644fa7
|
1.用户课程表逻辑修改
2.添加link_to_course相关逻辑
|
12 years ago |
|
sw
|
af68d15451
|
作业的增、删、改、查以及作业资料的下载增加权限控制
|
12 years ago |
|
nwb
|
fb36a0d5ba
|
1.课程control添加create方法
2.课程model添加部分新列及相关逻辑
|
12 years ago |
|
nwb
|
4404222437
|
0604
|
12 years ago |
|
nwb
|
0f5c996278
|
新建课程逻辑修改
|
12 years ago |
|
sw
|
94542e935a
|
增加点击作业名下载改作业下所有附件的功能
|
12 years ago |
|
sw
|
2bbcff54d3
|
取消作业提交形式选择，统一为提交文件
|
12 years ago |
|
sw
|
80afefcd28
|
修改可对文件进行增、删等操作
|
12 years ago |
|
sw
|
66c9de94a8
|
修复新增作业后页面不会跳转的问题
|
12 years ago |
|
sw
|
50171ad0f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
wanglinchun
|
9d783a7caa
|
修改竞赛通知等tab-menu的显示状态
|
12 years ago |
|
wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
12 years ago |
|
wanglinchun
|
a3fb48a4bb
|
0603
|
12 years ago |
|
z9hang
|
3a80a80841
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
9bfe9ba1b2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
27be52e58d
|
老师的邮件中增加取消邮件通知链接
修复主页文件上传动态中点击进入附件跳转错误问题
|
12 years ago |
|
sw
|
5ef1332ded
|
实现修改、删除作业后页面跳转
|
12 years ago |
|
nwb
|
cd10dd5433
|
课程权限判断变更，从项目权限分离
|
12 years ago |
|
sw
|
1a0de23b38
|
修改作业在进行修改、删除、添加时的代码
|
12 years ago |
|
wanglinchun
|
81a45fe977
|
dfs
|
12 years ago |
|
yanxd
|
7d6311f8e4
|
Merge branch 'develop' into szzh
|
12 years ago |
|
yanxd
|
789a8d1392
|
tag_name从ProjectInfo取用户抛错的问题
不查询网站信息（删东西
gemfile加pry判定
|
12 years ago |
|
nwb
|
7d3d406c00
|
新增部分课程所需的解析函数
|
12 years ago |
|
nwb
|
e490f7979d
|
添加课程index界面
|
12 years ago |
|
wanglinchun
|
528af32f91
|
修改forge，localhost首页不能显示的问题
|
12 years ago |
|
sw
|
cc5eb3d0af
|
1. 修复作业无附件时会将作业删除的问题
2.修复作业无附件时不会显示作业的问题
3.去除多余页面显示
|
12 years ago |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
12 years ago |
|
yanxd
|
d2b90b98cc
|
1, 调整了settting中的成员显示，去掉了冗余的计算逻辑，打开页面速度快多了
2, 管理员身份查看作业列表 ==> true
|
12 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
12 years ago |
|
yanxd
|
6c5e7eca49
|
TODO
|
12 years ago |
|
nwb
|
e15bad7462
|
course新增列并更改相关逻辑
|
12 years ago |
|
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
 fanqiang
|
9e05ecf5b4
|
修改主页展示部分
|
12 years ago |
|
fanqiang
|
150bb1ba1e
|
修改开源社区主页中的漏洞展示部分
|
12 years ago |
|
wanglinchun
|
9f29a6c82a
|
将base的格式引入竞赛通知中，使其局部不同，接下来将通知的功能逐步引入
|
12 years ago |
