Commit Graph

17986 Commits

Author SHA1 Message Date
daiao f1b6e67e50 项目头部样式修改,fork数目错误 2016-11-25 17:10:49 +08:00
huang e02c64aceb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-25 17:08:37 +08:00
huang 8393679c9c 项目关注车成员列表结构梳理 2016-11-25 17:08:11 +08:00
cxt ebda1d7d54 测试版课程列表报500 2016-11-25 16:17:02 +08:00
yuanke 5675c3ab67 Merge branch 'develop' into yuanke_youhua 2016-11-25 16:01:50 +08:00
yuanke b1ae697c3d 页面缩小时页面下方需要出现左右滚动条 2016-11-25 16:00:41 +08:00
daiao 23332c2821 Merge branch 'develop' into dai_ao 2016-11-25 15:35:37 +08:00
黄井泉 890ddf1be9 Merge branch 'develop' into 'develop'
gitlab api中 删除操作返回异常的问题 pull相关提醒策略修改 里程碑issue统计(戴傲)



See merge request !19
2016-11-25 15:21:23 +08:00
huang 6d5d93c24e Merge branch 'dai_ao' into develop 2016-11-25 15:17:16 +08:00
huang 636721699e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao 2016-11-25 15:16:09 +08:00
huang 25ffa16c06 pull request 未改动及已合并提醒 2016-11-25 15:15:29 +08:00
黄井泉 945297882b Merge branch 'dai_ao' into 'develop'
管理员项目头部调整 Issue统计调整



See merge request !17
2016-11-25 15:04:22 +08:00
daiao c02e507f0d Merge branch 'develop' into dai_ao 2016-11-25 15:01:22 +08:00
cxt 785f027a63 Merge branch 'cxt_course' into develop 2016-11-25 14:56:24 +08:00
huang b15fd1607f 里程碑issue统计,加入未指派,调整total位置,并按成员issue的数量排序 2016-11-25 14:50:23 +08:00
黄井泉 7f11a5515a Merge branch 'develop' into 'develop'
讨论区、通知、博客列表显示调整、关联项目删除的提示、课程相关bug修复



See merge request !15
2016-11-25 14:48:42 +08:00
cxt 76902450c0 班级测验:如图描述显示多了一个空格 2016-11-25 14:45:25 +08:00
cxt b3724f01da 班级作品列表的“未参与”相关优化 2016-11-25 14:40:26 +08:00
cxt 88c4a26303 Merge branch 'cxt_course' into develop 2016-11-25 14:03:01 +08:00
cxt faa894cb56 分组作业关联的项目若已删除则给出提示 2016-11-25 13:54:31 +08:00
cxt 3d63d2ae2c 老师反馈:学生列表中“导出列表”不显眼 2016-11-25 13:37:31 +08:00
daiao 09506c0954 项目成员,关注成员,fork新页面 2016-11-25 12:17:27 +08:00
daiao bff5a36577 pull request各种情况给出提示 项目顶头的fork信息弹出新页面及鼠标经过手型效果 2016-11-25 11:32:45 +08:00
cxt a614b4eb93 班级的讨论区列表与通知列表、项目的讨论区列表、博客列表:显示请微调 2016-11-25 11:25:04 +08:00
cxt 8efcf876c6 班级删除成员后,隐藏对应作品记录历史数据迁移 2016-11-25 11:03:30 +08:00
huang c1ee387a66 Merge branch 'develop' into dai_ao 2016-11-25 10:54:05 +08:00
黄井泉 253768e73c Merge branch 'dai_ao' into 'develop'
项目成员关注列表分页



See merge request !14
2016-11-25 10:52:15 +08:00
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
cxt 6a6dda2ec3 课程大纲:如图“归档”按钮显示换行了 2016-11-25 10:39:24 +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
cxt 5c8d92ae4e Merge branch 'develop' into cxt_course 2016-11-25 10:02:21 +08:00
cxt 8743460134 动态与详情的回复叠层调整 2016-11-25 09:59:03 +08:00
huang 89e9a309e3 Merge branch 'develop' into dai_ao 2016-11-25 09:11:36 +08:00
huang 30a0347cd6 项目头部修改,及其成员列表,关注列表新版样式(未完) 2016-11-24 17:40:33 +08:00
黄井泉 1736ada972 Merge branch 'yuanke_youhua' into 'develop'
项目简介单词不换行

项目简介单词不换行

See merge request !12
2016-11-24 16:47:50 +08:00
huang abc6eafdb4 修复删除版本库功能 2016-11-24 16:04:29 +08:00
yuanke 4fcddf743d 项目简介单词不换行修改 2016-11-24 15:15:52 +08:00
huang 45bbd7b293 pull request 选择项目的时候JS控制分支 2016-11-24 14:47:02 +08:00
黄井泉 57fd455c00 Merge branch 'yuanke_youhua' into 'develop'
个人留言列表优化

个人留言列表优化

See merge request !11
2016-11-24 14:37:14 +08:00
yuanke 891f966a66 Merge branch 'develop' into yuanke_youhua 2016-11-24 14:31:59 +08:00
yuanke 7713fba2f8 个人留言列表优化 2016-11-24 14:30:24 +08:00
黄井泉 0fd6ca1969 Merge branch 'yuanke_youhua' into 'develop'
上线问题合并

微信加网站地址,项目简介单词不换行,博客排序,个人主页关注BUG,autoUrl自动识别网址BUG修改,修改密码BUG修改等

See merge request !10
2016-11-24 11:02:58 +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
黄井泉 db18c3fd32 Merge branch 'develop' into 'develop'
版本库添加删除功能



See merge request !7
2016-11-24 10:40:55 +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