Commit Graph

1199 Commits (dev_daiao_temp)

Author SHA1 Message Date
cxt a3a92a19f9 数据迁移
9 years ago
huang 16bba76f61 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
huang 6027b6d0f5 Merge branch 'hjq_beidou' into develop
9 years ago
yuanke f1090d45ad Merge branch 'cxt_course' into yuanke
9 years ago
huang 40b45ce1b4 版本库动态中统计改成从数据库获取
9 years ago
yuanke de0ba0fbe5 Merge branch 'yuanke' into develop
9 years ago
yuanke 6444d859a7 迁移文件修改
9 years ago
yuanke ef4b256313 Merge branch 'yuanke' into develop
9 years ago
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表.
9 years ago
cxt fcddaf403c 删除博客为空的数据
9 years ago
guange aa9cb4e579 merge
9 years ago
txz feb0014bf8 作业详情页面
9 years ago
huang c408185b40 Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new
9 years ago
cxt 6a8a82e85a 删除周海芳老师2882作业的学生匿评
9 years ago
huang c431658333 setting中后台编辑
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 20ea251cab 添加字段
9 years ago
Tim 77e11fe0fe 微信最新动态修改
9 years ago
Yiang Gan 4de598873f 动态和作业的api
9 years ago
huang 80cd5089a4 Merge branch 'develop' into hjq_beidou
9 years ago
ouyangxuhua a69997f6c7 Merge branch 'develop' into ouyangxuhua
9 years ago
cxt 0b0f484a5b 更新吴文植的分数
9 years ago
huang b8463fcca5 北斗
9 years ago
ouyangxuhua f4b4bf40de 增加显示组织显示模式字段,并且在新建组织和配置组织中能够选择
9 years ago
huang dea1c13a64 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
alan 46951f7af9 Merge branch 'develop' into alan_develop
10 years ago
ouyangxuhua b581a13736 Merge branch 'develop' into ouyangxuhua
10 years ago
huang 5fd3e7d3a2 动态表添加索引
10 years ago
alan bd5dd24164 add alias name to farge_activitiy index
10 years ago
huang 9cbe719c5e 项目动态表添加索引
10 years ago
huang a9ef2c28e2 项目创建类型迁移
10 years ago
ouyangxuhua 675b1ad403 1.组织配置中,输入组织名字、子栏目域名目录后,自动变成小写字母;2.将所有子域名及域名目录改成小写;3.组织配置中,修改子栏目时,如果没有点确定,输入框的内容保持不变。
10 years ago
huang 44549e091d message_all表中添加type索引
10 years ago
huang e77a891bc6 消息查询语句优化,添加索引
10 years ago
guange 6ae4cd0767 merge
10 years ago
huang 79767f4bae 用户行为记录
10 years ago
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua
10 years ago
huang 28cb1755d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 4de81605a4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 42d89c7ed0 课程导语发送这改成课堂使者
10 years ago
huang e8e9688644 项目资源数目迁移
10 years ago
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua
10 years ago
ouyangxuhua a7312a6191 修改游客下载组织资源的权限
10 years ago
cxt f174101297 数据迁移
10 years ago
cxt 7d2bb572b2 Merge branch 'yuanke' into develop
10 years ago
linchun 8c145c9d39 Merge branch 'develop' into linchun
10 years ago
huang 8079254089 首页增加访问统计
10 years ago
luoquan 1900a824e8 0
10 years ago
cxt 9fd0951ec3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt 8a4175dc02 点击学生作品列表中的编程作品,代码会跳到上一个作品的详情
10 years ago
cxt 5b4ff5ec8a 学生列表中的作业积分为负分
10 years ago
ouyangxuhua a51ca428be 组织中,增加调整栏目显示顺序的功能
10 years ago
huang 2a1eac02a9 Merge branch 'hjq_new_course' into szzh
10 years ago
huang d3fd445108 数据迁移
10 years ago
cxt d3489ec5cb 作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
10 years ago
huang f469e51202 课程模块/通知、作业、留言、发帖,删除的时候统计数字递减
10 years ago
linchun 3e70db4e82 Merge branch 'develop' into linchun
10 years ago
Tim 1deb611ba2 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
10 years ago
Tim ef05867e6e 自动生成文件
10 years ago
cxt 0090c89dd1 数据迁移
10 years ago
huang 4f2937e1a2 英雄榜
10 years ago
huang 0a18f365ab 新的迁移
10 years ago
huang 094af07a2f 数据迁移
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
linchun bb8a6af13e admin界面添加精品课程页面,目前该页面中的精品课程是固定的
10 years ago
cxt 8aff404f0c 题库过滤作业的搜索
10 years ago
huang 085729f91b 课程活跃度中添加作业留言得分
10 years ago
Tim f51d16c538 资源库样式调整
10 years ago
guange a59f65a455 wechat
10 years ago
guange 15d5fe127e merge
10 years ago
guange a83cb2a1fa merge
10 years ago
cxt 601c5906d4 Merge branch 'develop' into szzh
10 years ago
Tim e8234092ec 复制学期弹框调整
10 years ago
cxt c93b4d109a 作业动态添加子菜单:公开作品/取消公开
10 years ago
guange 296d6efbf1 单文件作业不压缩
10 years ago
cxt 2aa0fefa1c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 72c3fa1166 某个学生分数异常
10 years ago
ouyangxuhua 11231d0ff9 1.解决组织配置报500的错误;2.增加转发表
10 years ago
ouyangxuhua 3eb7c62b85 组织子域名迁移
10 years ago
ouyangxuhua 16efcafe77 注释迁移
10 years ago
ouyangxuhua 035b22d6dd Merge branch 'ouyangxuhua' into develop
10 years ago
ouyangxuhua 2a26fd4e75 修改组织子域名的问题
10 years ago
ouyangxuhua d818e1774b Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
huang 69ae7e3845 解决附件无法更新问题
10 years ago
ouyangxuhua 4247ab4575 Merge branch 'ouyangxuhua' into develop
10 years ago
ouyangxuhua c91ef44570 组织子域名:所有子域名保存到secdomains表,将组织表中的子域名迁移到secdomains表中,并修改相应的代码
10 years ago
cxt 98946b9855 课程上传资源弹框的延迟发布功能
10 years ago
cxt 3369183fb7 课程表的数据迁移
10 years ago
Tim 89eff0f920 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
Tim e223ac77d0 自动生成文件
10 years ago
cxt 096320d04c 发布问卷时默认选中“允许学生查看调查结果”
10 years ago
huang aa22a253ba “发送至”弹框飘动问题
10 years ago
cxt cc7d75a046 Merge branch 'szzh' into develop
10 years ago
guange 7f8f3fa152 被rubymine坑了,这两个文件没加进去
10 years ago
cxt 6e93a5af33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
Tim f3bcb3ca47 导入题库弹框位置调整
10 years ago
guange 28035dfc47 子域名处理
10 years ago
guange bb0ff4a14c elasticsearch在开发环境下的补丁,默认不开启
10 years ago
Tim 55fddbcabe Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
Tim 674a8e0035 单词折行问题
10 years ago
cxt b5cf138f43 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt c942c843b9 导入作业增加引用次数
10 years ago
guange d8ef2f0965 个人留言中的at启用
10 years ago
cxt 19003f27fc 课程添加is_copy属性
10 years ago
cxt 520811fdc7 留言按回复的更新时间排序
10 years ago
cxt 945d0a933f 项目资源统计为负数
10 years ago
huang dfb8a3afbf 数据迁移
10 years ago
cxt bbdced9bc1 留言页面的样式修改
10 years ago
huang 58b5dbdf9a 版本库最近一次提交时间存入数据库
10 years ago
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
huang 2947ff8997 精品课程数据迁移
10 years ago
cxt f7be78efc7 关联项目的更新时间包含项目的提交时间
10 years ago
huang 61e67fa7f4 Merge branch 'develop' into hjq_new_course
10 years ago
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq
10 years ago
ouyangxuhua bd99352ab1 组织增加是否允许游客下载的选项
10 years ago
ouyangxuhua 340d404ecd 组织栏目的通知增加查、改、删功能
10 years ago
huang e1a84de213 Merge branch 'cxt_course' into hjq_new_course
10 years ago
ouyangxuhua a487d814cf 通知分享功能实现
10 years ago
Tim a3c30ee965 issue上传附件样式修改
10 years ago
guange 08e193ea3c 添加微信用户表
10 years ago
huang b93b86b9a0 创建课程发送board
10 years ago
cxt 7f7d0ac6f7 Merge branch 'develop' into cxt_course
10 years ago
huang ef0a2a54c5 精品课程推荐
10 years ago
huang f52b0c1cc6 标记精品课程,精品课程推荐
10 years ago
cxt 020135cbc2 作业动态显示优秀作品、关联项目的样式修改
10 years ago
huang 8b815f95bb Merge branch 'develop' into hjq_new_course
10 years ago
guange 5f6a3cac04 wechat init
10 years ago
guange 62c2085d61 merge
10 years ago
huang ed26242f94 版本库提交次数迁移
10 years ago
guange b68eab23ea merge
10 years ago
guange 587d347178 added wechat
10 years ago
huang 64f972770f 添加board和attachment数据迁移
10 years ago
huang 157502d450 精品课程
10 years ago
huang 20d550e755 提交次数默认值为空的数据处理
10 years ago
huang 09d2796ca7 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
Tim 13e289dfb5 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
Tim 4493261797 自动生成文件
10 years ago
huang 440be81587 Merge branch 'develop' into szzh
10 years ago
huang f3402e4fa4 项目得分新计算
10 years ago
ouyangxuhua a1f8db65fc Merge branch 'szzh' into dev_hjq
10 years ago
huang 49d456bf21 修改数据统计信息
10 years ago
huang a68392fd24 issue统计数据更新
10 years ago
huang e808f0bc61 提交新迁移
10 years ago
cxt 90acb7816f 数据迁移
10 years ago
cxt f7a88a63e0 更新项目缺陷动态的更新时间
10 years ago
Tim 3d73a3c243 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt e889f798d7 项目创建动态报500
10 years ago
Tim d495f58408 切换分支文件
10 years ago
Tim 88895ff262 英文文本强制折行修复
10 years ago
huang 05cf2d24dc 新项目积分系统
10 years ago
huang 165d5f50c8 Merge branch 'develop' into hjq_new_course
10 years ago
huang cf7130a398 0
10 years ago
huang a0ceb9b11c 添加缺陷回复统计
10 years ago
ouyangxuhua 7bcf995eaf Merge branch 'develop' into dev_hjq
10 years ago
ouyangxuhua 5d9ce929d9 组织栏目子目录
10 years ago
huang a74e5f9d30 添加项目动态数迁移
10 years ago
huang 8758235364 issue创建和删除的时候,issues_count+1
10 years ago
huang 1239a8b5af 统计数据迁移
10 years ago
ouyangxuhua 25a24f72e5 快捷菜单使用新的样式及链接
10 years ago
huang f3b732460c 添加项目统计字段
10 years ago
cxt 7c376ed60b 数据迁移
10 years ago
huang 580e4d7327 迁移问题
10 years ago
huang 5b9be0bb11 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
ouyangxuhua d574521b48 样式更新
10 years ago
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能
10 years ago
huang fd2197a73d 项目资源库历史数据迁移
10 years ago
ouyangxuhua e90a237a8a 2.1博客增加“设为主页”的功能
10 years ago
ouyangxuhua eacf89100d Merge branch 'szzh' into dev_hjq
10 years ago
ouyangxuhua 7d4e3cdd5c 1.增加项目/课程快捷功能;
10 years ago
huang 0a1aa9e569 Merge branch 'develop' into hjq_new_course
10 years ago
ouyangxuhua d8c6775f42 1.解决“组织动态中的作业动态,评分设置弹框不能关闭 ”的问题;
10 years ago
huang be218baa52 添加迁移:项目讨论区数据重复问题
10 years ago
huang 470f45becd 课程讨论区(未完)
10 years ago
huang 11444f43f0 解决issue多附件,删除一个附件后,提交弹出白色框框的问题
10 years ago
lizanle d26b51c982 Merge branch 'szzh' into dev_zanle
10 years ago
cxt 9b974b6170 Merge branch 'cxt_course' into szzh
10 years ago
ouyangxuhua 806e4caf5a 1.增加隐藏组织栏目功能;2.未登录情况,隐藏部分内容。
10 years ago
lizanle b059ab2428 schema.rb
10 years ago
cxt ec631691e3 新建课程和课程配置页面增加结束学期
10 years ago
lizanle be146a9421 Merge branch 'szzh' into dev_zanle
10 years ago
ouyangxuhua e9cedf0eb9 删除冗余的迁移文件
10 years ago
ouyangxuhua d1ebc35e43 Merge branch 'develop' into dev_hjq
10 years ago
ouyangxuhua d1c7aad742 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua 40bf109223 给资源栏目增加board
10 years ago
lizanle 90c63192e6 历史资源模型修改
10 years ago
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能
10 years ago
ouyangxuhua 77e0f0cd08 转发帖子新建帖子,并更新相关表
10 years ago
huang 41cd038758 讨论区帖子添加锁定
10 years ago
ouyangxuhua 0d98dba25c 解决项目新建帖子中,点击取消按钮没有反应的问题
10 years ago
ouyangxuhua 2076c9b449 Merge branch 'develop' into dev_hjq
10 years ago
cxt e86778a9c7 删除不存在的留言动态
10 years ago
Tim b0b4527ea1 Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
10 years ago
ouyangxuhua 73d377d06d 组织资源栏目显示转发的帖子
10 years ago
ouyangxuhua b9ae579622 将课程帖子转发至组织帖子栏目
10 years ago
ouyangxuhua 2220e0b7cc 增加帖子-组织栏目关联表
10 years ago
houxiang 3e57237969 修改了整个提交记录总数,运用了黄总的修改的gitlab API by 侯翔
10 years ago
houxiang e8511a6210 modify the gemfile conflict by hx
10 years ago
huang dae6e68623 renwu
10 years ago
huang 747493993b 上线测试
10 years ago
cxt 4d82beb4c7 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
lizanle 793a98ade1 forge_activities那个运行批量删除回复动态脚本改动
10 years ago
cxt c6e7c8860d dd
10 years ago
lizanle 70f93741d6 issue图标问题
10 years ago
lizanle bba40de36d journal不应该算入ForgeActivity,历史数据应该删除
10 years ago
lizanle 5d47afdc43 issue 删除回复的权限问题
10 years ago
guange d703f75c98 merge
10 years ago
guange eb97f7dfb2 merge
10 years ago
huang b87943ff1d Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle
10 years ago
guange fc63dfcb7b 消息通知
10 years ago
huang 721a007779 删除 由于course、project一张表而引起的历史数据异常问题
10 years ago
lizanle 71f6a637e0 帖子按时间倒排
10 years ago
guange c0de5d55de 加入了issue的at消息提醒
10 years ago
cxt 5cf88a287b 分组作业提示语的修改
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
cxt 481b7b96eb 正式版报500
10 years ago
cxt 699d0e22dd 删除多余学生的测验数据
10 years ago
ouyangxuhua 0602a03e12 组织资源类型的栏目,增加搜索功能
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
huang fed989753a 修复林处账号不能查看消息的问题
10 years ago
huang 9710731a2c 课程配置添加登录名
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
ouyangxuhua 1e652faec7 Merge branch 'develop' into dev_hjq
10 years ago
lizanle 433059e1bc schema
10 years ago
ouyangxuhua 2f7260cba2 1.在栏目表中增加field_type(类型)字段;
10 years ago
ouyangxuhua 09f0d0201e 组织增加栏目发帖功能
10 years ago
cxt a9f6e817b4 分组作业关联项目
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
huang 42f5b86d95 添加字段删除课程
10 years ago
huang 068c305c06 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
10 years ago
cxt b61a0a98e5 Merge branch 'develop' into cxt_course
10 years ago
huang bd3d0547f5 组织样式修改
10 years ago
huang 9d7bc17115 Merge branch 'develop' into dev_hjq
10 years ago
ouyangxuhua ab4d0e4678 组织界面增加分栏
10 years ago
lizanle 4c00312f45 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 0a5a33c2de schema
10 years ago
huang 4d0956dff1 Merge branch 'develop' into gitlab_guange
10 years ago