Commit Graph

4101 Commits (28edaf2246f38a7807f592fa2f9a12cafc2f737d)

Author SHA1 Message Date
cxt 2d4f724e33 导出的学生列表作品排序按作业发布时间升序排列
9 years ago
cxt d91d2bfa17 作业下拉列表显示全部作业
9 years ago
huang fddf03d80c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
huang 7d8715e82b Merge branch 'hjq_beidou' into develop
9 years ago
huang 2a00c4ddd7 版本库统计show权限统计
9 years ago
cxt d948536a10 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt e5b07c6c12 Merge branch 'cxt_course' into develop
9 years ago
cxt 19861ba8c6 超级管理员的组织可关联所有公开课程和项目
9 years ago
yuanke ef4b256313 Merge branch 'yuanke' into develop
9 years ago
cxt 5e1284605f Merge branch 'hjq_beidou' into cxt_course
9 years ago
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表.
9 years ago
huang c87611dfec 动态中添加版本库统计
9 years ago
huang acf4e15f09 统计数左侧刷新
9 years ago
huang adf6cca435 完成代码行数的提交和统计
9 years ago
cxt 2befcd6634 Merge branch 'cxt_course' into develop
9 years ago
cxt 062af3c57a 作业积分出现负分
9 years ago
huang f9c4c4b86f 版本库不同分支之间的统计
9 years ago
cxt a21ea98b37 个人主页中的课程列表出现重复课程
9 years ago
huang 426f5a76cc 提交列表中添加不分支的提交记录功能
9 years ago
huang f7cb451feb gitlab版本库添加提交信息统计接口
9 years ago
cxt fcd1684658 作业列表按更新时间排序 作业列表左上角添加作业的下拉列表
9 years ago
huang 04849659de 版本库统计
9 years ago
huang dc0b7defa1 版本库show页面简化及注释
9 years ago
guange 055ba00de5 绑定成功后关闭页面
9 years ago
huang ab34fec172 资源导入的时候记数没有自动增加问题
9 years ago
huang cd9ad535f5 1、修改默认图片
9 years ago
cxt e007ee58ef 博客动态
9 years ago
guange 0731405828 重新再次进来的用户提示欢迎信息
9 years ago
guange aa9cb4e579 merge
9 years ago
huang 549ee9daa2 上传非图片格式的不显示问题
9 years ago
huang 23a4a29c76 关联项目、课程中过滤掉私有课程、项目
9 years ago
huang 623114dc41 解决删除项目的私有资源显示在我的资源中的问题
9 years ago
huang a6f6f63d6d 图片上传添加提示
9 years ago
huang 2162d7d4b8 组织banner上传功能
9 years ago
guange ff93e9f79b 修改返回为json
9 years ago
guange 1926f0ba53 修改openid路由
9 years ago
guange a25fe6cef8 修改openid路由
9 years ago
guange 9c93b3f9a6 修改openid调用位置
9 years ago
huang e4b5a4df05 500wenti
9 years ago
huang 86aecd21b9 上传图片
9 years ago
huang 0459856a2c 上线logo更换
9 years ago
huang ac1b3338c5 logo图标替换
9 years ago
huang 218a6b9358 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
9 years ago
huang c00c674c34 Merge branch 'develop' into hjq_beidou
9 years ago
huang 9e7c595e55 组织发送动态的显示
9 years ago
huang a9412b959e 动态一致问题
9 years ago
huang 25da925497 课程列表显示内容统一
9 years ago
huang 92a08dc606 作业500问题
9 years ago
huang 4cca290592 组织编辑500问题
9 years ago
huang 10371e8bdd 添加附件图片功能
9 years ago
huang ebb2f30f3b 配置完点确定,自动跳转
9 years ago
huang 4797cbe65d 模式默认选中
9 years ago
huang 756a2db4aa 组织配置样式问题
9 years ago
huang 6af8c48d3b Merge branch 'hjq_beidou' into develop
9 years ago
huang f662bfa40b 组织科配置
9 years ago
huang 1ccb3a2c41 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
9 years ago
huang c6f6030e10 组织新样式
9 years ago
cxt 893fad2b48 组织配置里的栏目 “排列做成可编辑的”
9 years ago
huang da1438b04e Merge branch 'hjq_beidou' into develop
9 years ago
huang 5621f01284 权限访问控制
9 years ago
huang 8f43341f81 新建组织为空的情况
9 years ago
huang 7c55356ace 组织新界面修改
9 years ago
linchun d98eb8748e 修改管理员界面作业列表的截止时间为作业发布时间,并且按时间倒序排列
9 years ago
huang f2106d0045 more链接添加,区分两种模式
9 years ago
huang 2728cccd41 Merge branch 'develop' into hjq_beidou
9 years ago
alan 88a4b8ce6c Merge branch 'alan_develop' into develop
9 years ago
alan 200561da92 修改《私有资源公共资源中不显示》
9 years ago
yuanke be1351a4d8 Merge branch 'yuanke' into develop
9 years ago
yuanke ef5d8abf38 修改编程作业提示服务器出错的BUG
9 years ago
huang 80cd5089a4 Merge branch 'develop' into hjq_beidou
9 years ago
ouyangxuhua 2275b367f4 在organization控制器的show方法添加layout
9 years ago
alan eb1c6ccf85 Merge branch 'alan_develop' into develop
9 years ago
huang b80bc98fcb 组织首页
9 years ago
cxt d1cb44cff7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt 1daf620ed1 新建作品点取消时跳到我的作业页面
9 years ago
ouyangxuhua a69997f6c7 Merge branch 'develop' into ouyangxuhua
9 years ago
alan dfe9cb0c68 Merge branch 'develop' into alan_develop
9 years ago
alan 90fd52970b fix bugger on 资源区
9 years ago
yuanke 213cf48c09 编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管
9 years ago
alan 395fb8fae6 修改pagination,资源区bug
9 years ago
huang b8463fcca5 北斗
9 years ago
huang 74a4e80795 Merge branch 'ouyangxuhua' into hjq_beidou
9 years ago
Tim 406bb7930c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
9 years ago
huang 4b6b5504ca 北斗框架(未完)
9 years ago
ouyangxuhua f4b4bf40de 增加显示组织显示模式字段,并且在新建组织和配置组织中能够选择
9 years ago
huang 326730f6b1 北斗框架
9 years ago
guange 60931dde6a 添加获取openid的功能
9 years ago
yuanke f217c9097a 全部正确需要提示是否提交
9 years ago
yuanke 88ba2bf556 编译错误处理
9 years ago
yuanke 5116d75eb7 编程作业空格用□表示
9 years ago
yuanke e62ee2eade 修改评测问题
9 years ago
yuanke 4c47dae88b Merge branch 'develop' into yuanke
9 years ago
huang dea1c13a64 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
alan 46951f7af9 Merge branch 'develop' into alan_develop
9 years ago
alan 4f5e083707 优化个人主页,缓存设置
9 years ago
yuanke 674b63d106 Merge branch 'develop' into yuanke
9 years ago
ouyangxuhua 9f8ad41533 Merge branch 'ouyangxuhua' into develop
9 years ago
cxt 46a05d1000 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
ouyangxuhua b581a13736 Merge branch 'develop' into ouyangxuhua
9 years ago
yuanke dea947e9ce Merge branch 'develop' into yuanke
9 years ago
yuanke c6361406b5 代码评测超时优化
9 years ago
huang 9549d695f6 讨论区局部优化
9 years ago
alan aeb694a68e 修改《删除blog_comment时删除user_activities内容》
9 years ago
alan 357c60d42e Merge branch 'hjq_new_course' into alan_develop
9 years ago
alan 7108e6d763 减少数据库查询字段
9 years ago
ouyangxuhua 2d4f5284df 删除的课程、项目不能被关联到组织;组织名称长度限制;组织栏目添加帖子加上栏目名称;编辑组织时,如果组织名称没变,就不需要提示;学生回复老师的作业留言,打开后,显示该学生作业;新增、编辑组织文章,需要验证标题
9 years ago
huang 88185b1f34 点击作品消息,作品展开
9 years ago
huang 1330f02db8 项目创建的动态以多态形式存入forge_activities
9 years ago
huang d6f81c8978 课程讨论区优化
9 years ago
huang f1ffd3852f Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
9 years ago
huang 185ad829cd 项目访问速度优化
9 years ago
ouyangxuhua 1579a86f9f 老师给学生的作品打分后,学生再次编辑,要给老师和助教发消息提示
9 years ago
alan a165657915 Merge branch 'develop' into hjq_new_course
9 years ago
alan 49026f0438 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
9 years ago
alan 9273e37a5b 优化SQL查询:1,members与users表关联查询; 2,blogs表单查询
9 years ago
cxt aa1cbcdf87 课程留言动态加入个人动态
9 years ago
huang 12efbcb9ae Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
huang 7967066b05 附件添加动态发送方式改变
9 years ago
ouyangxuhua 675b1ad403 1.组织配置中,输入组织名字、子栏目域名目录后,自动变成小写字母;2.将所有子域名及域名目录改成小写;3.组织配置中,修改子栏目时,如果没有点确定,输入框的内容保持不变。
9 years ago
huang 478311128d 优化project_controller show方法
9 years ago
huang 341308658d 优化项目消息更新代码
9 years ago
guange fbe1b2dac2 Merge branch 'guange_dev' into weixin_guange
9 years ago
huang e77a891bc6 消息查询语句优化,添加索引
9 years ago
guange 6ae4cd0767 merge
9 years ago
linchun 6284b8d4f9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
guange 59923dfb03 merge
9 years ago
cxt 74e77bf347 题库的来源排序不可用
9 years ago
huang 2793a9a874 0
9 years ago
huang 8b09be83e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
huang fc6210eada 资源导入,搜索条件中导入400问题
9 years ago
cxt 9917e802cb 课程推荐的资源统计
9 years ago
cxt a482b76207 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt dc4a7ee2e6 Merge branch 'cxt_course' into develop
9 years ago
cxt e34f2e45db 管理员界面的课程列表和项目列表分页
9 years ago
linchun d3635067b7 Merge remote-tracking branch 'remotes/origin/develop' into linchun
9 years ago
linchun 66a7827eb2 组织列表增加分页功能,学校列表调整分页
9 years ago
cxt 24318e3d6b 题库的刷新
9 years ago
linchun f8a88767c0 管理员用户列表增加单位信息
9 years ago
huang 4876e6669a 课程附件局部刷新
9 years ago
cxt 119b12349b 作品名称的缺省值为 作业名称+的作品提交(可修改) 若学生不修改则保存为 作业名称+的作品提交
9 years ago
huang 4766abab7f 下载行为添加ID判断
9 years ago
huang b262e1b432 完成下载行为记录
9 years ago
cxt 2466184d8a 编辑作业的时候,还要选择作业发布的课程不合理,影响体验
9 years ago
huang 79767f4bae 用户行为记录
9 years ago
cxt c73637a4ca 作业列表按作业发布时间排序
9 years ago
huang 1b0bcd0c05 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
huang cefa6efc1b 项目动态中加入附件
9 years ago
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua
9 years ago
huang 7e0aa44b68 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
huang 28cb1755d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt 6b8ae56ce4 Merge branch 'alan_develop' into develop
9 years ago
cxt d72aa3a93c Merge branch 'develop' into cxt_course
9 years ago
linchun 52af5e4303 修复了管理员界面多个列表的题目问题
9 years ago
huang 84470af2ff 删除的课程和项目不在发送中显示
9 years ago
alan a4e2fd741e 删除issue,返回页面不变
9 years ago
huang 7ff946e488 课程资源库提供历史版本下载
9 years ago
huang 0a881f14e8 导入添加自动搜索
9 years ago
alan 4d82f0c959 在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》
9 years ago
linchun 34c9f54510 完成了管理员界面学校列表
9 years ago
huang 064dc81ed6 解决公共资源删除资源后统计数字不减少的问题
9 years ago
ouyangxuhua ea6de1407e Merge branch 'develop' into ouyangxuhua
9 years ago
alan 050a266985 Merge branch 'FX-alan-message-access-slow' into alan_develop
9 years ago
ouyangxuhua 9bac560906 超级管理员有编辑和删除博客的权限
9 years ago
huang 9aab10c05a 代码更新
9 years ago
cxt 879f9a0ad5 对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天
9 years ago
linchun 69ec475752 组织列表时间倒序排列
9 years ago
huang a10475fa65 公共资源删除、新建代码优化
9 years ago
linchun 7d5a5f1de2 完成项目资源列表中的排序(资源大小,上传时间,下载次数)
9 years ago
linchun 3fcf192430 完成了课程资源列表的排序(上传时间,资源大小,下载次数)
9 years ago
huang 22ce591c36 资源库添加搜索过滤
9 years ago
linchun d3ed89d87e sort
9 years ago
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua
9 years ago
huang 5681d329d6 Merge branch 'develop' into hjq_new_course
9 years ago
huang bf4116906f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt 5476016b79 调整题库高度与资源库一致
9 years ago
huang 2b21213b7f 公共资源库,排序
9 years ago
ouyangxuhua 2899f29b5f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
huang 7c624cd571 公共资源只包括公开资源
9 years ago
ouyangxuhua a2e6f0ee5f 1.登陆退出使用www;2.对于有多个标签的组织资源,过滤条件中的“其他”应该显示
9 years ago
cxt 1aa5450e4a 题库支持按发布者、来源、类型的排序
9 years ago
cxt 7d2bb572b2 Merge branch 'yuanke' into develop
9 years ago
cxt 98f7ad19f6 Merge branch 'linchun' into develop
9 years ago
cxt 7f302305ff Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt 46d22980c9 Merge branch 'cxt_course' into develop
9 years ago
guange 45c51ef8db merge
9 years ago
guange 24a278d7d6 加上atall
9 years ago
cxt 12c60547ad 题库支持按引用数和发布时间排序
9 years ago
linchun 8c145c9d39 Merge branch 'develop' into linchun
9 years ago
cxt e02bde6f65 作品列表支持按学生姓名和学号排序
9 years ago
Tim 45f1cfa477 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
huang 8079254089 首页增加访问统计
9 years ago
huang c18634be86 课程通知。新闻代码优化
9 years ago
luoquan 1900a824e8 0
9 years ago
huang 47ca79c317 news消息已读修改
9 years ago
alan 89438364cf Merge branch 'develop' into FX-alan-message-access-slow
9 years ago
alan 55983093fd 优化课程反馈页面
9 years ago
cxt a7b9d8424a 只有全部列表中的学生可编辑分班
9 years ago
huang 440cd04414 Merge branch 'develop' into hjq_new_course
9 years ago
cxt 0d8052da28 老师把学生加入某一个分班
9 years ago
cxt fa3fd56686 题库发送课程的弹框搜索不能用
9 years ago
huang 281d31980d Merge branch 'develop' into hjq_new_course
9 years ago
huang c947121e2b 消息不显示问题(未完)
9 years ago
cxt 9fd0951ec3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
9 years ago
ouyangxuhua 6cf518e2e4 1.组织的非成员用户,隐藏上传资源/导入资源;2.申请的子域名,一律改成小写
9 years ago
ouyangxuhua f917e96a12 组织栏目中的链接的url更新
9 years ago
cxt cc441826ee 测试代码即提交代码 系统得分为当次的测试得分
9 years ago
cxt 5b4ff5ec8a 学生列表中的作业积分为负分
9 years ago
ouyangxuhua a51ca428be 组织中,增加调整栏目显示顺序的功能
9 years ago
huang 2a1eac02a9 Merge branch 'hjq_new_course' into szzh
9 years ago
huang 84d7049add fork弹出新页面,解决间接性500问题
9 years ago
huang 99be187d54 版本库 无法预览的文件提供直接下载功能
9 years ago
cxt d3489ec5cb 作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
9 years ago
huang f469e51202 课程模块/通知、作业、留言、发帖,删除的时候统计数字递减
9 years ago
huang f022950408 Merge branch 'develop' into hjq_new_course
9 years ago
linchun 3e70db4e82 Merge branch 'develop' into linchun
9 years ago
huang 2fdddc6488 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
9 years ago
huang ec4a3b321c 更新历史版本,下载次数,引用次数不清零
9 years ago
linchun 3c66a29767 完善课程资源列表,完成项目资源列表
9 years ago
cxt 3424be695e 题库:发送的弹框中,不要出现已经删除的课程
9 years ago
guange 3c513085d2 request变量
9 years ago
linchun b7f4b584f2 完成管理员界面课程资源列表
9 years ago
ouyangxuhua 2ea553e988 Merge branch 'ouyangxuhua' into develop
9 years ago
ouyangxuhua 0df34dd3ee 组织资源栏目,过滤条件“其他”内容
9 years ago
ouyangxuhua a0363b5511 组织资源发送后,发送次数动态增加
9 years ago
ouyangxuhua 319f286a65 解决一下问题:1.组织的资源的引用计数不会增加;2.组织资源栏目中,文件的宽度不合适
9 years ago
cxt cff5e9171f 导入作业后页面不应跳转到被导入的作业页面
9 years ago
ouyangxuhua 984cd76b7f Merge branch 'develop' into ouyangxuhua
9 years ago
ouyangxuhua b77b63bbf1 解决私有组织栏目通过url能访问的问题
9 years ago
huang 6ceb4f4549 Merge branch 'develop' into hjq_new_course
9 years ago
huang f381784a3c 数据迁移
9 years ago
huang 814e766577 课程过滤
9 years ago
cxt 782bbc775b 公共资源库的统计
9 years ago
huang de1c2e18c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
huang ae40a4ea61 公共资源相关功能
9 years ago
huang bbbf13084e 修改搜索功能,页面跳转
9 years ago
cxt ffac8164f1 管理员的课程和项目列表,按照时间倒排
9 years ago
linchun bb8a6af13e admin界面添加精品课程页面,目前该页面中的精品课程是固定的
9 years ago
huang dfddb30ca3 附件引用
9 years ago
cxt 6ca702eb2c 题库发送的课程列表中不包含当前作业所在的课程
9 years ago
cxt 8aff404f0c 题库过滤作业的搜索
9 years ago
huang 50011985a9 课程资源库添加资源描述
9 years ago
cxt b333c40ce0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt e2ff348075 题库的作业过滤
9 years ago
cxt 0cd536fcc9 题库增加发布者姓名搜索
9 years ago
huang 97e6299a2b Merge branch 'hjq_new_course' into develop
9 years ago
huang 95346bb419 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
huang 5ab9e3b5b7 资源搜索
9 years ago
huang e9c9112b38 公共资源封装
9 years ago
guange 79004e1328 修改绑定流程
9 years ago
huang 8815e99db5 资源上传跳转问题
9 years ago