 daiao
|
7ea9f00054
|
pull request 改动对比显示 代码封装
|
2016-11-29 10:52:57 +08:00 |
|
daiao
|
ece69b9e7a
|
完成项目比较功能（样式未完，待设计）
|
2016-11-28 17:16:43 +08:00 |
|
daiao
|
3f5e840e76
|
commit_diff json数据转换成OpenStruct类型
|
2016-11-28 16:08:04 +08:00 |
 huang
|
ace999e331
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-28 15:30:24 +08:00 |
|
huang
|
082f397fd5
|
Merge branch 'develop' into dev_newproject
|
2016-11-28 15:26:32 +08:00 |
|
huang
|
6d14353ef7
|
commit_diff
|
2016-11-28 15:25:26 +08:00 |
|
huang
|
5601ae0f54
|
pull request的一些提示改进
|
2016-11-28 12:18:03 +08:00 |
|
huang
|
42e301659e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-28 09:24:29 +08:00 |
 guange
|
efb0c9917c
|
.
|
2016-11-26 17:49:36 +08:00 |
|
guange
|
a2439f0a14
|
git文件比较功能
|
2016-11-26 17:47:39 +08:00 |
|
guange
|
c2629ebdc0
|
有几处相同的content key
|
2016-11-26 17:06:17 +08:00 |
|
huang
|
ecf5101ef2
|
pull request 列表增加源项目/姓名 目标项目/姓名
|
2016-11-25 20:34:59 +08:00 |
|
huang
|
99ac546782
|
Merge branch 'develop' of https://git.trustie.net/Hjqreturn/trustieforge into develop
|
2016-11-25 20:14:02 +08:00 |
|
huang
|
8318bced7f
|
pull request添加权限控制
|
2016-11-25 20:13:37 +08:00 |
 cxt
|
e202a7b99c
|
二级回复
|
2016-11-25 20:13:01 +08:00 |
|
cxt
|
ba03065f9f
|
“未参与”状态的还原
|
2016-11-25 19:58:27 +08:00 |
|
cxt
|
c965f72ce3
|
还原回复的隐藏
|
2016-11-25 19:19:38 +08:00 |
|
huang
|
21b13e33ce
|
pull request的时候各种异常类型打印
|
2016-11-25 19:05:37 +08:00 |
|
cxt
|
ae7b8b2857
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-25 18:40:18 +08:00 |
|
cxt
|
9115020a43
|
匿评状态调整
|
2016-11-25 18:40:04 +08:00 |
|
黄井泉
|
d54cee6fc5
|
Merge branch 'dai_ao' into 'develop'
项目头部样式修改
See merge request !26
|
2016-11-25 18:05:07 +08:00 |
|
cxt
|
8a52e136cf
|
点击展开回复
|
2016-11-25 18:01:50 +08:00 |
|
黄井泉
|
735e38745e
|
Merge branch 'yuanke_youhua' into 'develop'
KE工具栏不换行
KE工具栏不换行
See merge request !24
|
2016-11-25 18:00:04 +08:00 |
|
黄井泉
|
3c74bc7465
|
Merge branch 'develop' into 'develop'
pull requet文件更新对比 正则修改
See merge request !25
|
2016-11-25 17:54:12 +08:00 |
|
huang
|
872d8295e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-25 17:51:30 +08:00 |
|
huang
|
9c12e774d1
|
pull request 文件内容正则修改
|
2016-11-25 17:50:37 +08:00 |
 yuanke
|
b6172fc31f
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-25 17:45:01 +08:00 |
|
yuanke
|
248276d088
|
KE工具栏不换行
|
2016-11-25 17:43:52 +08:00 |
|
daiao
|
c640535cca
|
项目头部样式调整
|
2016-11-25 17:39:55 +08:00 |
|
黄井泉
|
00c8673f4a
|
Merge branch 'dai_ao' into 'develop'
项目头部样式修改，fork数目不对
See merge request !23
|
2016-11-25 17:19:15 +08:00 |
|
daiao
|
5c9cbe3936
|
Merge branch 'develop' into dai_ao
|
2016-11-25 17:16:33 +08:00 |
|
黄井泉
|
9a76e466d6
|
Merge branch 'yuanke_youhua' into 'develop'
网页缩小时需出现左右滚动条
网页缩小时需出现左右滚动条
See merge request !20
|
2016-11-25 17:12:21 +08:00 |
|
黄井泉
|
9a134aaa3f
|
Merge branch 'develop' into 'develop'
项目关注列表代码结构梳理
See merge request !21
|
2016-11-25 17:11:59 +08:00 |
|
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 |