Commit Graph

9684 Commits (c5a10c504e31fe9712aa434eb54f6fb0a3bbd5ff)

Author SHA1 Message Date
huang c29ab5dc6d Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
huang 1a549eda46 版本库显示问题
10 years ago
huang c381ce177f 解决通知太长不能发的问题
10 years ago
huang ab1397d982 恢复版本
10 years ago
huang 73f0d70e23 Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
huang 3de4c7129a 版本库读取错误问题
10 years ago
lizanle 31cbf3fbce onchange函数去掉
10 years ago
lizanle 60381fded5 表单长度对齐
10 years ago
lizanle 4630576146 issue的创建成功不需要提示sucess
10 years ago
lizanle 480775f2b9 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 538c64329f issue的修改
10 years ago
cxt 84f6ec0978 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt 65022f03cb 作业动态中的评分设置和匿评自动开启、关闭时间的自动刷新
10 years ago
huang 4092401e68 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
huang d2ba950044 绝对成
10 years ago
huang 5941d41b19 测试
10 years ago
cxt c073e56b79 学生匿评必须添加评语
10 years ago
huang 747493993b 上线测试
10 years ago
cxt e7db03f271 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt 459e1f332b 编辑分组作品时如果不修改分组成员则不能提交
10 years ago
guange e9a45012f8 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
guange 08cd3808ad ke引用错误
10 years ago
huang e673540323 还原提交次数
10 years ago
cxt 6a563d4256 匿评结束后不可修改作业的截止日期,作业发布后不可修改作业的发布日期
10 years ago
huang 4dda355d2e 测试版
10 years ago
lizanle a657a5b98d 课程留言 重复提交问题
10 years ago
cxt 902570173d Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
lizanle a1d0bf43ee Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 009dc089f0 资源库重命名修改
10 years ago
ouyangxuhua 714dfdc2d5 解决组织资源栏目点击上传资源没反应的问题
10 years ago
cxt 8769d6af4f Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt 108448cf4d 课程讨论区的加载更多
10 years ago
guange e02b865fa6 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
huang ea51b24a4e Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
guange 57b1c0c7d8 at是否开启加入到配置
10 years ago
guange f4d861c727 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
guange d0e139650f issue回复的at出错
10 years ago
cxt 63f9601c15 Merge branch 'cxt_course' into szzh
10 years ago
guange c38191eb42 问题回复at
10 years ago
cxt 7ce8e330c3 课程留言动态的显示
10 years ago
huang a080306f75 解决课程动态中,点击按钮,提交多次的问题
10 years ago
lizanle 0ed7d84914 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 084844941f 个人单位修改。
10 years ago
cxt 2eaa05306f Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt ba4c93e4c4 Merge branch 'cxt_course' into szzh
10 years ago
cxt a7c006c59f 课程讨论区的展开更多不可用
10 years ago
huang 8a53978d23 项目得分更新
10 years ago
lizanle eb02a3d34a Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 70f93741d6 issue图标问题
10 years ago
ouyangxuhua b3b5bc7ffd Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
ouyangxuhua 85bc9ce43d 解决组织模块的一些bug
10 years ago
cxt c230ff5bed 普通作业提交报500
10 years ago
cxt ca77af9221 作业动态添加扣分规则
10 years ago
cxt b65e84d166 未答测验的学生在测验截止时间到了后算作零分
10 years ago
lizanle e867358bc1 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 06734d86ca attachment_acts页面变量错误
10 years ago
guange 8c967e6559 格式改进
10 years ago
guange e8cf5d1042 at消息html代码问题
10 years ago
guange 39ad191dd0 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
guange b4016faeb6 编辑框消失
10 years ago
lizanle 47b20d3639 journal不应该算入ForgeActivity
10 years ago
cxt 2faddd7d75 分组设置中的基于项目实施默认勾选
10 years ago
lizanle f3f64b8655 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 5d47afdc43 issue 删除回复的权限问题
10 years ago
huang b34b1181b7 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
huang 4ca177970b fork点击提示
10 years ago
lizanle 38c3422b83 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 0659015ada issue 多了一个提交按钮和时间显示
10 years ago
guange d703f75c98 merge
10 years ago
guange eb97f7dfb2 merge
10 years ago
huang 5259831224 Merge branch 'szzh' into hjq_new_course
10 years ago
huang b87943ff1d Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
guange b69f5f0da3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
guange c98e9fc639 查看作业代码着色
10 years ago
houxiang fc2eae4c62 add something by hx
10 years ago
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt 3b25616f0c 编辑作品时可编辑分组成员
10 years ago
cxt c7f321475a 多选题错判
10 years ago
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 8ce2dbc4b8 issue回复
10 years ago
guange 716604903b 修复讨论区at错误
10 years ago
ouyangxuhua ef46191c80 Merge branch 'szzh' into dev_hjq
10 years ago
lizanle 1dbccd81d6 issue回复的删除功能
10 years ago
guange 923cb3c84f 中文报错
10 years ago
lizanle 1809a93770 editor修改
10 years ago
cxt a2ebaa0729 分组作业提交作品时如果关联了项目则从项目成员中添加分组成员
10 years ago
lizanle 505d1b5546 editor修改
10 years ago
lizanle 4bc68081ee editor修改
10 years ago
guange fc63dfcb7b 消息通知
10 years ago
ouyangxuhua de229c0f1c 组织资源栏目的文件可以被引用至当前组织下的资源栏目
10 years ago
huang 2d2329a1e0 代码定位问题
10 years ago
lizanle b02cb6fdd4 issue的修改如果更改issue的类型,那么就会有问题。需要重新新建editor
10 years ago
lizanle 31c57b78bf issue的修改如果更改issue的类型,那么就会有问题。需要重新新建editor
10 years ago
cxt 89d3d3821c 分组作业的导入
10 years ago
lizanle c183574a5e 博客回复
10 years ago
cxt 51e082a551 编辑和新建作品时的样式和提示信息调整
10 years ago
cxt fa0f9c6751 分组作业的编辑,若分组作业已提交了作品则不可再编辑分组设置
10 years ago
ouyangxuhua acb604883d 项目/课程配置关联组织,左边的组织列表由每页10个组织增至15个组织。
10 years ago
cxt ff579afd45 作业动态中添加分组人数
10 years ago
lizanle 0a3c5f6acc issues如果标题为空需要弹框报错
10 years ago
cxt a8c8dc3cc6 关联项目的提示信息修改
10 years ago
lizanle 71f6a637e0 帖子按时间倒排
10 years ago
lizanle ffd8d55aa6 memo更新时间
10 years ago
huang bb23049f55 版本库提交次数封装
10 years ago
lizanle 66f88cdf5a issue 文件
10 years ago
lizanle a0035a4c1e issue 查询
10 years ago
guange c0de5d55de 加入了issue的at消息提醒
10 years ago
cxt ab96bf8e5e 作品列表中未参与匿评的作品显示“未参与”
10 years ago
lizanle b13ae8f599 issue
10 years ago
cxt dc0f004021 关联项目的提示信息
10 years ago
ouyangxuhua 0fef18312d 鼠标经过资源栏目TAG时,变成手型
10 years ago
lizanle 2aa241bffa issue
10 years ago
cxt 5cf88a287b 分组作业提示语的修改
10 years ago
ouyangxuhua 977100e92e 双击资源栏目标签可编辑,编辑标签后更新标签
10 years ago
huang 85d277da0d Merge branch 'develop' into hjq_new_course
10 years ago
huang 98d0e6d411 版本库“提交明细”
10 years ago
lizanle 02a9f08fe6 表单长度对齐
10 years ago
huang ac8aa9e0a6 解决作业留言和课程留言导致的bug
10 years ago
huang 41bb37d6d4 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 06e5784436 解决英雄榜两个用户同时存在的but
10 years ago
lizanle 47a9be132a 详情和编辑页面
10 years ago
ouyangxuhua 8d7a84285b 资源栏目在搜索结果中,更新相应的tag数量
10 years ago
ouyangxuhua 704954583b 资源栏目新增Tag后,更新相应的tag数量
10 years ago
lizanle 8d1003770a 在本页面重复修改的时候,由于edit页面没有更新,导致issue更新触发乐观锁。lock_version比数据库记录存在的lock_version更低,所以回滚。
10 years ago
cxt 097d0653ba 注释掉给未答题的学生0分的代码
10 years ago
cxt 481b7b96eb 正式版报500
10 years ago
lizanle 68aceaa7df issue下载
10 years ago
cxt fa4a2eb0dd 未答题的学生测验分数为0
10 years ago
lizanle b7ae8d866f Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
10 years ago
lizanle ef2f142f62 论坛资源允许下载
10 years ago
cxt f7a932d7b9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua dc45321454 组织文章二级回复代码被覆盖,恢复代码
10 years ago
cxt 44ce4fe592 多次点击留言不会重复提交
10 years ago
cxt 45726576cf 学生测验列表的点击
10 years ago
ouyangxuhua af157a9c63 组织资源栏目增加标签功能
10 years ago
cxt 086cfa3867 学生列表不可点击
10 years ago
guange 4ce9eb428e at样式问题
10 years ago
cxt 90c7822c38 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 72c475e8a2 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt d6c2b95858 学生测验列表的提示信息
10 years ago
cxt 0215e5e38c 若测验已截止且学生已提交则在测验列表后面显示“已答”
10 years ago
cxt 0deffdba33 在线测验学生答题时可点击保存也可点击提交
10 years ago
Tim b687c42de3 Merge branch 'dev_zanle' of https://git.trustie.net/jacknudt/trustieforge into dev_zanle
10 years ago
Tim b761121f9f "指派给"颜色更换
10 years ago
guange da5709e3f0 .
10 years ago
cxt 0b25f36a7f 在线测验再次编辑时默认隐藏头部编辑块
10 years ago
ouyangxuhua d9df926c2b 组织添加项目/组织弹窗,点击取消后,关闭弹窗。
10 years ago
cxt 1f4454d908 课程左侧的在线测验统计数
10 years ago
ouyangxuhua 3efb36a28e 在组织非资源栏目页面中,添加资源后跳转至资源栏目页面。
10 years ago
guange 8d797c5c0b 项目动态添加at
10 years ago
huang ea1849e51f 去掉邮件token值
10 years ago
lizanle 88c2db47b7 Merge branch 'szzh' into dev_zanle
10 years ago
guange 4f57e48b92 merge
10 years ago
guange d1315e35b5 merge
10 years ago
guange f61f639af2 转换为remote js
10 years ago
cxt 2b5bf9540d 关闭了匿评再补交作品,给学生的提示信息中“当前作业已开启匿评...”改为“当前作业已关闭匿评...”
10 years ago
cxt 438ae82980 非课程学生不能关联项目
10 years ago
ouyangxuhua a5fa68c928 资源栏目增加资源
10 years ago
cxt 85b11010d2 在线测验报500、 学生看不到已截止的测验、测验列表的样式调整
10 years ago
lizanle f3013ca3e7 修改了搜索的提示描述
10 years ago
lizanle c5f903146d 博客资源下载问题
10 years ago
lizanle 9aebafee09 课程添加更新时间
10 years ago
lizanle 14912078ee 博客资源允许下载
10 years ago
ouyangxuhua b72cc82e4d 组织资源栏目添加文件标签功能
10 years ago
lizanle 85e2eab8c3 发送资源
10 years ago
huang 5ca8d4cd66 修改http链接自动换域名
10 years ago
lizanle c004b05991 资源库搜索 sql注入
10 years ago
lizanle f6867068f5 项目 帖子 更新时间
10 years ago
ouyangxuhua 0602a03e12 组织资源类型的栏目,增加搜索功能
10 years ago
lizanle 9b86ec3044 更新时间
10 years ago
cxt eb8e9f32a3 作品列表的私有项目不可点击
10 years ago
guange 91b245ad2c lastname为空时也可以加,可以省掉查询extensions的语句
10 years ago
lizanle 7c114e1a13 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle f028992a18 帖子搜索
10 years ago
cxt 7a0828a826 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt 502310425b 匿评成绩为空
10 years ago
huang a791c39b4b Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt dfd0c95f2a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
huang 616679e9c1 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt 42f0fc62e9 分组成员不能修改作品
10 years ago
cxt 1d2b6165ef 分组作业报500
10 years ago
huang 6b9a612594 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 0ac4821f14 修改密码导航栏错误
10 years ago
lizanle df1d1a4685 论坛上传资源没有保存成功
10 years ago
cxt 1674391e4b 若删除追加的附件,则“追加附件”字样及“追加时间”也应删除
10 years ago
ouyangxuhua c2d21b5a6b 隐藏组织栏目资源列表
10 years ago
cxt e5192c7b1a 记录学生作品的提交和编辑记录
10 years ago
ouyangxuhua de0b5d1897 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua be590497b9 组织文章设为首页后,跳转至首页
10 years ago
cxt 6c9a139450 编辑分组作业的作品报500
10 years ago
cxt ac77f0d40a 点击学号、班级也要弹出答题详情页面
10 years ago
ouyangxuhua e98338bf22 栏目增加资源类型,可以添加文件、删除文件、显示文件等
10 years ago
cxt d4bde8e73c 调整学生作品列表的样式
10 years ago
lizanle b178fb7f0a 消息提醒 病句
10 years ago
huang b981f3dcea 修复项目删除403问题
10 years ago
lizanle abc0598ed2 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
lizanle 03318aac97 登录名不可修改要变成灰色
10 years ago
cxt c6470bc69b 提交作品选择分组成员时若某一个学生已加入到其他分组则不可选择
10 years ago
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 27ed6df9d6 Merge branch 'szzh' into develop
10 years ago
cxt a3715051b1 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt f880ccd749 分组作业
10 years ago
lizanle ec79ed04ee Merge branch 'szzh' into dev_zanle
10 years ago
lizanle b6607f7418 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
huang f2b8335912 移出成员时,删除项目后没有关联删除而引起的400问题
10 years ago
huang fed989753a 修复林处账号不能查看消息的问题
10 years ago
huang 75fecc0402 项目删除功能
10 years ago
huang 9c472b9358 课程成员列表乱的问题
10 years ago
huang 35c918cb40 Merge branch 'hjq_new_course' into develop
10 years ago
huang fbd1b2f541 用户留言重复提交问题
10 years ago
huang 01b21ceda1 项目留言重复提交问题
10 years ago
huang 1ba0dae3c4 修复课程留言重复提交问题
10 years ago
cxt ba5d72b315 管理员查看在线测验的权限
10 years ago
huang 670df76c70 注释掉项目邀请加入功能
10 years ago
huang 9710731a2c 课程配置添加登录名
10 years ago
huang c7b2c9e3af 课程删除功能
10 years ago
huang a9510f4869 Merge branch 'dev_hjq' into develop
10 years ago
huang 4f7f4acb1f 课程删除
10 years ago
ouyangxuhua aab9594ac9 1.解决英文版下,组织成员列表编辑成员显示错误;
10 years ago
houxiang 87be2dd7fe modify the repositories_controller.rb conflict
10 years ago
huang fbba933a46 Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
10 years ago
huang be940ee3aa Merge branch 'develop' into hjq_new_course
10 years ago
houxiang e9cfe007bb modify by hx
10 years ago
huang dbadbf8621 修改密码gitlab同步
10 years ago
ouyangxuhua 0a85fbf613 1.配置栏目列表,增加类型一列;
10 years ago
huang 74fe2607f3 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua 1e652faec7 Merge branch 'develop' into dev_hjq
10 years ago
huang 4e0b442309 修改邮箱的时候同步到gitlab
10 years ago
lizanle 7f866a0b3a 课程被删除后不能被搜索
10 years ago
ouyangxuhua 2f7260cba2 1.在栏目表中增加field_type(类型)字段;
10 years ago
huang db582fd639 修改不同分支之间的显示最新提交状态
10 years ago
huang f2c1595d0d 1、同步没成功检测程序
10 years ago
cxt 4e04df7a8a 分组作业的动态显示及关联项目
10 years ago
ouyangxuhua 78fb8b6254 1.编辑或者删除栏目的帖子返回对应页面
10 years ago
lizanle 2fbad38522 优化排序参数
10 years ago
cxt f2f81d5243 作品列表的代码缩进
10 years ago
ouyangxuhua 333c0e41a0 1.栏目增加新建帖子功能;
10 years ago
cxt 53f9141cf1 分组作业动态
10 years ago
lizanle 6c02115f3f 不允许修改登录名
10 years ago
guange 3476731b83 将at js data整合到文件中
10 years ago
lizanle c1d82d6348 输入框 和 ke对齐
10 years ago
ouyangxuhua 09f0d0201e 组织增加栏目发帖功能
10 years ago
cxt a9f6e817b4 分组作业关联项目
10 years ago
cxt c26778b41c 分组作业关联项目
10 years ago
huang ac9f13c842 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
10 years ago
huang 916d99be82 课程删除功能
10 years ago
houxiang 56cb83ffba 版本库首页没有统计commit_count,具体的详情页在开始统计
10 years ago
lizanle 92bc3361fe 匿评失败消息改变
10 years ago
ouyangxuhua 1881e18742 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
10 years ago
ouyangxuhua bb7bcf46a9 1.设置首页后,跳转至组织首页
10 years ago