 huang
|
dbc8c5811a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
app/controllers/pull_requests_controller.rb
|
2016-11-30 09:55:45 +08:00 |
|
huang
|
934b219454
|
pull request创建的一些改进
|
2016-11-30 09:52:59 +08:00 |
|
huang
|
a19f6ffd38
|
项目文件历史记录显示内容区分历史新增和删除
项目变更文件高亮显示
|
2016-11-29 17:05:14 +08:00 |
 daiao
|
b2de81394e
|
项目PullRequest列表，显示创建者的名字
|
2016-11-29 14:44:28 +08:00 |
|
daiao
|
e7b2b1edfa
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
app/controllers/pull_requests_controller.rb
|
2016-11-29 12:28:31 +08:00 |
|
daiao
|
43cd4f55ac
|
Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
app/controllers/pull_requests_controller.rb
|
2016-11-29 12:27:40 +08:00 |
|
daiao
|
e4d43cc163
|
项目pull request 项目消息框架搭建
|
2016-11-29 12:25:15 +08:00 |
|
daiao
|
7ea9f00054
|
pull request 改动对比显示 代码封装
|
2016-11-29 10:52:57 +08:00 |
|
daiao
|
ece69b9e7a
|
完成项目比较功能（样式未完，待设计）
|
2016-11-28 17:16:43 +08:00 |
|
daiao
|
2cbc7bca33
|
我的Issue导出功能
|
2016-11-28 16:11:52 +08:00 |
|
daiao
|
3f5e840e76
|
commit_diff json数据转换成OpenStruct类型
|
2016-11-28 16:08:04 +08:00 |
|
daiao
|
2c664dcd21
|
我的issue导出功能（未完）
|
2016-11-28 15:32:02 +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
|
c2629ebdc0
|
有几处相同的content key
|
2016-11-26 17:06:17 +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 |
|
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
|
8a52e136cf
|
点击展开回复
|
2016-11-25 18:01:50 +08:00 |
|
黄井泉
|
00c8673f4a
|
Merge branch 'dai_ao' into 'develop'
项目头部样式修改，fork数目不对
See merge request !23
|
2016-11-25 17:19:15 +08:00 |
|
daiao
|
f1b6e67e50
|
项目头部样式修改，fork数目错误
|
2016-11-25 17:10:49 +08:00 |
|
huang
|
8393679c9c
|
项目关注车成员列表结构梳理
|
2016-11-25 17:08:11 +08:00 |
|
cxt
|
ebda1d7d54
|
测试版课程列表报500
|
2016-11-25 16:17:02 +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 |
|
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 |
|
daiao
|
09506c0954
|
项目成员,关注成员，fork新页面
|
2016-11-25 12:17:27 +08:00 |
|
daiao
|
bff5a36577
|
pull request各种情况给出提示 项目顶头的fork信息弹出新页面及鼠标经过手型效果
|
2016-11-25 11:32:45 +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 |
|
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
|
8743460134
|
动态与详情的回复叠层调整
|
2016-11-25 09:59: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 |