Commit Graph

10286 Commits (98f7ad19f6cbd6c63d2f6ba03f385d75cdcae32e)

Author SHA1 Message Date
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
Tim b376c5c6cd 版本库和问题跟踪的function样式冲突
10 years ago
cxt adf9465443 课程英雄榜的积分只显示一位小数
10 years ago
cxt 347efa275d Merge branch 'develop' into cxt_course
10 years ago
ouyangxuhua 035b22d6dd Merge branch 'ouyangxuhua' into develop
10 years ago
ouyangxuhua 2a26fd4e75 修改组织子域名的问题
10 years ago
ouyangxuhua c83562bfd7 组织资源过滤:如图资源数统计应该是不同过滤条件下各资源数的统计
10 years ago
ouyangxuhua 5c9d8954ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua d818e1774b Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
ouyangxuhua f785277d42 解决回复框工具栏乱码、组织子域名等问题
10 years ago
cxt 3540aa1952 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt c6d203d186 低版本的谷歌浏览器无法修改课程密码
10 years ago
Tim 87f5f9c380 上传头像预览图片排版,课程关联组织取消按钮
10 years ago
cxt 070af9ad73 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt e4bf35a1b8 个人留言的回复不能自动刷新
10 years ago
huang 40fb140b6d 版本库提交记录diff信息
10 years ago
ouyangxuhua 39c913f941 解决某些页面二级回复工具栏乱码问题
10 years ago
ouyangxuhua 62193ef7ff 组织页面右上角的退出、登陆、注册链接,使用类似https://www.trustie.net/域名
10 years ago
ouyangxuhua 4247ab4575 Merge branch 'ouyangxuhua' into develop
10 years ago
ouyangxuhua 9c2d8f7ab6 组织二级回复中,工具栏图标乱码问题修复
10 years ago
huang 90208e166f 项目统计数小于0情况判断
10 years ago
huang 44f192e5a6 解决资源总数为负数的问题
10 years ago
ouyangxuhua c91ef44570 组织子域名:所有子域名保存到secdomains表,将组织表中的子域名迁移到secdomains表中,并修改相应的代码
10 years ago
cxt b6bf78a5df 当天发布的资源显示未发布、日期选择器用中文
10 years ago
cxt a2e60944be 已发布资源的延期发布
10 years ago
huang 20b2430da9 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt d7500d1cc5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 98946b9855 课程上传资源弹框的延迟发布功能
10 years ago
ouyangxuhua 3e699ebd99 Merge branch 'ouyangxuhua' into develop
10 years ago
huang 2156b6db76 issue回复 Forge自动更新排序靠前
10 years ago
huang 78c70dce81 版本库用户名长度引起的错位
10 years ago
huang 1234bc0aef 课程导语从帖子中获取
10 years ago
cxt 278139104b 允许老师修改开始学期
10 years ago
ouyangxuhua c1a84e2ce5 组织页面右上角的用户链接改成https://www.trustie.net的形式
10 years ago
cxt ba66425bef 学生打开分组作业列表报500
10 years ago
huang efff99c05b Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 935ddc053a 解决项目500问题
10 years ago
cxt 7305b20ab0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt d84da7908d 学生查看问卷调查结果的提示
10 years ago
ouyangxuhua 9a72f5d0d7 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
ouyangxuhua 5893d7fc15 解决问题:组织资源栏目页面,点击展开更多报500
10 years ago
huang 59d45f2d52 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 6f9d4eccbe 解决合并引起的问题
10 years ago
Tim 954e61433b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
Tim 55b13e7dde 历史版本样式更改
10 years ago
ouyangxuhua 1216f49ac2 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
huang 3fda270a66 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
ouyangxuhua a4ca676ccb Merge branch 'szzh' into ouyangxuhua
10 years ago
huang 75214f0211 新课导语修改:导语的时候显示trustie信息
10 years ago
huang 212b37ef84 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang a7470e059d 历史版本提供附件下载功能
10 years ago
cxt 8138da71aa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt e04e80d64d 跨越多个学期的课程学期的显示
10 years ago
ouyangxuhua 5df44ba44f 1.ke回复框能自动增加高度;2.组织页面右上角链接修改
10 years ago
ouyangxuhua fa08935f68 Merge branch 'develop' into ouyangxuhua
10 years ago
ouyangxuhua 72c0173256 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua 63b644dbb9 解决”组织帖子附件超过20个后,编辑时不能增加附件“的问题
10 years ago
huang 534d93de77 弹框位置调整
10 years ago
cxt 7f32b9fb40 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 1e13279440 学生查看问卷调查结果
10 years ago
cxt 096320d04c 发布问卷时默认选中“允许学生查看调查结果”
10 years ago
huang aa22a253ba “发送至”弹框飘动问题
10 years ago
huang 1c4e3545c7 资源弹框剧中
10 years ago
huang db1bffd7db 资源弹空白框问题
10 years ago
guange a421e8c6fa 组织文章无法编辑问题
10 years ago
guange c7bfe8f20f 组织首页异常
10 years ago
guange 2cf253a26b 复制课程图片出错
10 years ago
guange b2551f904b 组织没有显示的问题
10 years ago
guange 10eeeaa95c 弹出框居中
10 years ago
cxt 8b5896ae1c 弹框的拖动
10 years ago
cxt 89599d8679 编辑组织帖子
10 years ago
cxt 2cc24e2d4b 组织帖子的新建
10 years ago
ouyangxuhua 02f8007557 修改组织配置的样式;修改一个bug
10 years ago
cxt 0a0d67642a 导入作业
10 years ago
cxt cc7d75a046 Merge branch 'szzh' into develop
10 years ago
guange 7f8f3fa152 被rubymine坑了,这两个文件没加进去
10 years ago
cxt e6d4d7d0cb 描述框的自动增高
10 years ago
cxt cb2fdc7388 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 6e93a5af33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua 0b5aa4b81e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 368e4cd14a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
ouyangxuhua d820977d5d Merge branch 'develop' into ouyang
10 years ago
cxt d42f144f23 作业、组织帖子描述框的自动增高
10 years ago
cxt ea8e73ad54 弹框的拖拽
10 years ago
Tim f3bcb3ca47 导入题库弹框位置调整
10 years ago
ouyangxuhua dab99eb044 回复框样式修改
10 years ago
guange f3a0e71cee issue中回复at列表不正常
10 years ago
guange d6e248805f changeset_num nil问题
10 years ago
Tim 105393548b 点击详情页面文本格式调整
10 years ago
Tim 619144224e 文本框格式问题
10 years ago
ouyangxuhua cdd997e45e kindeditor回复框修改
10 years ago
cxt 4d048ec596 课程推荐的课程列表中,为0的不显示
10 years ago
Tim d092891b2a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
Tim 83a3c879d4 私信配置按钮显示
10 years ago
ouyangxuhua 25e32f09e1 Merge branch 'develop' into ouyang
10 years ago
cxt 8b9bcb4719 导入题库的搜索不起作用
10 years ago
guange 71778ba948 拷贝课程图标
10 years ago
guange 724ff31751 Merge remote-tracking branch 'origin/szzh' into szzh
10 years ago
guange eb9232a087 at controller 的json应该登录
10 years ago
guange 63596c2ca5 留言应该为JournalsForMessage
10 years ago
ouyangxuhua 7bdec9c182 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua 50bac16d7c 组织子域名申请信息提示
10 years ago
cxt ee73191a19 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 1b5cdbe628 推荐的私有课程,点击“资源”返回403,点击“作业”也应该返回403
10 years ago
cxt 82fb50ccd2 课程学生列表的作业积分不一致
10 years ago
ouyangxuhua 45bf2ef88a Merge branch 'develop' into dev_hjq
10 years ago
cxt 265359cd74 发布作业时作业类型的切换
10 years ago
ouyangxuhua b7f1177938 1.解决组织动态中删除发送过来的帖子报404的问题;2.组织消息的状态能更新
10 years ago
ouyangxuhua 125f00689b 把组织未读消息加入铃铛消息提醒中
10 years ago
ouyangxuhua 68bd109831 对子域名申请,增加是否批准的提示
10 years ago
cxt 8358140c87 问题跟踪目标版本字体修改
10 years ago
ouyangxuhua dc3278274d 修改kindeditor的工具栏
10 years ago
Tim 55fddbcabe Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
Tim fa70e8a714 代码错误
10 years ago
ouyangxuhua 3aaa078a4b 组织动态添加项目动态
10 years ago
Tim 674a8e0035 单词折行问题
10 years ago
cxt da81fb533e Merge branch 'ouyang' into szzh
10 years ago
cxt b5cf138f43 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt d3ba23bc64 课程的作业列表增加搜索按钮
10 years ago
cxt e9a7f6f826 导出学生作业成绩列表
10 years ago
ouyangxuhua 280f679b0c 1.调整项目中的问题快捷编辑的宽度;2.https://www.trustie.net/manual/feedback链接到帮助中心;3.编辑框显示更多选项
10 years ago
cxt c942c843b9 导入作业增加引用次数
10 years ago
cxt a613b58b46 编程作业弹框的高度设置
10 years ago
ouyangxuhua c857fb734b 快捷回复中,设置回复框的高度和宽度
10 years ago
cxt 8cc87c007f 导入作业添加作业类型
10 years ago
cxt ec41cd4318 导入共享题库中的作业
10 years ago
ouyangxuhua 4b95ee95c0 组织帖子栏目讨论区中的帖子,在登陆情况下就能发送;在组织栏目中,对帖子栏目讨论区增加编辑、删除、发送选项。
10 years ago
ouyangxuhua 38a87a04ba 1.为首页、铃铛增加tips;2.为组织、项目下的资源库的tag,增加“双击可编辑”的tips
10 years ago
ouyangxuhua 135cb410bc 1.解决资源过滤中资源总数与资源统计数不一致的问题;2.对栏目的子目录名进行限制,不能是members setting org_document_comments,因为这会引起路由冲突
10 years ago
guange d2c6d9272c 输出结果匹配\r问题
10 years ago
guange d8ef2f0965 个人留言中的at启用
10 years ago
cxt af7ca36c92 学生加入课程或退出课程
10 years ago
ouyangxuhua 89a919163c 一旦组织私有,就disabled掉允许游客下载选项
10 years ago
Tim 76063b0911 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
cxt 19003f27fc 课程添加is_copy属性
10 years ago
cxt 520811fdc7 留言按回复的更新时间排序
10 years ago
ouyangxuhua fbff28d70e Merge branch 'develop' into dev_hjq
10 years ago
Tim 821ade7985 作业列表优化,课程加入退出
10 years ago
ouyangxuhua f3dcd4ed09 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua 63d1d3a8e7 项目动态中,只要是项目成员就显示编辑issue多属性界面
10 years ago
ouyangxuhua dda64245b3 解决以下问题:1.编辑个人首页后,返回至个人动态;2.个人名片中,正确显示个人信息;3.同意申请子域名后,显示已同意申请。
10 years ago
cxt 945d0a933f 项目资源统计为负数
10 years ago
cxt 184e0ee689 管理员界面增加项目、组织、课程、用户、作业个数的显示
10 years ago
Tim 6a83a9b55c 问题跟踪样式更改
10 years ago
cxt b6e13340e5 个人留言的删除功能
10 years ago
ouyangxuhua 1607508887 增加将帖子发送至课程、项目的功能
10 years ago
Tim a2afec77e3 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
10 years ago
Tim f099611d7a 问题跟踪样式更改
10 years ago
cxt 12f55f039c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 4465e93dae 最近登录报500
10 years ago
huang 154417378e 精品课程默认推荐
10 years ago
huang 49d0d214de 精品课程默认排序
10 years ago
cxt d386b2ff84 留言页面的“展开更多”
10 years ago
cxt 435f81a422 关联项目的更新时间
10 years ago
cxt bbdced9bc1 留言页面的样式修改
10 years ago
cxt 4530e7896a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 8a2a1d2bc9 Merge branch 'szzh' into develop
10 years ago
cxt fc0b589760 Merge branch 'cxt_course' into szzh
10 years ago
huang b3caa01540 修改课程作业链接
10 years ago
huang 655cc0d2db issue截止时间邮件通知
10 years ago
cxt 3de8687440 留言页面的动态内容不生成链接,留言回复的样式更改
10 years ago
huang 29c49fbb0c Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang f2d93c0b72 修改issue编辑权限
10 years ago
ouyangxuhua 4b183c2928 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua afad062b80 设置资源栏目、项目资源、课程资源的title,不显示Files
10 years ago
huang 007afa8c4f issue在动态中回复自动刷新
10 years ago
huang 19bb545993 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt c4a264f8a6 提交作品时的附件显示
10 years ago
huang 16cb4add09 issue局部刷新属性问题
10 years ago
ouyangxuhua 26f8500671 博客回复后,该博客的更新时间为当前时间
10 years ago
cxt 6ae7da99be 帖子、博客、通知、文章详情页面的单词折行
10 years ago
ouyangxuhua 2d07801f52 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua dbed8379d3 新建组织允许游客下载选项功能修复
10 years ago
huang 58b5dbdf9a 版本库最近一次提交时间存入数据库
10 years ago
huang e063470a57 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt a96d8ce5a4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang faf1fcaf22 issue回复局部刷新
10 years ago