65 Commits

Author	SHA1	Message	Date
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
suxiaoxin	b584b85b20	add sendMail and install website	2017-07-11 16:50:17 +08:00
waliang.wang	0c241c9931	Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into wangliang	2017-07-11 12:41:27 +08:00
suxiaoxin	2b3ce248b2	add user login and reg	2017-07-11 12:13:38 +08:00
waliang.wang	1d5c960417	解决冲突	2017-07-11 12:13:11 +08:00
suxiaoxin	7e81b1688a	user login and reg	2017-07-11 12:12:43 +08:00
lwg	7782a20ea8	user	2017-07-11 10:17:44 +08:00
zwjamnsss	88bc75ae72	merge	2017-07-10 21:45:46 +08:00
lwg	7d887d80a4	用户分组	2017-07-10 21:17:49 +08:00
lwg	c97b538740	登录注册	2017-07-10 20:51:04 +08:00
suxiaoxin	1e5a0396c5	interface module	2017-07-10 20:02:44 +08:00
suxiaoxin	fd15aa64bf	fix createAction singer bug	2017-07-10 11:59:13 +08:00
suxiaoxin	83a5066f78	add interface module	2017-07-10 11:56:53 +08:00
lwg	abc3470010	userligin	2017-07-10 11:11:35 +08:00
lwg	018cec6338	user_up	2017-07-07 12:04:14 +08:00