Commit Graph

1061 Commits (df70c33bcd4c86805cb0b52b65f1028d3200dffe)

Author SHA1 Message Date
ouyangxuhua d818e1774b Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
9 years ago
huang 69ae7e3845 解决附件无法更新问题
9 years ago
ouyangxuhua 4247ab4575 Merge branch 'ouyangxuhua' into develop
9 years ago
ouyangxuhua c91ef44570 组织子域名:所有子域名保存到secdomains表,将组织表中的子域名迁移到secdomains表中,并修改相应的代码
9 years ago
cxt 98946b9855 课程上传资源弹框的延迟发布功能
9 years ago
cxt 3369183fb7 课程表的数据迁移
9 years ago
Tim 89eff0f920 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
Tim e223ac77d0 自动生成文件
9 years ago
cxt 096320d04c 发布问卷时默认选中“允许学生查看调查结果”
9 years ago
huang aa22a253ba “发送至”弹框飘动问题
9 years ago
cxt cc7d75a046 Merge branch 'szzh' into develop
9 years ago
guange 7f8f3fa152 被rubymine坑了,这两个文件没加进去
9 years ago
cxt 6e93a5af33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
Tim f3bcb3ca47 导入题库弹框位置调整
9 years ago
guange 28035dfc47 子域名处理
9 years ago
guange bb0ff4a14c elasticsearch在开发环境下的补丁,默认不开启
9 years ago
Tim 55fddbcabe Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
Tim 674a8e0035 单词折行问题
9 years ago
cxt b5cf138f43 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
9 years ago
cxt c942c843b9 导入作业增加引用次数
9 years ago
guange d8ef2f0965 个人留言中的at启用
9 years ago
cxt 19003f27fc 课程添加is_copy属性
9 years ago
cxt 520811fdc7 留言按回复的更新时间排序
9 years ago
cxt 945d0a933f 项目资源统计为负数
9 years ago
huang dfb8a3afbf 数据迁移
9 years ago
cxt bbdced9bc1 留言页面的样式修改
9 years ago
huang 58b5dbdf9a 版本库最近一次提交时间存入数据库
9 years ago
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
9 years ago
huang 2947ff8997 精品课程数据迁移
9 years ago
cxt f7be78efc7 关联项目的更新时间包含项目的提交时间
9 years ago
huang 61e67fa7f4 Merge branch 'develop' into hjq_new_course
9 years ago
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq
9 years ago
ouyangxuhua bd99352ab1 组织增加是否允许游客下载的选项
9 years ago
ouyangxuhua 340d404ecd 组织栏目的通知增加查、改、删功能
9 years ago
huang e1a84de213 Merge branch 'cxt_course' into hjq_new_course
9 years ago
ouyangxuhua a487d814cf 通知分享功能实现
9 years ago
Tim a3c30ee965 issue上传附件样式修改
9 years ago
guange 08e193ea3c 添加微信用户表
9 years ago
huang b93b86b9a0 创建课程发送board
9 years ago
cxt 7f7d0ac6f7 Merge branch 'develop' into cxt_course
9 years ago
huang ef0a2a54c5 精品课程推荐
9 years ago
huang f52b0c1cc6 标记精品课程,精品课程推荐
9 years ago
cxt 020135cbc2 作业动态显示优秀作品、关联项目的样式修改
9 years ago
huang 8b815f95bb Merge branch 'develop' into hjq_new_course
9 years ago
guange 5f6a3cac04 wechat init
9 years ago
guange 62c2085d61 merge
9 years ago
huang ed26242f94 版本库提交次数迁移
9 years ago
guange b68eab23ea merge
9 years ago
guange 587d347178 added wechat
9 years ago
huang 64f972770f 添加board和attachment数据迁移
9 years ago
huang 157502d450 精品课程
9 years ago
huang 20d550e755 提交次数默认值为空的数据处理
9 years ago
huang 09d2796ca7 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
Tim 13e289dfb5 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
9 years ago
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
Tim 4493261797 自动生成文件
9 years ago
huang 440be81587 Merge branch 'develop' into szzh
9 years ago
huang f3402e4fa4 项目得分新计算
9 years ago
ouyangxuhua a1f8db65fc Merge branch 'szzh' into dev_hjq
9 years ago
huang 49d456bf21 修改数据统计信息
9 years ago
huang a68392fd24 issue统计数据更新
9 years ago
huang e808f0bc61 提交新迁移
9 years ago
cxt 90acb7816f 数据迁移
9 years ago
cxt f7a88a63e0 更新项目缺陷动态的更新时间
9 years ago
Tim 3d73a3c243 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt e889f798d7 项目创建动态报500
9 years ago
Tim d495f58408 切换分支文件
9 years ago
Tim 88895ff262 英文文本强制折行修复
9 years ago
huang 05cf2d24dc 新项目积分系统
9 years ago
huang 165d5f50c8 Merge branch 'develop' into hjq_new_course
9 years ago
huang cf7130a398 0
9 years ago
huang a0ceb9b11c 添加缺陷回复统计
9 years ago
ouyangxuhua 7bcf995eaf Merge branch 'develop' into dev_hjq
9 years ago
ouyangxuhua 5d9ce929d9 组织栏目子目录
9 years ago
huang a74e5f9d30 添加项目动态数迁移
9 years ago
huang 8758235364 issue创建和删除的时候,issues_count+1
9 years ago
huang 1239a8b5af 统计数据迁移
9 years ago
ouyangxuhua 25a24f72e5 快捷菜单使用新的样式及链接
9 years ago
huang f3b732460c 添加项目统计字段
9 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
huang 9f73807e05 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
10 years ago
huang c1747ab217 fork重名,提交
10 years ago
huang 8f024bdf4d Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
10 years ago
huang 89b8f7783d 添加forked_form的id
10 years ago
cxt fd51b02e16 添加修订附件
10 years ago
cxt 77e96af78f 还原分组作业
10 years ago
cxt f90ff781ab 学生提交作品页面的合作成员弹窗
10 years ago
cxt fee438cc0b Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
10 years ago
cxt ebeaac5798 作业匿评的结束状态未更新
10 years ago
ouyangxuhua 6f9c89d67b 1.更改首页内容,不显示作者等信息,增加取消首页、编辑首页、删除首页等功能;
10 years ago
huang 364c9a3a9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 39b87aaaac 为student_work表添加索引
10 years ago
lizanle d266237590 kaminari分页添加上一页下一页
10 years ago
lizanle 3c946c034a Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 885215fb8f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle 96290ad975 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 487c6bad09 schema.rb
10 years ago
huang f91918145d 0
10 years ago
huang 634e11d0ec 0
10 years ago
huang b130b52a23 修改迁移
10 years ago
Tim 580cc6b8d8 系统自动生成文件
10 years ago
huang 501a8f905b Merge branch 'develop' into szzh
10 years ago
huang 36b1649fbd Merge branch 'szzh' into gitlab_guange
10 years ago
huang 2ec78d07fa Merge branch 'szzh' into hjq_new_course
10 years ago
ouyangxuhua e0f4050779 1.修改组织中关联项目和课程的内容和样式
10 years ago
huang 042b197767 课程英雄榜界面调整
10 years ago
houxiang c6b5abba4e hide the the count of project'repo
10 years ago
huang 8c83bbfff3 课程英雄榜数据
10 years ago
huang aca7684414 课程英雄榜
10 years ago
cxt cc0ff6bbc0 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
10 years ago
cxt c9f844b9ba Merge branch 'sw_new_course' into develop
10 years ago
lizanle 4efb660214 全站搜索
10 years ago
huang c8b1cae947 建立贡献榜表及相关关联
10 years ago
Tim d1f16a0851 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
Tim ec42cd2d7f 系统自动生成文件
10 years ago
ouyangxuhua ccfbc1e0bd 1.组织翻页增加type参数;
10 years ago
cxt 9b033c3adf 数据日志
10 years ago