Commit Graph

1070 Commits

Author SHA1 Message Date
wenbo.dong
ca17299f92 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 11:34:35 +08:00
wenbo.dong
ecc2ca518a docs: UsernameAutoComplete注释 2017-08-17 11:31:57 +08:00
suxiaoxin
f064df4863 feat: merge dev to local 2017-08-17 11:26:20 +08:00
suxiaoxin
0d3d8a251b feat: add websocket to solve interface edit and add addMember role and add case req_params 2017-08-17 11:24:46 +08:00
zwjamnsss
d02c02d76e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 10:17:55 +08:00
zwjamnsss
d1d8172f64 feat: 添加到集合 2017-08-17 10:17:48 +08:00
wenbo.dong
fdb2e7efc0 feat: 修改组成员权限的功能 2017-08-16 21:29:01 +08:00
suxiaoxin
1227086a2c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 20:43:51 +08:00
wenbo.dong
4a181c563a feat: 项目成员列表删除功能 2017-08-16 20:31:59 +08:00
suxiaoxin
2485eff17e Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 18:04:19 +08:00
suxiaoxin
dd06dfe5fc feat: add interface and col route 2017-08-16 18:04:16 +08:00
qitmac000249
febcec21b1 fix: 解决commons冲突 2017-08-16 17:16:39 +08:00
qitmac000249
6adbdc3516 fix: log保存封装 2017-08-16 17:13:14 +08:00
qitmac000249
ed66c3c0fa fix: 预览页完善 2017-08-16 17:12:01 +08:00
wenbo.dong
655dbd1053 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 14:41:33 +08:00
wenbo.dong
fa95c3f185 feat: 添加分组时输入组长名字 2017-08-16 14:41:31 +08:00
zwjamnsss
5f9b5daffe Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 14:28:06 +08:00
zwjamnsss
24aa12160a feat: run 2017-08-16 14:28:02 +08:00
suxiaoxin
cfdf623f1c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 12:31:17 +08:00
suxiaoxin
96bd038d99 feat: 修复删除项目bug和完善删除分组功能 2017-08-16 12:31:11 +08:00
wenbo.dong
53f62aab22 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 12:24:57 +08:00
wenbo.dong
d9a1d65186 feat: UsernameAutoComplete组件 2017-08-16 12:24:54 +08:00
suxiaoxin
a0aa538983 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 12:19:56 +08:00
suxiaoxin
9574987647 feat: 修复删除项目bug和完善删除分组功能 2017-08-16 12:19:53 +08:00
zwjamnsss
9039fa9395 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 11:48:20 +08:00
zwjamnsss
ef50e4f90a feat: run pathparam 2017-08-16 11:48:15 +08:00
wenbo.dong
a2d0cb1931 fix: 成员列表table中col的key值 2017-08-16 11:35:47 +08:00
wenbo.dong
f4c28a59ab Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-16 11:06:27 +08:00
wenbo.dong
3d89efe86a feat: 添加项目成员 2017-08-16 11:06:24 +08:00
suxiaoxin
ad27733165 feat: optimize auth 2017-08-16 10:56:42 +08:00
zwjamnsss
4ed04d7b60 feat: run 2017-08-15 21:35:34 +08:00
zwjamnsss
916defd719 feat: ru 2017-08-15 21:14:00 +08:00
zwjamnsss
c83184df45 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 21:13:15 +08:00
zwjamnsss
b0b79ed9ec feat: run 2017-08-15 21:13:11 +08:00
wenbo.dong
7ae873cb6c feat: 分组成员列表添加权限判断(仅组长和admin可设置) 2017-08-15 20:27:41 +08:00
suxiaoxin
a892f155a6 feat: user auth 2017-08-15 18:38:36 +08:00
suxiaoxin
1d676df39e feat: user auth perfect 2017-08-15 18:36:48 +08:00
wenbo.dong
e5a3e0441f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 18:23:33 +08:00
wenbo.dong
d24f748ade feat: 分组成员管理页面 2017-08-15 18:23:30 +08:00
qitmac000249
e8c12bbb22 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-15 17:55:57 +08:00
qitmac000249
9dca7dafd2 fix: 修改view 2017-08-15 17:55:52 +08:00
qitmac000249
8116220e79 fix: 修改view 2017-08-15 17:54:06 +08:00
zwjamnsss
fcd310b054 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 17:41:59 +08:00
zwjamnsss
ec82dfbeef feat: run 2017-08-15 17:41:55 +08:00
suxiaoxin
533588c68f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 17:38:25 +08:00
suxiaoxin
7ab03e0142 feat: fix group member some bug and perfect 2017-08-15 17:38:22 +08:00
qitmac000249
2b3c56a0c1 fix: 修改view 2017-08-15 17:02:54 +08:00
qitmac000249
6610c01513 fix: 修复用户管理显示及view的样式 2017-08-15 16:57:50 +08:00
qitmac000249
7ed167d75f fix: 修复用户管理显示及view的样式 2017-08-15 16:55:46 +08:00
zwjamnsss
1c105c3079 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-15 16:34:59 +08:00