Commit Graph

5155 Commits

Author SHA1 Message Date
daiao 599d233176 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao 2016-11-25 10:49:57 +08:00
daiao e6e4a320ee 项目关注列表 2016-11-25 10:47:48 +08:00
huang 2f07aefd36 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-25 10:34:06 +08:00
huang 58790bcb72 版本库删除数据一致性 解决Gitlab本身bug,删除操作会报异常的问题 2016-11-25 10:31:03 +08:00
huang abc6eafdb4 修复删除版本库功能 2016-11-24 16:04:29 +08:00
huang 45bbd7b293 pull request 选择项目的时候JS控制分支 2016-11-24 14:47:02 +08:00
yuanke 7713fba2f8 个人留言列表优化 2016-11-24 14:30:24 +08:00
yuanke d28f597aed Merge branch 'develop' into yuanke_youhua 2016-11-24 10:53:41 +08:00
yuanke 86da6a0fe7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-24 10:53:22 +08:00
daiao f7db47be41 Merge branch 'dai_ao' into develop 2016-11-24 10:45:43 +08:00
daiao 980ae78185 修改pull request发送源项目提示 2016-11-24 10:11:59 +08:00
daiao 5ed9d169f3 Merge branch 'develop' into dai_ao 2016-11-24 10:05:18 +08:00
huang 42dee92c60 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-23 17:18:42 +08:00
daiao 61a3ffcbd0 项目issue统计显示顺序按任务量排序,调整total位置和样式并增加未指派一栏 2016-11-23 17:18:12 +08:00
huang 67a9d04a64 版本库添加删除功能 2016-11-23 17:14:49 +08:00
yuanke 2dc6171b48 微信反馈时的提示语加入www.trustie.net 2016-11-23 16:40:31 +08:00
yuanke 82fa7600da Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-23 09:29:02 +08:00
huang fca68c24dc pull_request合并到源项目的问题 2016-11-22 15:05:33 +08:00
huang 79b1cdcf84 pull request 源项目拉取代码及提交 2016-11-22 11:06:18 +08:00
daiao 428cb8e928 项目issue。里程碑为空,完成为100%的issue筛选不了 2016-11-21 17:21:15 +08:00
yuanke 6cb711d66b Merge branch 'develop' into yuanke_youhua 2016-11-21 10:14:08 +08:00
yuanke 14552abd56 博客人气排序修改,个人主页关注BUG修改 2016-11-21 10:08:27 +08:00
cxt cf6acd48c4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 19:17:47 +08:00
huang a58a3c0655 项目成员新弹框ajax局部刷新 2016-11-18 19:00:44 +08:00
cxt 4da94a5bb0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 17:32:55 +08:00
cxt 9a30369cef 班级作业:两种身份(助教和学生)的成员匿评扣分错误 2016-11-18 16:37:25 +08:00
huang de61d699a8 Merge branch 'dev_newproject' into develop 2016-11-18 16:22:03 +08:00
huang 5f35e8bd97 修复新注册用户不能fork的问题 2016-11-18 16:20:18 +08:00
huang 6584cd88f1 pull request 使用优化 2016-11-18 16:08:50 +08:00
daiao 290a301cee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/common.css
2016-11-18 15:48:40 +08:00
daiao cd32353d91 Merge branch 'dai_ao' into develop 2016-11-18 15:45:35 +08:00
cxt 5510df165d Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-11-18 15:45:06 +08:00
cxt 1fcb1db27c 课程大纲下的班级归档 2016-11-18 15:34:53 +08:00
huang 00d12fdeb3 pull reqeust相关 2016-11-17 17:30:15 +08:00
cxt 3ebc3c6492 老师、学生测验列表的调整 2016-11-17 17:04:00 +08:00
daiao d65a062737 所有我的issue功能 2016-11-17 17:02:02 +08:00
huang 386b41d08e pull requst优化 2016-11-17 11:32:39 +08:00
cxt efd0bf6707 删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整 2016-11-17 10:23:13 +08:00
cxt 1ad0c1cbff 测验列表 2016-11-17 09:06:44 +08:00
daiao e956d20d6e 我的issue部分功能 2016-11-16 16:57:02 +08:00
daiao acffe8ec19 我的issue未完 2016-11-16 11:26:17 +08:00
cxt 2dc717df0c Merge branch 'develop' into cxt_course 2016-11-15 16:57:33 +08:00
cxt 9f79408e32 导入试卷 2016-11-15 16:57:07 +08:00
huang 0adde560ba 我的issue路由修改及查询修改 2016-11-15 14:30:01 +08:00
huang 1e5d3e05ad Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 14:09:40 +08:00
huang 0ea9a49f86 质量分析界面调整 2016-11-15 14:09:25 +08:00
daiao c927a6fecc Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 13:21:37 +08:00
daiao ffe86c7ec9 项目配置删除按钮新版弹框 2016-11-15 13:21:27 +08:00
huang 11f8656651 0 2016-11-15 11:20:30 +08:00
huang 5f21b63c41 我的issue框架搭建 2016-11-15 10:47:07 +08:00