Commit Graph

1200 Commits (26ff74a798d748f2617ea10bb5e937743c610fea)

Author SHA1 Message Date
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
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.修改竞赛作品时增加作品类别下拉框选择
11 years ago
sw c8aaa2776c 1.作品类别增加其他选项,当用户选择其他时,显示一编辑框用于用户输入其作品所属类别
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
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
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项目新增用户及赋权限接口
11 years ago
yanxd 12fb6bf5ca .
11 years ago
nwb 3d8571b59e 1.实现新增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
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
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.修改历史数据中作业为项目时作业显示列表未改变的问题
11 years ago
sw 8f8fb79a63 1.软件创客搜索功能修改表单提交为在js中提交
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
11 years ago
nwb 0031f90c64 1.课程动态中的私有的资源、文档进行权限判断
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
11 years ago
z9hang 3dfcc90574 课程、竞赛首页定制
11 years ago
nwb 1d4dad22ad Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
11 years ago
nwb 6d698cb5d8 下载添加权限判断
11 years ago
nwb bdaf59513b Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
11 years ago
nwb 9b3ffc90ba Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 6688ba61dd 1.用户申请加入项目向管理员发送邮件
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
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.优化课程首页
11 years ago
sw 2bdb0e20e9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
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.添加课程垃圾数据清理迁移文件
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
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
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
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
11 years ago
linchun 79f68c2231 Merge branch 'szzh' into develop
11 years ago
nwb 917288c84c 修正课程讨论区、课程通知等创建时BUG修正
11 years ago
sw 3f8f141107 修复 创建作业时,由于输入参数错误导致保存失败后,再次输入错误参数会报错。如再次输入参数正确,会进入一个空白页面 的BUG
11 years ago
nwb 99c9f81aea BUG修正
11 years ago
nwb 3565b9da88 修正用户课程界面关闭、重启课程,数据刷新不及时的问题
11 years ago
sw 745727b8e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang d57688413e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 74603e1256 解决直接访问ajax链接地址报错问题
11 years ago
sw 08bfb8e80a 修复教师评分后星星显示不正常的BUG
11 years ago
nwb 38baa247bf BUG修正
11 years ago
sw 392dc0c365 增加访问作业显示列表的权限
11 years ago
sw dbd5c49246 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb a115edea9d 修改课程标签页选中状态
11 years ago
sw ed9b97f987 增加访问作业显示列表的权限
11 years ago
nwb 7425178419 Merge branch 'CourseModify' into szzh
11 years ago
nwb ae3457e68b 1.添加代码评审(CodeReview)插件
11 years ago
nwb 6a2c486f62 修改作业数为10倍数时的显示BUG
11 years ago
linchun c1e780a0f8 yan
11 years ago
linchun 0c501022fd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
nwb e367c03f6e 修正课程作业列表显示BUG
11 years ago
linchun 9c5066b81c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
z9hang 773b728828 修改:自己不能踩或顶自己
11 years ago
z9hang 24172c85c8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang f9612ca63f 实时刷新(ajax轮询)
11 years ago
sw 05659fa2db 修复注册后在”修改资料“中发现我在注册时选择的”学生“身份和地区信息以及学号信息都没有了,需要重新填写。
11 years ago
z9hang 54d4b957ee 修复竖排的踩顶图标在踩或顶完后变成横排问题
11 years ago
sw 600ec536b3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 2ee5b422fb RolesController.rb移回app/controls
11 years ago
sw 463edeee71 1.修复未开启互评功能作业总评得分计算不正确的问题
11 years ago
sw e43a84ab4b 1.修复作业无关联项目是进入编辑界面报错的问题
11 years ago
sw f3f303e6e2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw ef234d8c50 1.按照新的评分规则修改作业得分
11 years ago
z9hang 9061a77221 修改user.user_score为空问题的解决方式
11 years ago
nwb f5c9123647 管理员创建课程逻辑修改,管理员创建课程后成为该课程成员
11 years ago
nwb e17090d506 修改课程通知show方法,并添加独立视图
11 years ago
nwb 80145c5c3b 修改课程列表动态数显示不正确的BUG
11 years ago
nwb 0480405afb 1.修改原课程各数据迁移文件BUG
11 years ago
sw efb6c1fd19 1.修改、新增作业增加提交项目选项(可以为空)
11 years ago
sw 872357cdf4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 97a4aaf8ab homework_attach增加列project_id及相关数据迁移
11 years ago
yanxd 8840a11a99 attachments error
11 years ago
yanxd 9b707f2b5a a
11 years ago
z9hang 1cb1eeeb1d 个人主页:姓名、工作单位
11 years ago
nwb 726697a69b BUG修改
11 years ago
nwb ec72bb2904 编辑作业逻辑修改
11 years ago
nwb 936c40b490 提交作业逻辑和视图修改
11 years ago
yanxd 2000f1ddf6 人物注册地址信息会保存两次的问题。
11 years ago
nwb 78612488e5 1.修改新建作业及视图
11 years ago
nwb 099e8a0912 Merge branch 'szzh' into CourseModify
11 years ago
z9hang 697a6034b2 新得分显示
11 years ago
nwb 9c3605320e 加入、退出课程逻辑优化
11 years ago
nwb 2a4486bf0d 修改迁移文件
11 years ago
nwb 59a261d96d 1.优化课程通知动态和权限判断
11 years ago
yanxd 63cd19c15c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang b727d023b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd b356145d71 course logo
11 years ago
nwb b2756650cf 修正课程留言动态引起的首页错误
11 years ago
z9hang eae3918074 添加用户得数统计功能
11 years ago
yanxd 7456e37e8a home
11 years ago
yanxd eff2da732b home
11 years ago
nwb 8a274981ce 修改课程动态
11 years ago
yanxd ceef85719e contest fix
11 years ago
yanxd 70abac4c1e Merge branch 'competition' into develop
11 years ago
yanxd 362570e34b contestnotification_edit function
11 years ago
nwb b178be984d 添加课程搜索处理
11 years ago
nwb c8900c279c 课程标签增加、删除
11 years ago
nwb 3933817570 1.修改课程配置界面
11 years ago
sw f4961cbc50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw a100193373 1.作业参与人员可以对作业进行修改,但不能进行删除
11 years ago
nwb ae8fcca14f 1.课程接触视图修改
11 years ago
sw d832a5eecf rake db:migrate
11 years ago
nwb 165dbc3f78 修改words_controller与课程相关方法及视图
11 years ago
nwb 517a29116f 修改message_controller与课程相关方法及视图
11 years ago
nwb 70901832a8 1.修改课程讨论区control index、show方法及路由
11 years ago
nwb 814233d245 1.修改课程通知保存功能
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
sw 29fa624e9d 封装获取作业成员的方法
11 years ago
sw 19fc84afee 作业增加成员、删除成员增加权限控制
11 years ago
nwb 3165d97417 1.迁移课程新闻数据
11 years ago
nwb 7677e092e0 添加课程资源文件分类显示视图
11 years ago
sw 872b7efb84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 2abd8187d0 增加搜索用户功能
11 years ago
nwb 59051972e1 1.修改课程资源删除
11 years ago
sw d0dd6eb781 1.修改作业时实现作业添加参与人员与删除参与人员
11 years ago
nwb 149d7ef1f4 修改课程资源文件上传功能
11 years ago
nwb b6c9415a4b 1.给各角色添加浏览课程资源文件权限
11 years ago
z9hang 7eb3c9f874 缺陷留言+1分、
11 years ago
sw 130f9f87c2 1.实现作业添加成员的翻页功能
11 years ago
nwb a793b8923d 1.Non member角色添加add_couese权限
11 years ago
nwb f741b0581c 修改课程资源文件视图BUG
11 years ago
sw cbb348dc0e 实现给作业增加用户页面相关js代码及css代码
11 years ago
nwb a20feafa4e 1.添加课程动态model
11 years ago
yanxd 541b22b84d score statistics init
11 years ago
sw 787e043650 1.修改下载作业时的错误
11 years ago
sw 26b933dddb t
11 years ago
sw e5fec207aa 1.修改判断当前用户是否为指定课程成员、学生、老师的方法
11 years ago
nwb 8768193e72 添加课程资源文件全部列表视图
11 years ago
sw 58bb6d269d 取消名字前面的时间
11 years ago
nwb 2f3d9b1795 1.修改资源文件类index方法
11 years ago
z9hang f383f501ec 修改权限代码:判断用户是否为项目的管理员、判断用户是否为课程的老师、学生由根据role_id判断改为根据其权限判断
11 years ago
sw 2827bd0c21 1.修改下载一个人作业所有文件的传递参数
11 years ago
nwb 54505340eb 1.修正新建课程错误
11 years ago
sw bef37e5c0f 增加作业显示列表首先按评分排序,然后按时间排序
11 years ago