363 Commits

Author	SHA1	Message	Date
wenbo.dong	d21c38c0de	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-25 14:39:05 +08:00
sean	6333dde87d	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-25 14:19:38 +08:00
sean	4939481cd6	fix: 修改websocket domain bug	2017-08-25 14:18:22 +08:00
wenbo.dong	0cf936f03b	fix: 登录错误提示重复弹出的bug	2017-08-25 12:20:41 +08:00
qitmac000249	d53603bd35	fix: modify	2017-08-25 11:57:01 +08:00
wenbo.dong	3ebf37ec82	fix: 修改环境域名的正则条件	2017-08-25 11:33:12 +08:00
wenbo.dong	1eba042d17	fix: 项目环境修改后发送project/get请求	2017-08-25 11:26:31 +08:00
wenbo.dong	abcb1a2ebc	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-25 11:22:28 +08:00
qitmac000249	91ef871c59	Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev	2017-08-25 11:20:20 +08:00
qitmac000249	c8d44e076f	fix: modify	2017-08-25 11:20:05 +08:00
sean	5a9241b497	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-25 11:18:33 +08:00
sean	2803bb2321	feat: fix interface bug	2017-08-25 11:18:29 +08:00
wenbo.dong	d36aa90066	docs: 删除项目的文案修改	2017-08-25 11:12:37 +08:00
qitmac000249	93e9bfc7a3	Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev	2017-08-25 11:11:12 +08:00
qitmac000249	ca567c2387	fix: modify	2017-08-25 11:11:00 +08:00
wenbo.dong	db5e38e59c	fix: 修复项目陈孤雁设置里，分组成员显示'我'定位错误	2017-08-24 21:57:53 +08:00
sean	139b087e19	fix: interface path icon	2017-08-24 21:18:12 +08:00
sean	c21fab09c1	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-24 20:58:35 +08:00
sean	2b8d4b6e2a	feat: add chrome ctx	2017-08-24 20:58:30 +08:00
qitmac000249	d993d6992f	Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev	2017-08-24 19:28:03 +08:00
qitmac000249	1a09cbf79f	fix: modify	2017-08-24 19:27:48 +08:00
wenbo.dong	a81012cce1	opti: 编辑项目页布局调整	2017-08-24 18:31:16 +08:00
wenbo.dong	7c86d2e0cb	opti: 布局调整	2017-08-24 18:06:38 +08:00
sean	d9269efe64	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-24 16:37:49 +08:00
sean	3048ec09f2	docs: opti docs	2017-08-24 16:37:45 +08:00
wenbo.dong	ce91b182cf	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-24 15:41:03 +08:00
wenbo.dong	57143a14ed	feat: 新建项目成员时选择成员权限	2017-08-24 15:41:01 +08:00
qitmac000249	102a2c799e	Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev	2017-08-24 15:39:35 +08:00
qitmac000249	27fd5e3d01	fix: 修改user样式	2017-08-24 15:39:22 +08:00
wenbo.dong	9ffef3c41b	fix: merge	2017-08-24 15:21:54 +08:00
wenbo.dong	d422ddfeda	feat: 首页引导注册	2017-08-24 15:20:40 +08:00
zwjamnsss	3083273f8b	opti: 样式	2017-08-24 14:38:31 +08:00
sean	be621f3e26	feat: add auth check	2017-08-24 14:17:19 +08:00
sean	df1f73a347	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-24 12:16:46 +08:00
sean	0e4dc60ad8	fix: interface filter bug	2017-08-24 12:16:43 +08:00
zwjamnsss	9a3f1ab239	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-24 11:11:42 +08:00
zwjamnsss	f7b945ba08	feat: 更新用例	2017-08-24 11:11:38 +08:00
qitmac000249	b3b5fe3976	fix: modify	2017-08-24 11:04:53 +08:00
qitmac000249	15c78db2e0	fix: modify	2017-08-24 11:00:10 +08:00
zwjamnsss	cd68abf810	fix: 解决冲突	2017-08-24 10:47:23 +08:00
zwjamnsss	4ad00a5928	feat: 返回header	2017-08-24 10:44:02 +08:00
sean	c5c6dfee27	feat: add up_case interface	2017-08-24 10:33:17 +08:00
wenbo.dong	06606c306e	opti: 设置页布局调整	2017-08-23 21:01:50 +08:00
wenbo.dong	85adf4e284	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-23 17:23:58 +08:00
wenbo.dong	3442e0aee6	opti: 项目卡片布局调整	2017-08-23 17:23:54 +08:00
wenbo.dong	1fd9b81a2b	opti: 样式微调	2017-08-23 16:08:26 +08:00
zwjamnsss	eeaa42fb47	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-23 15:52:15 +08:00
zwjamnsss	d4cb38ced8	feat: 用例运行	2017-08-23 15:50:07 +08:00
wenbo.dong	34058b612f	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-23 15:25:37 +08:00
wenbo.dong	2d42c8b334	feat: 完成项目头像设置	2017-08-23 15:25:35 +08:00
zwjamnsss	04e0a7b101	feat: 保存用例	2017-08-23 15:20:09 +08:00
qitmac000249	44688dfff4	Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev	2017-08-23 12:23:33 +08:00
qitmac000249	00b9efc3a5	fix: 修改动态页的样式	2017-08-23 12:23:20 +08:00
zwjamnsss	12ca51bece	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-23 11:41:51 +08:00
zwjamnsss	1be9f282fb	feat: domain设置	2017-08-23 11:41:46 +08:00
wenbo.dong	e162fecb86	feat: 新建与删除项目的跳转	2017-08-23 10:52:12 +08:00
wenbo.dong	fec132b423	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-23 10:38:19 +08:00
wenbo.dong	8ea87172d9	feat: 修改项目头像布局	2017-08-23 10:36:24 +08:00
sean	4e7211c945	fix: add cat bug	2017-08-22 20:44:33 +08:00
zwjamnsss	b70bb57384	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-22 19:59:01 +08:00
zwjamnsss	e710921f20	feat: 删除用例	2017-08-22 19:57:39 +08:00
sean	9d501aaf8c	fix: add cat bug	2017-08-22 19:46:00 +08:00
zwjamnsss	52eeb29dcb	feat: 删除集合	2017-08-22 18:21:05 +08:00
zwjamnsss	4e14ef147b	feat: 删除集合	2017-08-22 18:05:20 +08:00
zwjamnsss	b85f9437de	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-22 16:50:24 +08:00
zwjamnsss	dd0a0c1698	feat: 修改集合名	2017-08-22 16:50:15 +08:00
qitmac000249	be04f17cdc	Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev	2017-08-22 16:37:37 +08:00
qitmac000249	af559c31f9	fix: modify	2017-08-22 16:37:24 +08:00
sean	25cc70f655	docs: opti docs	2017-08-22 16:06:56 +08:00
wenbo.dong	47ea68206e	feat: 主题定制	2017-08-22 13:56:12 +08:00
wenbo.dong	a014e010b2	feat: 主题定制	2017-08-22 12:20:33 +08:00
qitmac000249	89bfe7abae	Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev	2017-08-22 11:23:15 +08:00
qitmac000249	741844a504	fix: 预览页修改	2017-08-22 11:23:00 +08:00
zwjamnsss	d7583ebfd6	feat: postman	2017-08-22 10:51:39 +08:00
zwjamnsss	db494d324b	fix: env	2017-08-22 10:02:50 +08:00
zwjamnsss	b5b53001ec	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-22 09:43:38 +08:00
zwjamnsss	687339ea8d	feat: postman	2017-08-22 09:43:33 +08:00
zwjamnsss	6a4d1a34aa	feat: postman	2017-08-22 09:41:20 +08:00
sean	26f3b8cf84	docs: opti docs	2017-08-21 21:18:29 +08:00
zwjamnsss	7ec9f122b7	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-21 15:57:08 +08:00
zwjamnsss	74ebf29a4c	feat: col-content	2017-08-21 15:57:04 +08:00
sean	0540f49b21	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-21 12:05:21 +08:00
sean	9e419165ed	opti: optimize interface edit	2017-08-21 12:05:18 +08:00
zwjamnsss	4f095094c5	fix: 接口 集合tab切换	2017-08-21 10:38:16 +08:00
sean	4984e5eb0a	feat: optimize project router	2017-08-21 10:18:56 +08:00
sean	1922ef3859	feat: 完善接口列表	2017-08-20 22:13:46 +08:00
sean	44930f3161	fix: interfaceMenu defaultkeys bug	2017-08-19 19:43:04 +08:00
sean	587e592d82	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-19 19:06:12 +08:00
sean	b04c988def	feat: add interface cat component	2017-08-19 19:06:09 +08:00
zwjamnsss	96f0515e72	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 21:11:12 +08:00
zwjamnsss	c8502d871f	feat: col menu	2017-08-18 21:11:09 +08:00
sean	d9594744c8	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 20:35:34 +08:00
sean	91965fd468	feat: add interface cat	2017-08-18 20:35:31 +08:00
wenbo.dong	cb6fede8f4	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 19:47:06 +08:00
wenbo.dong	a07551d159	feat: 删除项目的二次确认	2017-08-18 19:47:02 +08:00
zwjamnsss	5dc40d7ede	feat: col menu	2017-08-18 18:13:33 +08:00
zwjamnsss	92e41b626b	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 17:56:32 +08:00
zwjamnsss	a9160f570b	feat: col-menu	2017-08-18 17:56:26 +08:00
qitmac000249	2ce7cf3690	Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev	2017-08-18 17:49:47 +08:00
qitmac000249	68af11e6f2	fix: 修改预览页加载不显示	2017-08-18 17:49:37 +08:00
zwjamnsss	f3778da554	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 17:31:53 +08:00
zwjamnsss	584640a7f2	feat: case menu	2017-08-18 17:31:48 +08:00
wenbo.dong	3c8b75a9d4	feat: 项目setting成员设置	2017-08-18 17:08:37 +08:00
wenbo.dong	98d8a41e83	feat: 项目设置中的分组成员展示	2017-08-18 15:58:40 +08:00
wenbo.dong	e5eb0f6ec4	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 15:25:30 +08:00
wenbo.dong	7e06189313	feat: addproject接口添加groupname字段	2017-08-18 15:25:27 +08:00
sean	2805ea0b82	fix: fix empty edit interface info	2017-08-18 12:37:32 +08:00
sean	4158855022	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 12:07:18 +08:00
sean	9bec5d6bb4	fix: interfaceContent bug	2017-08-18 12:07:14 +08:00
zwjamnsss	97ad5a5b0f	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 12:00:36 +08:00
zwjamnsss	8021b055d8	feat: col menu	2017-08-18 12:00:21 +08:00
wenbo.dong	74a2c20099	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 11:39:46 +08:00
wenbo.dong	2572cf37d1	feat: setting页面布局	2017-08-18 11:39:08 +08:00
qitmac000249	a78a83c3e5	Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev	2017-08-18 11:34:18 +08:00
qitmac000249	1be17b9144	fix: 添加ErrMsg到log	2017-08-18 11:34:06 +08:00
zwjamnsss	05b13df731	feat: col menu	2017-08-18 11:33:37 +08:00
sean	2c9a57b357	fix: mockEditor bug	2017-08-18 11:23:04 +08:00
sean	a4147e8e86	fix: route bug	2017-08-18 11:05:33 +08:00
wenbo.dong	e337210b3b	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-17 22:20:01 +08:00
wenbo.dong	e7366e3de1	feat: 编辑项目	2017-08-17 22:19:58 +08:00
zwjamnsss	47a78e8c30	feat: menu	2017-08-17 20:58:43 +08:00
zwjamnsss	ac0947aa88	feat: 解决冲突	2017-08-17 20:25:44 +08:00
zwjamnsss	8e4422a327	feat: col-menu	2017-08-17 20:24:07 +08:00
sean	fb4ebde34d	fix: fix route some bug	2017-08-17 18:00:02 +08:00
zwjamnsss	c111bafc9c	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-17 16:10:49 +08:00
zwjamnsss	5135a27d7b	feat: componetWillMount	2017-08-17 16:10:43 +08:00
zwjamnsss	ba57b53a5f	feat: componetWillMount	2017-08-17 16:10:34 +08:00
wenbo.dong	c109cc8557	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-17 15:35:05 +08:00
wenbo.dong	d05561f778	docs: 文档文案修改	2017-08-17 15:34:43 +08:00
sean	8fc4da40aa	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-17 15:19:50 +08:00
sean	99ef07342c	feat: perfect websocket	2017-08-17 15:19:47 +08:00
wenbo.dong	d3849735ba	feat: project setting layout	2017-08-17 14:35:00 +08:00
zwjamnsss	8d2a3e4c47	feat: col-menu	2017-08-17 12:19:56 +08:00
qitmac000249	1570af0fef	fix: 为log添加头像	2017-08-17 12:16:53 +08:00
qitmac000249	f6c94d698f	fix: 为log添加头像	2017-08-17 12:14:58 +08:00
wenbo.dong	05fc8bc000	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-17 12:09:11 +08:00
wenbo.dong	300ab79ee3	feat: 空项目组提示	2017-08-17 12:09:08 +08:00
sean	adbe2f7c6b	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-17 12:03:58 +08:00
sean	c129e68abb	fix: add koa-route	2017-08-17 12:03:55 +08:00
zwjamnsss	14311f1637	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-17 11:41:04 +08:00
zwjamnsss	c2427937da	feat: 添加用例	2017-08-17 11:40:59 +08:00
sean	f71b210839	feat: merge dev to local	2017-08-17 11:26:20 +08:00
sean	6db3fafacf	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	39bcc16c44	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-17 10:17:55 +08:00
zwjamnsss	be1703b12c	feat: 添加到集合	2017-08-17 10:17:48 +08:00
sean	0a5f3ad3af	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-16 18:04:19 +08:00
sean	00e2710d1c	feat: add interface and col route	2017-08-16 18:04:16 +08:00
qitmac000249	9e6f6568a7	fix: log保存封装	2017-08-16 17:13:14 +08:00
qitmac000249	4e7f5959d2	fix: 预览页完善	2017-08-16 17:12:01 +08:00
zwjamnsss	489b5cebc1	feat: run	2017-08-16 14:28:02 +08:00
zwjamnsss	53f1e949e3	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-16 11:48:20 +08:00
zwjamnsss	8fb662dd1c	feat: run pathparam	2017-08-16 11:48:15 +08:00
sean	5ae5fb8789	feat: optimize auth	2017-08-16 10:56:42 +08:00
zwjamnsss	96626f5c6f	feat: run	2017-08-15 21:35:34 +08:00
zwjamnsss	470102231f	feat: ru	2017-08-15 21:14:00 +08:00
zwjamnsss	ec3b10054d	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-15 21:13:15 +08:00
zwjamnsss	75585198f0	feat: run	2017-08-15 21:13:11 +08:00
qitmac000249	73e2ccb05b	fix: 修改view	2017-08-15 17:54:06 +08:00
zwjamnsss	e80c41cbaa	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-15 17:41:59 +08:00
zwjamnsss	2254258d4d	feat: run	2017-08-15 17:41:55 +08:00
sean	f389bd5db4	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-15 17:38:25 +08:00
sean	78a45a8419	feat: fix group member some bug and perfect	2017-08-15 17:38:22 +08:00
qitmac000249	c82ad5d498	fix: 修改view	2017-08-15 17:02:54 +08:00
qitmac000249	a799be07ac	fix: 修复用户管理显示及view的样式	2017-08-15 16:57:50 +08:00
qitmac000249	d1e7304f6d	fix: 修复用户管理显示及view的样式	2017-08-15 16:55:46 +08:00
zwjamnsss	77a9d58ad8	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-15 16:34:59 +08:00
zwjamnsss	600d7da21c	feat: run	2017-08-15 16:34:41 +08:00
sean	2eb5f420dc	feat: edit interface add auto header	2017-08-15 14:49:02 +08:00
qitmac000249	f91db88593	fix: 解决view页面的冲突	2017-08-15 12:15:07 +08:00
zwjamnsss	f67f0f2c4f	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-15 12:09:34 +08:00
zwjamnsss	7dabd12b3e	feat: run	2017-08-15 12:09:29 +08:00
qitmac000249	acdbd3837c	fix: 添加接口view页	2017-08-15 12:08:59 +08:00
qitmac000249	ae39da3fe5	fix: 添加接口view页	2017-08-15 12:07:52 +08:00
sean	fe76f992f0	fix: mongodb auth bug and perfect mockServer	2017-08-15 12:05:22 +08:00
sean	c00b55af53	feat: del prd_host and perfect the interface edit style	2017-08-15 11:12:39 +08:00
sean	f504acdec8	feat: 完善edit interface 功能	2017-08-14 23:01:20 +08:00
sean	bc2904826c	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-14 21:43:09 +08:00
sean	be6abeedf8	feat: edit interface ci	2017-08-14 21:43:06 +08:00
zwjamnsss	8e90284be9	fix: 解决冲突	2017-08-14 21:23:57 +08:00
zwjamnsss	129708f264	feat: run	2017-08-14 21:22:18 +08:00
zwjamnsss	57f2b872c3	Merge branch 'dev' into run	2017-08-14 20:09:57 +08:00
sean	fa510e9608	feat: add interface res some module	2017-08-14 19:58:33 +08:00
zwjamnsss	56a19f8a15	fix: 解决冲突	2017-08-14 19:34:04 +08:00
zwjamnsss	ff0f9b575c	feat: run 部分	2017-08-14 19:23:20 +08:00
zwjamnsss	231c603629	feat: 接口集合菜单	2017-08-14 17:32:49 +08:00
sean	5c91366f3a	fix: col list bug	2017-08-14 16:30:30 +08:00
qitmac000249	e222f7113e	fix: 加入动态页面及bug修改	2017-08-14 15:17:05 +08:00
sean	cad46617b8	feat: add interface list and edit module	2017-08-14 13:44:49 +08:00
zwjamnsss	56f3b6e376	feat: 接口集合	2017-08-11 21:10:54 +08:00
sean	7827657be0	feat: interface list	2017-08-11 18:57:58 +08:00
sean	ed748674b3	fix: interface import	2017-08-11 17:29:37 +08:00
sean	d32742ac80	feat: add project	2017-08-11 17:25:57 +08:00
sean	08e148d723	feat: add project module	2017-08-11 17:24:50 +08:00
zwjamnsss	41f91f67a7	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-11 16:31:00 +08:00
zwjamnsss	53934e6655	feat: 项目页面	2017-08-11 16:30:52 +08:00
wenbo.dong	6675eec66f	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-11 16:21:34 +08:00
wenbo.dong	49ac460408	feat: AddProject移动到上一层目录	2017-08-11 16:21:07 +08:00
zwjamnsss	d58b723a31	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-11 16:20:42 +08:00
zwjamnsss	a1f4c32f16	opti: ignorge tags	2017-08-11 16:20:27 +08:00
wenbo.dong	319e5a6308	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-11 16:10:51 +08:00