Commit Graph

17931 Commits

Author SHA1 Message Date
huang 818e63386c 部分项目404问题 2016-12-09 21:58:47 +08:00
huang 90c8ee2d69 issue新建的时候commit关联权限 2016-12-09 21:00:55 +08:00
huang b85cad8c7f issue详情删除权限 2016-12-09 20:40:30 +08:00
huang 85ef1108c9 翻页及commit详情 2016-12-09 20:26:32 +08:00
huang 9d0a941926 issue commit的一些改进 2016-12-09 20:06:10 +08:00
huang 5970fc608b 项目简介字体调整 2016-12-09 17:37:39 +08:00
huang 50a4db24ec 组织二级域名对一些关键做限制 2016-12-09 17:26:36 +08:00
huang d98b1e17cc Gitlab提供搜索接口,commit 关联提供搜索功能及局部刷新 2016-12-08 16:36:11 +08:00
huang 0785c71308 issue和commit关联的一些修改和调整 2016-12-08 11:26:37 +08:00
huang a1a96e4667 issue编辑优化,性能简单优化 2016-12-08 09:55:41 +08:00
huang 122946804d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-12-08 09:36:36 +08:00
huang c84d17bd6a 用户邮箱没注册时候显示用户邮箱方法封装 2016-12-08 09:36:01 +08:00
huang 8ba747e195 版本库diff页面(Issue和commit关联) 2016-12-08 09:16:14 +08:00
huang 64b8c0c3f3 issue edit方法优化 2016-12-07 15:47:57 +08:00
huang 12b73f54d3 commit issue关联提供删除功能,局部刷新 2016-12-07 15:39:48 +08:00
huang c256462170 issue与commit关联的更新操作 2016-12-07 14:03:07 +08:00
huang 378427d070 issue 关联commit 流程及数据创建 2016-12-07 10:53:36 +08:00
huang 33a4186e69 完成issue和commit关联创建。去重,及相关局部刷新 2016-12-06 17:37:07 +08:00
cxt 494946c70e 匿评结束后提交的作品也应计算缺评扣分 2016-12-06 16:13:04 +08:00
cxt 5a6e64beb2 Revert "测验头部和新建题目的改版"
This reverts commit c33bf1b163.

Conflicts:
	public/stylesheets/css/courses.css
2016-12-06 15:02:32 +08:00
陈晓婷 c031e23a1f Merge branch 'sx_cxt' into 'develop'
更改作业的截止日期时也应重新判断作品是否迟交



See merge request !48
2016-12-06 14:51:45 +08:00
cxt 098d42cbd1 更改作业的截止日期时也应重新判断作品是否迟交、作业id为4198的作品数据迁移 2016-12-06 14:47:17 +08:00
cxt 5bbe9e71ba Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into sx_cxt
Conflicts:
	db/schema.rb
2016-12-06 14:12:40 +08:00
huang 66066e6899 commit导出方法及显示页面 2016-12-05 14:52:46 +08:00
huang 6ebaa1c90a Merge branch 'develop' into dev_newproject 2016-12-05 11:12:52 +08:00
huang 5bc4c779ea issue和commit_id关联 2016-12-05 11:07:41 +08:00
huang efee984c4f 作品列表500问题 2016-12-03 11:49:36 +08:00
huang d87620a758 作品列表总不显示,动态得分显示 2016-12-03 11:41:09 +08:00
huang 9b8e072753 作品列表--改成** 2016-12-03 11:25:41 +08:00
huang 69ab80bf9e 对于设置了仅对自己显示的作业课程英雄榜显示方式 2016-12-03 11:20:50 +08:00
huang 20e07bb1ba 学生列表得分显示 2016-12-03 10:56:35 +08:00
陈晓婷 9d00979647 Merge branch 'cxt_course' into 'develop'
帮助中心的弹框



See merge request !47
2016-12-02 20:23:11 +08:00
cxt 93a4f0bc76 帮助中心的弹框 2016-12-02 20:17:50 +08:00
黄井泉 73dcd5256f Merge branch 'develop' into 'develop'
pull request总数获取方式修改,列表页面添加相应的分页



See merge request !46
2016-12-02 20:09:18 +08:00
huang 7baa5be7ee pull request总数获取方式修改,列表页面添加相应的分页 2016-12-02 20:00:15 +08:00
黄井泉 4a8af6d40f Merge branch 'dai_ao' into 'develop'
申请加入班级,将小铃铛消息的课程改为班级

申请加入班级,将小铃铛消息的课程改为班级

See merge request !43
2016-12-02 19:23:49 +08:00
黄井泉 3b194c71b3 Merge branch 'develop' into 'develop'
pull request commit 页面提供分页



See merge request !45
2016-12-02 19:22:47 +08:00
陈晓婷 c89f15b97f Merge branch 'cxt_course' into 'develop'
非匿评阶段应看到评语回复的用户名



See merge request !44
2016-12-02 19:18:41 +08:00
daiao 585d1ebb0d 申请加入班级,将课程改为班级 2016-12-02 19:14:09 +08:00
cxt cad06701be 非匿评阶段应看到评语回复的用户名 2016-12-02 19:07:06 +08:00
daiao 6fc4c5d138 Merge branch 'develop' into dai_ao 2016-12-02 18:50:19 +08:00
huang e4e57380cf pull request提交添加分页 2016-12-02 17:52:02 +08:00
陈晓婷 54a7965a3e Merge branch 'cxt_course' into 'develop'
作业的bug修复



See merge request !42
2016-12-02 17:48:45 +08:00
cxt 28444e0af7 “未评分”改为“无评分”, 评分设置的缺评扣分 2016-12-02 17:46:31 +08:00
陈晓婷 dd0c202f8c Merge branch 'cxt_course' into 'develop'
匿评时其他人的评语不可见



See merge request !41
2016-12-02 17:09:34 +08:00
cxt 56b6d43862 匿评时其他人的评分不可见 2016-12-02 17:08:09 +08:00
daiao ffce6f074f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-02 16:19:42 +08:00
daiao b48fc7ba3b pullrequest发送消息 2016-12-02 16:18:31 +08:00
黄井泉 42775a82f9 Merge branch 'cxt_course' into 'develop'
班级作业增加设置选项:成绩公开范围



See merge request !37
2016-12-02 14:53:55 +08:00
cxt adac1d3d7a 班级问卷列表样式调整 2016-12-02 14:53:20 +08:00