mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-01-06 12:45:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,886 Commits 44 Branches 81 Tags 310 MiB
be6a415509
Commit Graph

379 Commits

Author SHA1 Message Date
zwjamnsss
6554c04643 feat: textarea 显示其他类型 2017-08-24 21:07:49 +08:00
qitmac000249
14e975d0bf Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-24 19:28:03 +08:00
qitmac000249
8331214e5d fix: modify 2017-08-24 19:27:48 +08:00
zwjamnsss
57d1eccd92 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 17:04:00 +08:00
zwjamnsss
e1539d495d feat: body-other-editor 2017-08-24 17:02:39 +08:00
qitmac000249
e7967c2e86 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-24 16:41:00 +08:00
qitmac000249
78519414fe fix: modify 2017-08-24 16:40:33 +08:00
suxiaoxin
70cc28270a docs: opti docs 2017-08-24 16:37:45 +08:00
suxiaoxin
788a8be353 feat: merge to local 2017-08-24 14:18:44 +08:00
suxiaoxin
1682da97a6 feat: add auth check 2017-08-24 14:17:19 +08:00
suxiaoxin
a62f795ddc Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 12:16:46 +08:00
suxiaoxin
318d770f04 fix: interface filter bug 2017-08-24 12:16:43 +08:00
zwjamnsss
50a97e65d2 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-24 11:11:42 +08:00
zwjamnsss
912b552080 feat: 更新用例 2017-08-24 11:11:38 +08:00
qitmac000249
400974f4bd fix: modify 2017-08-24 11:04:53 +08:00
qitmac000249
99a824df7a fix: modify 2017-08-24 11:00:10 +08:00
suxiaoxin
4915041a19 feat: add up_case interface 2017-08-24 10:33:17 +08:00
suxiaoxin
27805e734f feat: add favicon png 2017-08-23 21:05:13 +08:00
suxiaoxin
7d79be6deb chore: opti build 2017-08-23 20:41:47 +08:00
suxiaoxin
92d603db35 feat: add mongo index 2017-08-23 16:11:43 +08:00
suxiaoxin
d55485b56a feat: add project init env col cat 2017-08-23 14:28:27 +08:00
zwjamnsss
b7ac596de5 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-23 11:41:51 +08:00
zwjamnsss
67a4a885f6 feat: domain设置 2017-08-23 11:41:46 +08:00
qitmac000249
815313724b fix: 添加interface等接口的日志保存操作 2017-08-23 11:03:42 +08:00
qitmac000249
36d60a4a23 fix: 添加interface等接口的日志保存操作 2017-08-23 10:55:17 +08:00
zwjamnsss
04580bcebc feat: 解决冲突 2017-08-22 18:13:14 +08:00
zwjamnsss
3ac7ca2eae feat: 删除集合 2017-08-22 18:05:20 +08:00
wenbo.dong
37fc5116e1 docs: 文档更新 2017-08-22 17:42:50 +08:00
suxiaoxin
0c14fb4613 fix: fix follow bug 2017-08-22 17:00:27 +08:00
zwjamnsss
1a198a53e8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-22 16:50:24 +08:00
zwjamnsss
f736d67342 feat: 修改集合名 2017-08-22 16:50:15 +08:00
qitmac000249
9918ab0cbb Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-22 11:23:15 +08:00
qitmac000249
052dd68f5a fix: 预览页修改 2017-08-22 11:23:00 +08:00
zwjamnsss
574376f2fd fix: env 2017-08-22 10:02:50 +08:00
suxiaoxin
f2ff6bc84a feat: getCase list select all field 2017-08-21 15:52:22 +08:00
suxiaoxin
f908267d20 opti: optimize interface edit 2017-08-21 12:05:18 +08:00
suxiaoxin
97c6ceff1a feat: 完善接口列表 2017-08-20 22:13:46 +08:00
suxiaoxin
713791097b feat: add interface cat component 2017-08-19 19:06:09 +08:00
suxiaoxin
adab2b48fa Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 20:35:34 +08:00
suxiaoxin
649bedf1e9 feat: add interface cat 2017-08-18 20:35:31 +08:00
wenbo.dong
3f001f9d8a docs: 文档 2017-08-18 17:15:02 +08:00
wenbo.dong
2f979a0e98 feat: 项目setting成员设置 2017-08-18 17:08:37 +08:00
wenbo.dong
9282f128d9 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-18 15:25:30 +08:00
wenbo.dong
42a6dba6ac feat: addproject接口添加groupname字段 2017-08-18 15:25:27 +08:00
suxiaoxin
e8f5808d06 fix: fix empty edit interface info 2017-08-18 12:37:32 +08:00
wenbo.dong
bd69021da9 fix: 删除项目后端少引入函数的bug 2017-08-18 11:39:43 +08:00
qitmac000249
157f175035 fix: 继续修改user页的显示 2017-08-17 20:08:10 +08:00
qitmac000249
428adc9e1d Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-17 16:56:09 +08:00
qitmac000249
5a1dc04905 fix: user 权限显示 2017-08-17 16:55:52 +08:00
wenbo.dong
7d73241dc8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 15:35:05 +08:00
wenbo.dong
5893041ff6 docs: 文档文案修改 2017-08-17 15:34:43 +08:00
suxiaoxin
729fa3828c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-17 15:19:50 +08:00
suxiaoxin
cd96e99231 feat: perfect websocket 2017-08-17 15:19:47 +08:00
qitmac000249
679642ce53 fix: 为log添加头像 2017-08-17 12:16:53 +08:00
qitmac000249
95f915a816 fix: 为log添加头像 2017-08-17 12:14:58 +08:00
suxiaoxin
92a1be59e5 fix: add koa-route 2017-08-17 12:03:55 +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
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
suxiaoxin
9574987647 feat: 修复删除项目bug和完善删除分组功能 2017-08-16 12:19:53 +08:00
suxiaoxin
ad27733165 feat: optimize auth 2017-08-16 10:56:42 +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
d24f748ade feat: 分组成员管理页面 2017-08-15 18:23:30 +08:00
qitmac000249
9dca7dafd2 fix: 修改view 2017-08-15 17:55:52 +08:00
suxiaoxin
7ab03e0142 feat: fix group member some bug and perfect 2017-08-15 17:38:22 +08:00
qitmac000249
a90de7968b fix: 添加接口view页 2017-08-15 12:08:59 +08:00
qitmac000249
6a5b588196 fix: 加入动态页面及bug修改 2017-08-14 15:17:05 +08:00
wenbo.dong
6391618a39 fix: 处理冲突 2017-08-11 19:37:44 +08:00
qitmac000249
80d7f1daa2 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 17:49:52 +08:00
qitmac000249
fa0765b6bc fix: modify 很多 2017-08-11 17:49:47 +08:00
suxiaoxin
322a3bb2cf feat: add project module 2017-08-11 17:24:50 +08:00
wenbo.dong
f1ff064f15 docs: 更新文档 2017-08-11 16:35:53 +08:00
suxiaoxin
3d75a9e75d chore: add category 2017-08-11 11:54:11 +08:00
suxiaoxin
2ea63ffbe1 fix: fix login bug 2017-08-11 11:42:52 +08:00
qitmac000249
77c1154e48 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-11 10:36:31 +08:00
qitmac000249
a366506a7c fix: 解决header冲突 2017-08-11 10:36:00 +08:00
suxiaoxin
6360e6722d feat: merge to local and fix some bug 2017-08-11 10:31:26 +08:00
suxiaoxin
368a2f280a feat: 优化url，去掉#,后端接口统一使用/api前缀 2017-08-11 10:25:19 +08:00
suxiaoxin
d2d3f0efe2 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 18:54:35 +08:00
suxiaoxin
6c1bbf295d feat: add user/project and fix ykit commonsChunk bug 2017-08-10 18:54:32 +08:00
wenbo.dong
028c91cf55 fix: 下载模板多余分号 2017-08-10 17:22:55 +08:00
wenbo.dong
e2fa9c1c4e feat: mock下载功能模板 2017-08-10 17:20:03 +08:00
wenbo.dong
f56d0cdf83 fix: merge 2017-08-10 17:08:39 +08:00
qitmac000249
717f0c55d8 fix: 完善log、follow接口注释 2017-08-10 15:47:33 +08:00
qitmac000249
05a53498b1 fix: projectBox 2017-08-10 15:37:20 +08:00
qitmac000249
f93df49229 fix: projectBox 2017-08-10 15:36:35 +08:00
suxiaoxin
94b4fb7c62 feat: add avatar module 2017-08-10 15:26:05 +08:00
suxiaoxin
cda4d0ffd3 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 15:24:22 +08:00
suxiaoxin
3fcab433d3 feat: add avatar module 2017-08-10 15:24:16 +08:00
suxiaoxin
f5ea25e00b feat: add avatar module 2017-08-10 15:22:42 +08:00
qitmac000249
ef39b785dc Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-10 12:14:40 +08:00
qitmac000249
6679e6e478 feat: 添加follow 后端接口 2017-08-10 12:14:35 +08:00
qitmac000249
739597e234 feat: 添加follow 后端接口 2017-08-10 12:13:32 +08:00
wenbo.dong
8b9e4f48d3 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-10 10:24:27 +08:00
wenbo.dong
2048db733e feat: 添加project/download接口 2017-08-10 10:24:24 +08:00
qitmac000249
ccecf63c63 feat: 前端添加avatar 2017-08-09 20:11:39 +08:00
suxiaoxin
967b153541 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-09 20:01:54 +08:00
suxiaoxin
223194f116 feat: add col and case module 2017-08-09 20:01:51 +08:00
qitmac000249
140be1848c fix: 完善动态页 2017-08-09 18:00:45 +08:00
suxiaoxin
1ba7bae9ce feat: add col and case module 2017-08-09 16:21:49 +08:00
suxiaoxin
3ecb1fa1ab Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-08-09 16:16:41 +08:00
suxiaoxin
0dcfa3a354 feat: add col and case module 2017-08-09 16:16:35 +08:00
qitmac000249
1d8f582380 Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev 2017-08-09 16:08:44 +08:00
qitmac000249
51d852a793 feat: 添加动态页面 2017-08-09 16:08:37 +08:00
suxiaoxin
b749179592 chore: client dev env path 2017-08-08 19:47:36 +08:00
suxiaoxin
ca364ccb38 feat: server col and case , client use babel-plugin-import load antd 2017-08-08 19:18:34 +08:00
suxiaoxin
b9d687b0cb feat: server col and case , client use babel-plugin-import load antd 2017-08-08 19:18:12 +08:00
suxiaoxin
5dcd1bbdc8 feat: add server auth 2017-08-08 14:45:19 +08:00
suxiaoxin
35f964e512 fix: edit project basepath is empaty bug 2017-08-01 17:10:26 +08:00
suxiaoxin
8f31ed0ee1 fix: fix mockserver bug if basepath is empty 2017-08-01 15:47:06 +08:00
suxiaoxin
596e20d0a8 feat: basepath is unrequired and fix auth bug 2017-08-01 15:37:07 +08:00
qitmac000249
18442ed387 fix: 修改project的显示 2017-08-01 15:03:34 +08:00
suxiaoxin
f544501373 feat: add autocomplete 2017-07-31 21:07:24 +08:00
suxiaoxin
def29288e7 feat: mockServer add crossRequest and change autoincrement num 2017-07-31 10:15:16 +08:00
suxiaoxin
b2bfafec90 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-28 17:29:22 +08:00
suxiaoxin
37d95b5ece feat: add user nav info 2017-07-28 17:29:17 +08:00
waliang.wang
6c7bf055bd fix: 成员项目管理 下拉 2017-07-28 15:12:55 +08:00
suxiaoxin
d0c3682746 fix: config.json path 2017-07-27 20:22:54 +08:00
祝鑫奔
b0e38af361 opti: 修复eslint错误 2017-07-27 19:49:26 +08:00
suxiaoxin
e3b39c061c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 18:00:47 +08:00
suxiaoxin
bb9c05f035 feat: add server_ip 2017-07-27 18:00:43 +08:00
祝鑫奔
bde9340d6f opti: 代码格式优化 2017-07-27 15:06:42 +08:00
suxiaoxin
2729f42520 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 14:21:26 +08:00
suxiaoxin
3517bf0959 feat: ops 2017-07-27 14:21:22 +08:00
祝鑫奔
2d18b83bad opti: 修复缩进和代码风格 2017-07-27 14:12:43 +08:00
suxiaoxin
4c1eff6404 chore: ops 2017-07-27 12:03:18 +08:00
suxiaoxin
8d6de5d3f2 feat: 因部署修改runtime路径 2017-07-27 11:50:15 +08:00
suxiaoxin
0c84398e38 fix: install init runtime bug 2017-07-27 10:04:57 +08:00
suxiaoxin
44fe60cdf9 feat: merge to local and fix some conflict 2017-07-27 09:17:02 +08:00
suxiaoxin
f80c234427 fix: install init runtime path bug 2017-07-27 09:11:43 +08:00
祝鑫奔
f58b2fa794 fix: 添加eslint并修复部分格式问题 2017-07-26 22:03:18 +08:00
suxiaoxin
4cd5730cc1 fix: veriry interface unique bug 2017-07-26 17:56:51 +08:00
suxiaoxin
c701cb388f fix: mockserver init ver bug 2017-07-26 15:31:16 +08:00
suxiaoxin
be42920b36 feat: params trim 2017-07-26 14:22:59 +08:00
suxiaoxin
af26225f67 fix: path add \. rule 2017-07-26 11:34:25 +08:00
suxiaoxin
fb8b980958 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-26 11:26:32 +08:00
suxiaoxin
1051dc8e03 feat: 因部署从git删除runtime,改为每次安装自动生成runtime/config.json配置 2017-07-26 11:26:28 +08:00
wenbo.dong
9f69453bd4 fix: 修改项目线上玉米和基本路径无法修改的bug 2017-07-25 21:51:14 +08:00
suxiaoxin
f7109a10bd fix qsso first login params bug 2017-07-25 15:42:05 +08:00
suxiaoxin
a0aa06f46a fix qsso login need click double and delete project auth bug 2017-07-25 10:22:45 +08:00
waliang.wang
cde8e44d68 解决冲突 2017-07-24 19:44:46 +08:00
wenbo.dong
1c879152d7 fix: 处理新建或修改项目时basepath验证错误的问题 2017-07-24 19:35:15 +08:00
suxiaoxin
d4581dd5e9 fix: fix project/list uids bug 2017-07-24 16:28:58 +08:00
suxiaoxin
fa283088dc fix: fix userModel uids bug 2017-07-24 16:01:53 +08:00
李放
5cab6ed047 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-24 12:26:01 +08:00
李放
861143fe9e docs: log的save功能注释 2017-07-24 12:25:46 +08:00
suxiaoxin
bef7266453 feat: 完善path验证规则 2017-07-24 11:24:08 +08:00
waliang.wang
c9ed7902a0 put 接口 2017-07-24 11:10:23 +08:00
waliang.wang
e638bddd12 feat - 编辑接口 2017-07-24 10:59:17 +08:00
suxiaoxin
ca6390f6ca feat: doc and fix some bug 2017-07-21 11:46:44 +08:00
suxiaoxin
fbdd7d8bef fix: fix project interface bug and change app.js to App.js 2017-07-21 10:03:34 +08:00
李放
285e7eadc8 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 20:30:28 +08:00
李放
6fd6b40a43 opti: 去除log多余接口 2017-07-20 20:30:24 +08:00
suxiaoxin
84e33fe414 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 19:47:16 +08:00
suxiaoxin
22f0f557bd fix: fix interface up bug 2017-07-20 19:47:10 +08:00
李放
6f8fb97ad6 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-20 19:22:03 +08:00
李放
9295f1a0d1 feat: 添加node的model及基本增删查改功能接口 2017-07-20 19:21:46 +08:00
suxiaoxin
983f17bdc5 fix: group_id to project_id in the interface model 2017-07-20 18:37:00 +08:00
suxiaoxin
573fc89b69 feat: interface add title field 2017-07-20 16:14:20 +08:00
suxiaoxin
b4d3b9d699 feat: merge to local 2017-07-20 15:28:21 +08:00
suxiaoxin
33f77c2a05 feat: project prd_host add protocol field 2017-07-20 15:26:26 +08:00
李放
db7ef73d11 fix: 修改model listCount没有筛选条件 2017-07-20 11:19:39 +08:00
suxiaoxin
74f034edcd Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-19 20:01:35 +08:00
suxiaoxin
a9597239b5 fix: count project bug 2017-07-19 20:01:29 +08:00
李放
bd82ac5c25 opti: 优化list接口返回total字段 2017-07-19 19:55:25 +08:00
suxiaoxin
666830b104 feat: group add permisition 2017-07-19 19:38:48 +08:00
suxiaoxin
deeccfa44e feat: user module in the client 2017-07-19 13:58:12 +08:00
suxiaoxin
0f8cfdae79 feat: user client module 2017-07-18 19:47:38 +08:00
suxiaoxin
5211c48d68 feat: user 2017-07-18 17:18:16 +08:00
suxiaoxin
5576cd7284 feat: user module 2017-07-18 17:15:29 +08:00
李放
0051efad64 fix: merge code 2017-07-18 16:46:19 +08:00
李放
8f03f081a0 opti: 优化分页查询逻辑 2017-07-18 16:37:28 +08:00
suxiaoxin
6a889422ee fix: merge to local 2017-07-18 15:50:07 +08:00
suxiaoxin
903ddc46b9 fix: fix some bug 2017-07-18 15:48:05 +08:00
祝鑫奔
790c530c71 chore: remove files in server_dist/ 2017-07-18 15:47:06 +08:00
祝鑫奔
c1cf42dd4f Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-18 15:41:38 +08:00
祝鑫奔
64da2baf29 fix: 解决merge留下的问题 2017-07-18 15:41:18 +08:00
suxiaoxin
f8fe5026bf feat: merge to local 2017-07-18 15:39:50 +08:00
suxiaoxin
73bf7b3d17 feat: merge to local 2017-07-18 15:38:26 +08:00
祝鑫奔
6a42be30ea fix: 修复用户搜索返回值字段问题 2017-07-18 15:37:21 +08:00
suxiaoxin
66f2eb6390 feat: uesr management module and fix some server bug 2017-07-18 15:35:32 +08:00
祝鑫奔
1d04ec2d28 fix: 修复用户搜索返回密码和盐及过滤项目搜索字段 2017-07-18 15:31:41 +08:00
李放
2ce79aeada feat: 给list接口添加分页功能 2017-07-18 15:13:47 +08:00
suxiaoxin
68d0c65a55 feat: modify db config 2017-07-17 16:24:00 +08:00
suxiaoxin
de689bc921 feat: modify db config_dev 2017-07-17 15:51:15 +08:00
suxiaoxin
cad35e4527 chore: modify dev config 2017-07-17 13:47:46 +08:00
suxiaoxin
c93447256b feat: user module client 2017-07-17 11:01:05 +08:00
李放
cc2be4bdd3 docs: 增加修改密码和获取项目成员列表返回示例 2017-07-14 18:08:05 +08:00
李放
5a074533ae #fix: Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 
# Conflicts:
#	server/controllers/project.js
#	server/router.js
#	server_dist/controllers/project.js
#	server_dist/router.js
 2017-07-14 17:42:03 +08:00
李放
921a140a76 add: 修改密码功能和获取项目成员列表功能 2017-07-14 17:37:26 +08:00
祝鑫奔
51de666414 docs: 增加搜索文档返回示例 2017-07-14 17:00:30 +08:00
祝鑫奔
86142d9848 feat: 增加用户名／email／组／项目模糊搜索 2017-07-14 16:41:14 +08:00
suxiaoxin
19466c6d6c fix: login username bug 2017-07-13 16:13:47 +08:00
suxiaoxin
496577a611 add chrome_ext 2017-07-12 20:47:20 +08:00
suxiaoxin
80b1095852 add third qunar sso login 2017-07-12 17:01:27 +08:00
suxiaoxin
52a9301087 yapi add help info 2017-07-12 12:22:10 +08:00
suxiaoxin
c70041271e add user and interface document 2017-07-11 18:22:20 +08:00
suxiaoxin
b5e3eff4c7 add sendMail and install 2017-07-11 16:53:14 +08:00