Commit Graph

902 Commits (shapgroup)

Author SHA1 Message Date
nwb 54505340eb 1.修正新建课程错误
11 years ago
sw bef37e5c0f 增加作业显示列表首先按评分排序,然后按时间排序
11 years ago
wanglinchun 467f8f54e1 sdf
11 years ago
yanxd c3865ab319 notificationcomments
11 years ago
wanglinchun 45e12c4bef xx
11 years ago
wanglinchun 545e5c5941 ert
11 years ago
wanglinchun 7f5fa8b9b8 dfd
11 years ago
z9hang 47535ce101 修改竞赛中的role_id==xxx代码
11 years ago
wanglinchun 1c28edd5d4 修改竞赛通知相关文件
11 years ago
nwb 59742b9ddb 1.给各角色添加项目相关的权限
11 years ago
z9hang 4478c86cea 添加课程 查看真名、查看成员、作业导出权限代码(未应用)
11 years ago
sw 8f94985186 1.添加作业时权限判断
11 years ago
nwb 388d14f075 迁移课程原讨论区数据
11 years ago
z9hang 09368442c6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang d83899e3e4 添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码(未应用)
11 years ago
yanxd 0d8b06ec87 e, bug
11 years ago
yanxd 57994edc06 load user in homework
11 years ago
yanxd 1c7923e5bd sql
11 years ago
nwb ebe771db88 创建课程修改
11 years ago
wanglinchun ca01f5c9cc rt
11 years ago
wanglinchun 92cd6f2fdd sd
11 years ago
sw 8e2288a362 1.封装获取作业平均评分方法
11 years ago
wanglinchun 00b1a40345 修改了竞赛通知及评论相关文件代码
11 years ago
nwb c1f9f389b7 修改课程讨论区视图,从项目中分离
11 years ago
nwb d22ffa84b4 1.课程标签迁移,从项目中分离
11 years ago
sw 999b856d84 优化打开作业列表界面效率
11 years ago
wanglinchun f1555bf134 dfg
11 years ago
sw 81a97f6a5e 1.老师创建作业增加功能:是否启用互评,以及该功能的修改。对不启用互评的作业,学生不可下载作业,不可互相打分,但可以留言;老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
11 years ago
nwb 6ff26d06ab 修改课程基础页面逻辑(base_courses.html.erb)
11 years ago
wanglinchun 8b78929190 修改竞赛通知中评论的相关文件
11 years ago
nwb de201ae8f6 添加课程管理员表,并从项目管理员表中迁移原有数据
11 years ago
sw b0a88eb5ac 增加作业按评分排序
11 years ago
nwb 529cf4f4f8 修改重启课程
11 years ago
nwb 6a9037dde5 修改关闭课程逻辑
11 years ago
wanglinchun d06488c10d 为竞赛通知添加评论
11 years ago
wanglinchun ae70081288 eter
11 years ago
nwb a49cf3eb6b 1.修改课程作业路由
11 years ago
nwb 0d99644fa7 1.用户课程表逻辑修改
11 years ago
sw af68d15451 作业的增、删、改、查以及作业资料的下载增加权限控制
11 years ago
nwb fb36a0d5ba 1.课程control添加create方法
11 years ago
nwb 4404222437 0604
11 years ago
nwb 0f5c996278 新建课程逻辑修改
11 years ago
sw 94542e935a 增加点击作业名下载改作业下所有附件的功能
11 years ago
sw 2bbcff54d3 取消作业提交形式选择,统一为提交文件
11 years ago
sw 80afefcd28 修改可对文件进行增、删等操作
11 years ago
sw 66c9de94a8 修复新增作业后页面不会跳转的问题
11 years ago
sw 50171ad0f8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
wanglinchun 9d783a7caa 修改竞赛通知等tab-menu的显示状态
11 years ago
wanglinchun 6a8d697582 Merge branch 'develop' into competition
11 years ago
wanglinchun a3fb48a4bb 0603
11 years ago
z9hang 3a80a80841 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 9bfe9ba1b2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 27be52e58d 老师的邮件中增加取消邮件通知链接
11 years ago
sw 5ef1332ded 实现修改、删除作业后页面跳转
11 years ago
nwb cd10dd5433 课程权限判断变更,从项目权限分离
11 years ago
sw 1a0de23b38 修改作业在进行修改、删除、添加时的代码
11 years ago
wanglinchun 81a45fe977 dfs
11 years ago
yanxd 7d6311f8e4 Merge branch 'develop' into szzh
11 years ago
yanxd 789a8d1392 tag_name从ProjectInfo取用户抛错的问题
11 years ago
nwb 7d3d406c00 新增部分课程所需的解析函数
11 years ago
nwb e490f7979d 添加课程index界面
11 years ago
wanglinchun 528af32f91 修改forge,localhost首页不能显示的问题
11 years ago
sw cc5eb3d0af 1. 修复作业无附件时会将作业删除的问题
11 years ago
wanglinchun bf71a38608 竞赛通知相关文件修改
11 years ago
yanxd d2b90b98cc 1, 调整了settting中的成员显示,去掉了冗余的计算逻辑,打开页面速度快多了
11 years ago
yanxd b33ee17343 Merge remote-tracking branch 'remotes/origin/develop' into szzh
11 years ago
yanxd 6c5e7eca49 TODO
11 years ago
nwb e15bad7462 course新增列并更改相关逻辑
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
fanqiang 150bb1ba1e 修改开源社区主页中的漏洞展示部分
11 years ago
wanglinchun 9f29a6c82a 将base的格式引入竞赛通知中,使其局部不同,接下来将通知的功能逐步引入
11 years ago
sw 96504d6806 1.修改作业提交流程,
11 years ago
wanglinchun 43449e66b5 增加了竞赛通知按钮
11 years ago
nwb f936c30ec9 添加与course.index相关的control、view、help等实现
11 years ago
z9hang 2e36949604 添加课程列表查看权限(需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看)
11 years ago
sw 3546355f70 增加修改昵称功能以及昵称是否重复的判断
11 years ago
sw 218fb3f831 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
nwb b52690adc2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 61135a352a 上传文件表单支持添加文件标签
11 years ago
yanxd 5d8edb218f 管理员查看user_projects 课程项目混淆的问题
11 years ago
z9hang cd333c8f35 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 27a30d44be 1.修改判断当前用户是不是为课程老师的方法
11 years ago
xianbo a70593ad76 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
yanxd 200c052bb4 watchers
11 years ago
z9hang bf12692de4 登录名==》账号/邮箱
11 years ago
xianbo 0f56d9e885 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
nwb 68b9a7efc5 修正批准成员申请未选择角色时的BUG
11 years ago
fanqiang fdf8b5640a 添加显示bug的页面
11 years ago
wanglinchun 4afc41a171 修改了编辑参赛作品不能更新托管项目的问题
11 years ago
wanglinchun a1083fe900 修改了原有参赛作品显示报500;
11 years ago
z9hang ddf5590c54 修复个人主页查看关注的项目时报user_id指代不明的sql错误
11 years ago
wanglinchun 8d77c62359 sdfd
11 years ago
z9hang ab85ee5169 admin个人主页项目功能修正
11 years ago
wanglinchun b416d69639 vxc
11 years ago
yanxd 12b1553a33 Merge branch 'develop' into szzh
11 years ago
yanxd 7a4e5afba0 test
11 years ago
z9hang 0e6d9a804a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang ee3a5f5719 代码修改
11 years ago
t430 fd0a504d84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
yanxd 5364687160 bootstrap & tag bug
11 years ago
z9hang ad5ac329f2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 6583ccb001 admin账户个人主页显示修改
11 years ago
xianbo e52886cf46 Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
11 years ago
xianbo cda9942723 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
yanxd 6b5fda1c78 read txt attachment
11 years ago
sw 0ec7d6b4e7 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 71bbc50542 增加作业留言的分页显示
11 years ago
yanxd 598429695f Merge branch 'develop' into szzh
11 years ago
yanxd 62f9ed052b issues#655
11 years ago
nwb eb5138e103 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 9c75b701f4 修改BUG
11 years ago
fanqiang d3ead651fe 动态显示安全问题
11 years ago
sw 5d4226ce79 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
nwb 4f9625b265 修改BUG
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
yanxd 3517dbb88b Merge branch 'szzh' into develop
11 years ago
sw 7748704c3a Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
nwb 80e84069a1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 1d6816419d 优化用户申请加入项目界面刷新
11 years ago
z9hang 7d9b2c751b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd c5a3a5bac3 user_courses.html
11 years ago
z9hang 21e58ce3df 课程列表中课程成员数量显示n+(不显示精确数)
11 years ago
nwb 104ee13ac7 1.添加用户申请加入项目contrl、model及相关逻辑
11 years ago
sw 8bb8de7d7f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 5a5db45af2 添加文本文件的预览功能
11 years ago
sw c7b19d8f2e 修改作业提交流程
11 years ago
wanglinchun 518de57123 将参赛作品编辑更新后的提示语修改为汉语
11 years ago
wanglinchun 947c0f8f64 竞赛页面中添加参赛作品成功创建的提示语
11 years ago
xianbo 4b063a2c69 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
fanqiang 290d07ffdd 修改新建帖子bug(open_source_project)
11 years ago
xianbo e3fe69c445 Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop
11 years ago
z9hang 45339e53d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
fanqiang aed4b250a0 修改数据库后修复bug
11 years ago
wanglinchun 77b7da81fd 参赛作品页面编辑功能中添加修改托管项目列表完成
11 years ago
yanxd d47facc9e8 Merge branch 'szzh' into develop
11 years ago
z9hang 5b8b2045f1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang b3489d3e68 修改删除文件后跳转错误问题
11 years ago
nwb 097489e594 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 4d21933e09 1.优化资源文件上传下载界面
11 years ago
sw 4de089250f 修改删除留言方法为destroy_jour,以及相关路由,访问action的改变
11 years ago
sw 9a62fe22c6 修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG
11 years ago
sw b80c51475f 1.增加作业参与人员类homework_users及相关代码
11 years ago
wanglinchun 9fb9d2dbdf 初步增加了新建参赛作品中参赛作品所属的托管项目列表
11 years ago
yanxd a76620a741 welcome footer
11 years ago
z9hang edf2a84072 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 2524600aeb 修正贴吧留言删除附件后跳转错误问题
11 years ago
sw 3fee4211a2 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 6c9b9841b8 课程作业留言增加回复以及回复的评论删除功能
11 years ago
nwb 5ca9d96acd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 7df6be8ff4 调整资源文件界面
11 years ago
sw 8a6fa2166e 课程作业显示列表增加该作业平均评分
11 years ago
sw 4c6b514d03 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw f79679f05a 1.修改作业列表显示效果
11 years ago
yanxd 63af60d7b6 edit 图标丢失
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
11 years ago
sw b27b3e0a5a Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 029eb1a195 作业回复
11 years ago
z9hang 0385013905 修复主页跳转
11 years ago
yanxd be87e02e4c Revert "从主页登陆时跳转到个人主页"
11 years ago
yanxd 53a9d29292 Revert "acount"
11 years ago
nwb b736dc91ed Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 4f7087f9ae 课程修正为只有的教师才能查看学生学号
11 years ago
z9hang e0592cd6f8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 03dbcb1168 acount
11 years ago
z9hang a794d612af 从主页登陆时跳转到个人主页
11 years ago
yanxd 0c302c7aea 1s ===> 0.005s
11 years ago
yanxd 13a5aa988a issues#623
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
11 years ago
z9hang 6086b25db7 贴吧帖子倒序去掉楼层
11 years ago
z9hang 7137f2663c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb b733f5c2b9 修正后台注册用户问题
11 years ago
wanglinchun 4ea8611942 教师评奖功能初步完成
11 years ago
z9hang 5649cc545e 修正项目列表界面搜索空值报错问题
11 years ago
nwb 4136cd27c8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 8badbb1e78 1.添加附件资源类型编辑视图与逻辑
11 years ago
ganyiang eda5121195 1.新增osp项目所有帖子的显示页面(待改进)
11 years ago
z9hang 8dab599fd2 讨论区回帖顺序改为与留言一致(新回复在前)
11 years ago
z9hang da37a12158 优化代码
11 years ago
nwb 9c24102e65 清理部分不需要的文件
11 years ago
z9hang 57a4f45cad 修复编辑作业提交返回错误信息时填入正确信息后异常bug
11 years ago
nwb b237f578f4 提交缺陷发送邮件,问题编号修改
11 years ago
nwb 25dba88a08 1.优化界面
11 years ago
nwb 0772e04510 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 75f584a6e2 1.完成分类资源下载视图显示
11 years ago
wanglinchun fc2f35f247 将关联功能整合到新建参赛作品中,可以直接关联到竞赛中
11 years ago
sw 64900b1fd7 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 5d2bb4ccbd 1.选择学校进入学校课程列表,点击更多由显示所有课程可能改为显示当前学校课程列表,之后排序也一样
11 years ago
wanglinchun cf18b94326 调整了竞赛中的参赛作品列表按得分排序;
11 years ago
nwb 431b6603f1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb e5bbd68c8c 1.添加资源分类浏览视图
11 years ago
wanglinchun dcc4167e06 将竞赛中参赛作品列表的排序方式改为按打分高低
11 years ago
yanxd f35dd2a30d 提交作业字段不合验证,返回页面bug
11 years ago
yanxd c702867250 Merge remote-tracking branch 'origin/develop' into develop
11 years ago
yanxd e6e001246f # 必填自己的工作单位,其实就是学校
11 years ago
sw b97c2e230f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago