Commit Graph

32 Commits

Author SHA1 Message Date
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
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
李放
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
b584b85b20 add sendMail and install website 2017-07-11 16:50:17 +08:00
suxiaoxin
7e81b1688a user login and reg 2017-07-11 12:12:43 +08:00
lwg
c97b538740 登录注册 2017-07-10 20:51:04 +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
lwg
7551deb761 user 2017-07-06 20:55:02 +08:00
lwg
b17dd1f260 用户登录 2017-07-06 18:25:53 +08:00
lwg
345435a515 user 2017-07-05 17:59:53 +08:00