Commit Graph

148 Commits

Author SHA1 Message Date
suxiaoxin
37d95b5ece feat: add user nav info 2017-07-28 17:29:17 +08:00
waliang.wang
6c7bf055bd fix: 成员项目管理 下拉 2017-07-28 15:12:55 +08:00
suxiaoxin
d0c3682746 fix: config.json path 2017-07-27 20:22:54 +08:00
祝鑫奔
b0e38af361 opti: 修复eslint错误 2017-07-27 19:49:26 +08:00
suxiaoxin
e3b39c061c Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-27 18:00:47 +08:00
suxiaoxin
bb9c05f035 feat: add server_ip 2017-07-27 18:00:43 +08:00
qitmac000249
e781bd3071 fix: 修改user页面细节 2017-07-27 15:50:04 +08:00
suxiaoxin
b604295a07 fix: package 2017-07-27 14:58:32 +08:00
suxiaoxin
3517bf0959 feat: ops 2017-07-27 14:21:22 +08:00
suxiaoxin
4c1eff6404 chore: ops 2017-07-27 12:03:18 +08:00
suxiaoxin
8d6de5d3f2 feat: 因部署修改runtime路径 2017-07-27 11:50:15 +08:00
suxiaoxin
0c84398e38 fix: install init runtime bug 2017-07-27 10:04:57 +08:00
suxiaoxin
44fe60cdf9 feat: merge to local and fix some conflict 2017-07-27 09:17:02 +08:00
suxiaoxin
f80c234427 fix: install init runtime path bug 2017-07-27 09:11:43 +08:00
祝鑫奔
f58b2fa794 fix: 添加eslint并修复部分格式问题 2017-07-26 22:03:18 +08:00
suxiaoxin
4cd5730cc1 fix: veriry interface unique bug 2017-07-26 17:56:51 +08:00
suxiaoxin
c701cb388f fix: mockserver init ver bug 2017-07-26 15:31:16 +08:00
suxiaoxin
be42920b36 feat: params trim 2017-07-26 14:22:59 +08:00
suxiaoxin
af26225f67 fix: path add \. rule 2017-07-26 11:34:25 +08:00
suxiaoxin
fb8b980958 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-26 11:26:32 +08:00
suxiaoxin
1051dc8e03 feat: 因部署从git删除runtime,改为每次安装自动生成runtime/config.json配置 2017-07-26 11:26:28 +08:00
wenbo.dong
9f69453bd4 fix: 修改项目线上玉米和基本路径无法修改的bug 2017-07-25 21:51:14 +08:00
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
suxiaoxin
80b1095852 add third qunar sso login 2017-07-12 17:01:27 +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
suxiaoxin
7e81b1688a user login and reg 2017-07-11 12:12:43 +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
lwg
4a33e7d7c6 Merge branch 'dev' into yapilwg 2017-07-06 20:55:36 +08:00
lwg
7551deb761 user 2017-07-06 20:55:02 +08:00
suxiaoxin
ee8dd9f759 add example code 2017-07-06 20:53:26 +08:00
lwg
dea5b33bf4 user 2017-07-06 19:56:45 +08:00
lwg
24db7f62cf Merge branch 'dev' into yapilwg 2017-07-06 19:48:25 +08:00
suxiaoxin
610a3a7a7b add ydoc config and add project module 2017-07-06 19:21:54 +08:00
lwg
b17dd1f260 用户登录 2017-07-06 18:25:53 +08:00
lwg
345435a515 user 2017-07-05 17:59:53 +08:00
suxiaoxin
22fcd60c6b add baseController 2017-07-05 17:47:51 +08:00
suxiaoxin
65f2dca96f add getInst method that create model singleton 2017-07-05 16:52:48 +08:00
suxiaoxin
6d42c019b5 controller and model change to class and can extend parent class 2017-07-05 16:17:58 +08:00
suxiaoxin
d46f30b326 add group controller and models 2017-07-04 17:19:20 +08:00
suxiaoxin
7964c4424b abandon global var and use import yapi method 2017-07-04 16:43:07 +08:00
suxiaoxin
f82bf88018 init project path 2017-07-03 16:16:05 +08:00