76 Commits

Author	SHA1	Message	Date
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
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	d80dfea9aa	feat: user style	2017-07-20 16:44:41 +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	8700012957	fix: fix ignore bug	2017-07-18 19:50:43 +08:00
suxiaoxin	0f8cfdae79	feat: user client module	2017-07-18 19:47:38 +08:00
祝鑫奔	1d7c59d163	fix: add server_dist/ files	2017-07-18 18:10:55 +08:00
suxiaoxin	5211c48d68	feat: user	2017-07-18 17:18:16 +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
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
李放	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