Commit Graph

10563 Commits (alan_develop)

Author SHA1 Message Date
alan 5343759f2f Merge branch 'FX-alan-search-404' into alan_develop
10 years ago
ouyangxuhua da1b27cd38 Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang
10 years ago
ouyangxuhua 9bac560906 超级管理员有编辑和删除博客的权限
10 years ago
huang 9aab10c05a 代码更新
10 years ago
cxt 2ce2134f0b 浏览器tab的title,显示用户姓名,不是登录名
10 years ago
cxt 879f9a0ad5 对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天
10 years ago
linchun 69ec475752 组织列表时间倒序排列
10 years ago
cxt e97690e2f2 “导入作业”改为“从题库选用”
10 years ago
cxt 90d664bbca 学生提交作品时描述框可以直接插入图片,作品列表也直接显示图片。
10 years ago
huang a10475fa65 公共资源删除、新建代码优化
10 years ago
linchun 7d5a5f1de2 完成项目资源列表中的排序(资源大小,上传时间,下载次数)
10 years ago
linchun 3fcf192430 完成了课程资源列表的排序(上传时间,资源大小,下载次数)
10 years ago
huang 22ce591c36 资源库添加搜索过滤
10 years ago
linchun d3ed89d87e sort
10 years ago
ouyangxuhua 70f4bb1c14 Merge branch 'develop' into ouyangxuhua
10 years ago
ouyangxuhua fe0d31d9c4 1.用户信息中的额用户链接改成正确连接;组织资源文件名过长时省略显示
10 years ago
ouyangxuhua b716e593b5 组织下的链接问题
10 years ago
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua
10 years ago
ouyangxuhua 2a46d60433 组织下的链接的host_name均使用Setting.host_name
10 years ago
huang 5681d329d6 Merge branch 'develop' into hjq_new_course
10 years ago
huang bf4116906f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 5476016b79 调整题库高度与资源库一致
10 years ago
linchun 4da8a3828f 用户最新列表单位完成,修改了点击最后两页报错的问题
10 years ago
linchun df4ad9f597 完成管理员界面最近登录列表单位信息
10 years ago
huang 2b21213b7f 公共资源库,排序
10 years ago
ouyangxuhua 402b0e9c24 域名都使用Setting.host_name获取主机名
10 years ago
huang 3bfaddc80f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua 15dfaf67b2 测试版环境,登陆注册改成https://test.forge.
10 years ago
huang a7990a4c3c Merge branch 'yuanke' into develop
10 years ago
ouyangxuhua c0edd91c3d 登陆注册链接改为www.
10 years ago
yuanke 27a2aad3d6 修改KE贴吧回复添加视频图片不能显示的BUG
10 years ago
huang a1cae3f592 admin教师单位获取
10 years ago
ouyangxuhua 46b50ab065 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
linchun a1bef60bb5 Merge branch 'linchun' of https://git.trustie.net/jacknudt/trustieforge into linchun
10 years ago
linchun 96f65f338c 用户列表添加单位
10 years ago
huang 3d06d5a503 Merge branch 'yuanke' into develop
10 years ago
ouyangxuhua 2899f29b5f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
yuanke 465a236049 修改KE贴吧等地图片显示不出来的问题
10 years ago
cxt d2a8acf87b 个人主页--首页显示不全,右下角也应该显示展开按钮
10 years ago
huang 7c624cd571 公共资源只包括公开资源
10 years ago
cxt c770fd157c 题库:题目描述变窄,缺省文字:【尹刚提供】
10 years ago
ouyangxuhua a2e6f0ee5f 1.登陆退出使用www;2.对于有多个标签的组织资源,过滤条件中的“其他”应该显示
10 years ago
cxt 3d1f7cc0a8 提交作品:作品标题设缺省值:作业名称+“的作品提交”。学生不改就使用缺省值
10 years ago
ouyangxuhua a7312a6191 修改游客下载组织资源的权限
10 years ago
cxt 1aa5450e4a 题库支持按发布者、来源、类型的排序
10 years ago
alan 3eaa4b08a3 解决删除用户报500错误
10 years ago
ouyangxuhua f496761325 将is_default_field方法放到application_helper.rb中,避免报错;退出链接不带子域名
10 years ago
alan 2f5ce553e2 refactor user find
10 years ago
alan 0998ca3974 Merge branch 'develop' into FX-alan-search-404
10 years ago
alan ce6d63ccaf 重构user.find
10 years ago
cxt 7d2bb572b2 Merge branch 'yuanke' into develop
10 years ago
cxt 98f7ad19f6 Merge branch 'linchun' into develop
10 years ago
cxt 7f302305ff Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 46d22980c9 Merge branch 'cxt_course' into develop
10 years ago
cxt a845da5c17 点赞有延迟
10 years ago
guange 45c51ef8db merge
10 years ago
guange 24a278d7d6 加上atall
10 years ago
cxt 12c60547ad 题库支持按引用数和发布时间排序
10 years ago
linchun 8c145c9d39 Merge branch 'develop' into linchun
10 years ago
cxt 1d93c6c56b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
cxt e02bde6f65 作品列表支持按学生姓名和学号排序
10 years ago
huang 97a7694778 访问统计数--views
10 years ago
Tim 45f1cfa477 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 8079254089 首页增加访问统计
10 years ago
Tim 53c281103c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
Tim de3a4718ab 个人,课程,项目,组织访问量添加
10 years ago
huang c18634be86 课程通知。新闻代码优化
10 years ago
luoquan 901409ebb4 Merge branch 'yuanke' into luoquan
10 years ago
luoquan 1900a824e8 0
10 years ago
alan 1f5c90185a 修复《顶部搜索“分析”报404错误》
10 years ago
cxt dcd13b9d6b 点击个人主页的课程和项目在新的tab页中打开
10 years ago
cxt 94c1e38066 分组作业动态中的“创建项目”更换颜色
10 years ago
cxt ef5625ccdf 延期发布的课程资源设为公开后不应对学生可见
10 years ago
huang 47ca79c317 news消息已读修改
10 years ago
cxt 2812fcd2fb 删除无用代码
10 years ago
luoquan a418c0937d Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
10 years ago
luoquan 7d70e63f8d 代码重置
10 years ago
alan 89438364cf Merge branch 'develop' into FX-alan-message-access-slow
10 years ago
alan 55983093fd 优化课程反馈页面
10 years ago
ouyangxuhua bc5ce1fd22 组织下的课程帖子链接参数正确传输
10 years ago
cxt a7b9d8424a 只有全部列表中的学生可编辑分班
10 years ago
ouyangxuhua eb3c0d9334 组织设置为公开后,允许游客下载选项变为可选;老师的提交作业消息不显示
10 years ago
huang 440cd04414 Merge branch 'develop' into hjq_new_course
10 years ago
cxt 0d8052da28 老师把学生加入某一个分班
10 years ago
huang 5818860a4d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua 766569afa6 1.组织下的课程作业,设置评分等按钮点击没反应的问题修复;更新项目/课程的活动,相应地更新组织的活动的更新时间
10 years ago
huang 08cb7b642c 附件上传样式
10 years ago
huang 1644442d2e 修改附件描述样式
10 years ago
huang 627580a9ac 标签问题(未完)
10 years ago
cxt fa3fd56686 题库发送课程的弹框搜索不能用
10 years ago
cxt c255325300 添加分班
10 years ago
yuanke 7f7979e955 修改回复时可多次点击发送按钮的问题。
10 years ago
huang 281d31980d Merge branch 'develop' into hjq_new_course
10 years ago
cxt 0fb808e2fd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang c947121e2b 消息不显示问题(未完)
10 years ago
cxt 9fd0951ec3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt cd1409f950 还原学生分班
10 years ago
ouyangxuhua 6cf518e2e4 1.组织的非成员用户,隐藏上传资源/导入资源;2.申请的子域名,一律改成小写
10 years ago
ouyangxuhua 680bdc3d34 组织下的链接改成https://www.
10 years ago
ouyangxuhua f917e96a12 组织栏目中的链接的url更新
10 years ago
cxt 8a4175dc02 点击学生作品列表中的编程作品,代码会跳到上一个作品的详情
10 years ago
cxt f8f36f9f29 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
cxt cc441826ee 测试代码即提交代码 系统得分为当次的测试得分
10 years ago
Tim 5d3d73a783 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
Tim 61ce439e74 添加老师对学生的分班操作
10 years ago
cxt 5b4ff5ec8a 学生列表中的作业积分为负分
10 years ago
ouyangxuhua 16b0bf9c80 更新组织栏目优先级,如果输入不合法,则不作改变
10 years ago
ouyangxuhua a51ca428be 组织中,增加调整栏目显示顺序的功能
10 years ago
huang 3d2ba83c36 @消息问题修复
10 years ago
huang 5a4f422b1c 消息分页问题
10 years ago
huang 53e164048d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 2a1eac02a9 Merge branch 'hjq_new_course' into szzh
10 years ago
huang b4800585e7 解决消息 信息500问题
10 years ago
huang 84d7049add fork弹出新页面,解决间接性500问题
10 years ago
huang 99be187d54 版本库 无法预览的文件提供直接下载功能
10 years ago
cxt db1f31724a Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
cxt d3489ec5cb 作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
10 years ago
ouyangxuhua 713c28c0b5 个人页面快捷操作课程/项目的设置公开/私有属性,确定的提示信息要正确
10 years ago
Tim d6d8e231e6 课程推荐在ie中显示bug
10 years ago
huang f469e51202 课程模块/通知、作业、留言、发帖,删除的时候统计数字递减
10 years ago
ouyangxuhua 5d1d56fbb3 组织下链接改成https://www.形式
10 years ago
huang f022950408 Merge branch 'develop' into hjq_new_course
10 years ago
Tim 141c0be24f 上传资源弹窗样式调整
10 years ago
ouyangxuhua 6e21229b4c 组织用户链接
10 years ago
ouyangxuhua 4442d286ce 组织下的用户连接改成https://www.……形式
10 years ago
linchun 3e70db4e82 Merge branch 'develop' into linchun
10 years ago
huang 2fdddc6488 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
10 years ago
huang ec4a3b321c 更新历史版本,下载次数,引用次数不清零
10 years ago
linchun 3c66a29767 完善课程资源列表,完成项目资源列表
10 years ago
cxt ca094a13b5 优秀作品排行中,不允许访问的,就取消链接。老师设置了完全公开的作品,就有链接
10 years ago
cxt f0e3fe8ff7 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
cxt 2ee93f9f86 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 3424be695e 题库:发送的弹框中,不要出现已经删除的课程
10 years ago
ouyangxuhua c3eb8e05cd 组织的私有资源,数量一致
10 years ago
ouyangxuhua d70df6a89d 公开组织的资源,非成员不能看到私有资源
10 years ago
ouyangxuhua 699e1f41a7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua ce187b4212 组织资源下载权限控制
10 years ago
cxt 64b6af6177 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 91d000c8f3 编程作业:编程测试集的弹框中,多行却只显示一行
10 years ago
Tim 56372fbdd5 积分规则显示样式调整
10 years ago
linchun b7f4b584f2 完成管理员界面课程资源列表
10 years ago
ouyangxuhua 2ea553e988 Merge branch 'ouyangxuhua' into develop
10 years ago
ouyangxuhua 0df34dd3ee 组织资源栏目,过滤条件“其他”内容
10 years ago
cxt f8ce6d48d3 模拟答题的返回按钮应该回到课程作业列表
10 years ago
cxt e30c26aa09 课程报500
10 years ago
ouyangxuhua a0363b5511 组织资源发送后,发送次数动态增加
10 years ago
ouyangxuhua 319f286a65 解决一下问题:1.组织的资源的引用计数不会增加;2.组织资源栏目中,文件的宽度不合适
10 years ago
cxt fcae91ecc1 “课程通知”改为“通知”
10 years ago
cxt cff5e9171f 导入作业后页面不应跳转到被导入的作业页面
10 years ago
ouyangxuhua 984cd76b7f Merge branch 'develop' into ouyangxuhua
10 years ago
ouyangxuhua b77b63bbf1 解决私有组织栏目通过url能访问的问题
10 years ago
huang d6dedf03cb 去掉puts注释
10 years ago
huang d30e73795d 积分规则
10 years ago
huang 4f2937e1a2 英雄榜
10 years ago
huang a079a61c82 回复数
10 years ago
huang d54609075b 区分新闻和新闻回复得分
10 years ago
huang 6ceb4f4549 Merge branch 'develop' into hjq_new_course
10 years ago
huang bafa151c0d 0
10 years ago
huang 3f56fa3405 0
10 years ago
huang f381784a3c 数据迁移
10 years ago
huang 814e766577 课程过滤
10 years ago
huang e4d669251f 英雄榜得分
10 years ago
huang 4cf80fe441 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 6ce947667d 课程英雄榜提示
10 years ago
cxt 782bbc775b 公共资源库的统计
10 years ago
huang de1c2e18c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 38fca02193 注释搜索
10 years ago
huang ae40a4ea61 公共资源相关功能
10 years ago
cxt 3deaa492b2 编辑作业时作业描述被解析了
10 years ago
cxt 4f3055c990 讨论区改为问答区,且放开课程的“问答区”,就是课外的用户也能在公开课内发帖或回帖。
10 years ago
cxt fd8b40a36e 对于编程作业,系统评分的前几名能否也显示出来
10 years ago
huang 91b8a81b9d 去掉全站搜索
10 years ago
huang bbbf13084e 修改搜索功能,页面跳转
10 years ago
cxt 947e6ea469 作业--“禁用匿评”处增加提示语:匿评是同学之间的双盲互评过程:每个同学将评阅系统分配给他/她的若干个作品。
10 years ago
cxt ffac8164f1 管理员的课程和项目列表,按照时间倒排
10 years ago
linchun bb8a6af13e admin界面添加精品课程页面,目前该页面中的精品课程是固定的
10 years ago
cxt a5cb3d5e6a 新建作品时的输入框改为“请输入作品名称”、“请输入作品描述”
10 years ago
cxt d2920c64ea 题库作业发送到课程后增加提示
10 years ago
huang dfddb30ca3 附件引用
10 years ago
cxt 6ca702eb2c 题库发送的课程列表中不包含当前作业所在的课程
10 years ago
cxt 8aff404f0c 题库过滤作业的搜索
10 years ago
huang 9beaa62d6d 课程活跃度
10 years ago
huang 50011985a9 课程资源库添加资源描述
10 years ago
cxt b333c40ce0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt e2ff348075 题库的作业过滤
10 years ago
cxt 0cd536fcc9 题库增加发布者姓名搜索
10 years ago
huang 596d4e17e9 解决样式冲突
10 years ago
huang 97e6299a2b Merge branch 'hjq_new_course' into develop
10 years ago
huang 95346bb419 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 5ab9e3b5b7 资源搜索
10 years ago
huang e9c9112b38 公共资源封装
10 years ago
huang ba9b22fbe1 公共资源,删除、重命名
10 years ago
huang 3dacf900d5 修改导入公共、我的资源
10 years ago
huang 085729f91b 课程活跃度中添加作业留言得分
10 years ago
huang fee7cc4b2c 课程推荐中不显示私有课程
10 years ago
huang ef57dc80d4 去掉项目名称
10 years ago
huang 5cf198c61a 课程教师、学生列表添加成员管理入口,项目成员列表入口
10 years ago
cxt 8e5abe997a 已禁用匿评的作业还显示匿评截止时间不合适
10 years ago
huang 8815e99db5 资源上传跳转问题
10 years ago
cxt 050257e885 作业添加挂起的状态
10 years ago
huang 5fd36c0e78 课程、项目、组织资源导入
10 years ago
cxt 9b573248d8 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
cxt f0d7542ac6 个人题库和公共题库
10 years ago
cxt d2cf95a32d 最近登录老师列表的超链接指向了其他用户
10 years ago
huang 3368680e49 课程、项目、组织添加导入资源功能
10 years ago
huang 22cbbc2476 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
10 years ago
huang a0ef85f4da 导出样式
10 years ago
Tim f51d16c538 资源库样式调整
10 years ago
huang 21244a5657 资源库导入功能
10 years ago
Tim 486d791c72 资源名称颜色调整
10 years ago
huang c0077b7c9d 公共资源/我的资源JS实现
10 years ago
huang 6893b3dcab 修复分页问题
10 years ago
huang b3fea3e229 资源库代码封装
10 years ago
huang 8edaa9d2bd 资源库
10 years ago
Tim 11592bdbcc 导入题库题目弹框样式更改
10 years ago
cxt f6f84b564e 在线测验的选项和候选答案的正确显示
10 years ago
cxt 072300331b 编程测试集的输入输出添加序号
10 years ago
cxt 6ba91cb3fe Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 81f54e44b4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang a10e973c75 版本库配置默认分支
10 years ago
cxt 7d66c06a56 复制学期多次点击“完成”会复制多个学期
10 years ago
ouyangxuhua 6e85b38b09 1.博客设为首页后转到个人主页;2.组织栏目设为首页正确实现文章
10 years ago
cxt 601c5906d4 Merge branch 'develop' into szzh
10 years ago
ouyangxuhua 1951d50bf7 组织文章不显示回复框的问题
10 years ago
cxt 0b6521c921 禁用匿评的作业动态仍然显示缺评扣分
10 years ago
cxt 5b4cec2c05 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt e3e2c37f12 超级管理员的最近登录用户列表添加老师列表
10 years ago
ouyangxuhua 956ce8045d Merge branch 'ouyangxuhua' into develop
10 years ago
newuser 555a9131c4 Gitlab端获取默认分支
10 years ago
newuser d2bd4706d3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
newuser d747ec854d Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
Tim e8234092ec 复制学期弹框调整
10 years ago
cxt 09c8e57f1c 复制课程时可复制资源和作业
10 years ago
ouyangxuhua 991613d760 在转发表forwards记录发送帖子、通知
10 years ago
cxt c93b4d109a 作业动态添加子菜单:公开作品/取消公开
10 years ago
Tim 100b002a1f 提交改动显示页面调整
10 years ago
huang a6abdbacb9 Merge branch 'hjq_course' into hjq_new_course
10 years ago
huang 635e6300a1 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
10 years ago
huang 8b839caa48 添加样式
10 years ago
huang aef2dd8d1a 版本库通过修订好,导出对应的文件,导出对应内容
10 years ago
cxt c6e7e2e83b 模拟答题页面增加返回按钮,页面的layout改成课程相关
10 years ago
cxt 95170b0b2b Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
guange 231df07c29 移除pry
10 years ago
ouyangxuhua a451680cf8 发送文件时,记录放在表forwards中
10 years ago
cxt e6ed988c10 Merge branch 'szzh' into develop
10 years ago
guange 296d6efbf1 单文件作业不压缩
10 years ago
cxt 5e330de31a 学生看到的作业个数不包含未发布的作业
10 years ago
cxt 2aa0fefa1c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua 264c6679e0 Merge branch 'ouyangxuhua' into develop
10 years ago
ouyangxuhua 11231d0ff9 1.解决组织配置报500的错误;2.增加转发表
10 years ago