236 Commits

Author	SHA1	Message	Date
sean	094d17a196	feat: merge to local	2017-07-18 15:38:26 +08:00
祝鑫奔	0eba4c2854	fix: 修复用户搜索返回值字段问题	2017-07-18 15:37:21 +08:00
sean	7749672f26	feat: uesr management module and fix some server bug	2017-07-18 15:35:32 +08:00
祝鑫奔	165101c4ec	fix: 修复用户搜索返回密码和盐及过滤项目搜索字段	2017-07-18 15:31:41 +08:00
李放	461f82c7df	feat: 给list接口添加分页功能	2017-07-18 15:13:47 +08:00
李放	d222205d20	docs: 增加修改密码和获取项目成员列表返回示例	2017-07-14 18:08:05 +08:00
李放	e896cc5d69	#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
李放	0126784857	add: 修改密码功能和获取项目成员列表功能	2017-07-14 17:37:26 +08:00
祝鑫奔	cb8ab8a762	docs: 增加搜索文档返回示例	2017-07-14 17:00:30 +08:00
祝鑫奔	b6656a10d2	feat: 增加用户名／email／组／项目模糊搜索	2017-07-14 16:41:14 +08:00
sean	2777297027	fix: login username bug	2017-07-13 16:13:47 +08:00
sean	3312c7d3ec	add chrome_ext	2017-07-12 20:47:20 +08:00
sean	55e519bfe7	add third qunar sso login	2017-07-12 17:01:27 +08:00
sean	6240eac465	yapi add help info	2017-07-12 12:22:10 +08:00
sean	daefcada6f	add user and interface document	2017-07-11 18:22:20 +08:00
sean	24651b423a	add sendMail and install website	2017-07-11 16:50:17 +08:00
sean	8311f6021c	user login and reg	2017-07-11 12:12:43 +08:00
lwg	8de4d10e8d	用户分组	2017-07-10 21:17:49 +08:00
lwg	5144e13f6e	登录注册	2017-07-10 20:51:04 +08:00
sean	e83d42a673	interface module	2017-07-10 20:02:44 +08:00
sean	72dae6a52f	add interface module	2017-07-10 11:56:53 +08:00
lwg	5739bbde76	userligin	2017-07-10 11:11:35 +08:00
lwg	3e245114fc	user_up	2017-07-07 12:04:14 +08:00
lwg	6c27b2d68a	Merge branch 'dev' into yapilwg	2017-07-06 20:55:36 +08:00
lwg	ef32cc6114	user	2017-07-06 20:55:02 +08:00
sean	832f58baef	add example code	2017-07-06 20:53:26 +08:00
lwg	e2e4b7f7dc	Merge branch 'dev' into yapilwg	2017-07-06 19:48:25 +08:00
sean	6343355b66	add ydoc config and add project module	2017-07-06 19:21:54 +08:00
lwg	ab15fb7053	用户登录	2017-07-06 18:25:53 +08:00
lwg	35e24e44ea	user	2017-07-05 17:59:53 +08:00
sean	bebd11d715	add baseController	2017-07-05 17:47:51 +08:00
sean	904918b11b	add getInst method that create model singleton	2017-07-05 16:52:48 +08:00
sean	ce399f4096	controller and model change to class and can extend parent class	2017-07-05 16:17:58 +08:00
sean	0662eeda86	add group controller and models	2017-07-04 17:19:20 +08:00
sean	42edf679c9	abandon global var and use import yapi method	2017-07-04 16:43:07 +08:00
sean	bb6e1b41f1	init project path	2017-07-03 16:16:05 +08:00