274 Commits

Author	SHA1	Message	Date
zwjamnsss	513ebf0527	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 21:11:12 +08:00
zwjamnsss	7da321a260	feat: col menu	2017-08-18 21:11: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	8a4620911b	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 19:47:06 +08:00
wenbo.dong	649ba0bff9	feat: 删除项目的二次确认	2017-08-18 19:47:02 +08:00
zwjamnsss	2367517863	feat: col menu	2017-08-18 18:13:33 +08:00
zwjamnsss	2fa62938f1	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 17:56:32 +08:00
zwjamnsss	e752b87233	feat: col-menu	2017-08-18 17:56:26 +08:00
qitmac000249	077d557875	Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev	2017-08-18 17:49:47 +08:00
qitmac000249	4980723dcd	fix: 修改预览页加载不显示	2017-08-18 17:49:37 +08:00
zwjamnsss	61407711ab	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 17:31:53 +08:00
zwjamnsss	c27ceb5d12	feat: case menu	2017-08-18 17:31:48 +08:00
wenbo.dong	2f979a0e98	feat: 项目setting成员设置	2017-08-18 17:08:37 +08:00
wenbo.dong	53154d244a	feat: 项目设置中的分组成员展示	2017-08-18 15:58:40 +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
suxiaoxin	05ee224be8	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 12:07:18 +08:00
suxiaoxin	aae26b96ca	fix: interfaceContent bug	2017-08-18 12:07:14 +08:00
zwjamnsss	7b265c91d0	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 12:00:36 +08:00
zwjamnsss	5fc4a9d89c	feat: col menu	2017-08-18 12:00:21 +08:00
wenbo.dong	a6b88f4472	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-18 11:39:46 +08:00
wenbo.dong	08a91f7c41	feat: setting页面布局	2017-08-18 11:39:08 +08:00
qitmac000249	ba8b735f92	Merge branch 'dev' of http://gitlab.corp.qunar.com/mfe/yapi into dev	2017-08-18 11:34:18 +08:00
qitmac000249	cbc6458819	fix: 添加ErrMsg到log	2017-08-18 11:34:06 +08:00
zwjamnsss	7b3d9ac4d1	feat: col menu	2017-08-18 11:33:37 +08:00
suxiaoxin	c561ede4cb	fix: mockEditor bug	2017-08-18 11:23:04 +08:00
suxiaoxin	3f05be9660	fix: route bug	2017-08-18 11:05:33 +08:00
wenbo.dong	3b37371b80	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-17 22:20:01 +08:00
wenbo.dong	1cc8f3d43a	feat: 编辑项目	2017-08-17 22:19:58 +08:00
zwjamnsss	b40816fba7	feat: menu	2017-08-17 20:58:43 +08:00
zwjamnsss	29376a5cbb	feat: 解决冲突	2017-08-17 20:25:44 +08:00
zwjamnsss	d482d3b967	feat: col-menu	2017-08-17 20:24:07 +08:00
suxiaoxin	485b8d6821	fix: fix route some bug	2017-08-17 18:00:02 +08:00
zwjamnsss	a02b4e585a	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-17 16:10:49 +08:00
zwjamnsss	9748f17f8b	feat: componetWillMount	2017-08-17 16:10:43 +08:00
zwjamnsss	a953d27d2f	feat: componetWillMount	2017-08-17 16:10:34 +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
wenbo.dong	61c9e50e8d	feat: project setting layout	2017-08-17 14:35:00 +08:00
zwjamnsss	8f96c51614	feat: col-menu	2017-08-17 12:19:56 +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
wenbo.dong	d643904fd6	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-17 12:09:11 +08:00
wenbo.dong	8b4327a442	feat: 空项目组提示	2017-08-17 12:09:08 +08:00
suxiaoxin	57d15ef7f3	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-17 12:03:58 +08:00
suxiaoxin	92a1be59e5	fix: add koa-route	2017-08-17 12:03:55 +08:00
zwjamnsss	3e46079446	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-17 11:41:04 +08:00
zwjamnsss	e1c4f8c55a	feat: 添加用例	2017-08-17 11:40:59 +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
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	6adbdc3516	fix: log保存封装	2017-08-16 17:13:14 +08:00
qitmac000249	ed66c3c0fa	fix: 预览页完善	2017-08-16 17:12:01 +08:00
zwjamnsss	24aa12160a	feat: run	2017-08-16 14:28:02 +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
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
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
zwjamnsss	f81f94b8bd	feat: run	2017-08-15 16:34:41 +08:00
suxiaoxin	17fcb8c418	feat: edit interface add auto header	2017-08-15 14:49:02 +08:00
qitmac000249	f8bb4335ef	fix: 解决view页面的冲突	2017-08-15 12:15:07 +08:00
zwjamnsss	2e477ca2ec	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-15 12:09:34 +08:00
zwjamnsss	58ba775298	feat: run	2017-08-15 12:09:29 +08:00
qitmac000249	a90de7968b	fix: 添加接口view页	2017-08-15 12:08:59 +08:00
qitmac000249	c56caae762	fix: 添加接口view页	2017-08-15 12:07:52 +08:00
suxiaoxin	2f0a733776	fix: mongodb auth bug and perfect mockServer	2017-08-15 12:05:22 +08:00
suxiaoxin	aabc83ac57	feat: del prd_host and perfect the interface edit style	2017-08-15 11:12:39 +08:00
suxiaoxin	9bba7a6ec1	feat: 完善edit interface 功能	2017-08-14 23:01:20 +08:00
suxiaoxin	bdff46ce17	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-14 21:43:09 +08:00
suxiaoxin	ac7f1f09f5	feat: edit interface ci	2017-08-14 21:43:06 +08:00
zwjamnsss	4af8846935	fix: 解决冲突	2017-08-14 21:23:57 +08:00
zwjamnsss	1f514260be	feat: run	2017-08-14 21:22:18 +08:00
zwjamnsss	7237bb7f98	Merge branch 'dev' into run	2017-08-14 20:09:57 +08:00
suxiaoxin	a7e4845ada	feat: add interface res some module	2017-08-14 19:58:33 +08:00
zwjamnsss	53f304447e	fix: 解决冲突	2017-08-14 19:34:04 +08:00
zwjamnsss	8cc6754f1e	feat: run 部分	2017-08-14 19:23:20 +08:00
zwjamnsss	69c8e447ed	feat: 接口集合菜单	2017-08-14 17:32:49 +08:00
suxiaoxin	6b942ace9b	fix: col list bug	2017-08-14 16:30:30 +08:00
qitmac000249	6a5b588196	fix: 加入动态页面及bug修改	2017-08-14 15:17:05 +08:00
suxiaoxin	7b60aab44f	feat: add interface list and edit module	2017-08-14 13:44:49 +08:00
zwjamnsss	76df380a6c	feat: 接口集合	2017-08-11 21:10:54 +08:00
suxiaoxin	021e683103	feat: interface list	2017-08-11 18:57:58 +08:00
suxiaoxin	ade494a983	fix: interface import	2017-08-11 17:29:37 +08:00
suxiaoxin	b6cd3eea3b	feat: add project	2017-08-11 17:25:57 +08:00
suxiaoxin	322a3bb2cf	feat: add project module	2017-08-11 17:24:50 +08:00
zwjamnsss	0adc1c51f6	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-11 16:31:00 +08:00
zwjamnsss	32a0704bf5	feat: 项目页面	2017-08-11 16:30:52 +08:00
wenbo.dong	465d40f355	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-11 16:21:34 +08:00
wenbo.dong	6980eef06f	feat: AddProject移动到上一层目录	2017-08-11 16:21:07 +08:00
zwjamnsss	a5763cece5	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-11 16:20:42 +08:00
zwjamnsss	ca4d4c95a3	opti: ignorge tags	2017-08-11 16:20:27 +08:00
wenbo.dong	fcba2f35fe	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-11 16:10:51 +08:00
wenbo.dong	96b682c092	feat: 添加项目改版	2017-08-11 16:10:49 +08:00
zwjamnsss	16a57c563f	opti: 路由	2017-08-11 16:03:11 +08:00
zwjamnsss	989b2dc83f	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-11 15:02:10 +08:00
zwjamnsss	d4fc53614c	opti: 路由	2017-08-11 15:02:07 +08:00
wenbo.dong	e255712852	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-11 11:05:34 +08:00
zwjamnsss	300cdf23c6	feat: 项目页面路由	2017-08-11 10:44:45 +08:00
wenbo.dong	dd8f48587f	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-10 21:23:50 +08:00
wenbo.dong	65fc1ae7ac	feat: 新建项目页布局	2017-08-10 21:23:47 +08:00
zwjamnsss	20971295f0	feat: 项目路由	2017-08-10 20:56:30 +08:00
zwjamnsss	94d4bf2378	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev	2017-08-10 20:08:52 +08:00
zwjamnsss	ab2e15f297	opti: 将login改成user	2017-08-10 20:08:23 +08:00
wenbo.dong	f52a576e25	feat: 新建项目页面初始化	2017-08-10 18:26:46 +08:00
zwjamnsss	3d66d5389b	opti: 晚上目录结构	2017-08-10 16:00:52 +08:00