sean
|
e058da4cf7
|
fix: path add \. rule
|
2017-07-26 11:34:25 +08:00 |
|
sean
|
a486469e02
|
Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev
|
2017-07-26 11:26:32 +08:00 |
|
sean
|
1fb2111c3c
|
feat: 因部署从git删除runtime,改为每次安装自动生成runtime/config.json配置
|
2017-07-26 11:26:28 +08:00 |
|
wenbo.dong
|
9db330d1dd
|
fix: 修改项目线上玉米和基本路径无法修改的bug
|
2017-07-25 21:51:14 +08:00 |
|
sean
|
0067d23e64
|
fix qsso first login params bug
|
2017-07-25 15:42:05 +08:00 |
|
sean
|
b6fca96979
|
fix qsso login need click double and delete project auth bug
|
2017-07-25 10:22:45 +08:00 |
|
waliang.wang
|
9e6f7d5caf
|
解决冲突
|
2017-07-24 19:44:46 +08:00 |
|
wenbo.dong
|
59c7eb1bfe
|
fix: 处理新建或修改项目时basepath验证错误的问题
|
2017-07-24 19:35:15 +08:00 |
|
sean
|
19c826aa19
|
fix: fix project/list uids bug
|
2017-07-24 16:28:58 +08:00 |
|
sean
|
d8208fbb5c
|
fix: fix userModel uids bug
|
2017-07-24 16:01:53 +08:00 |
|
李放
|
3d46e72106
|
Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev
|
2017-07-24 12:26:01 +08:00 |
|
李放
|
2ecbc84610
|
docs: log的save功能注释
|
2017-07-24 12:25:46 +08:00 |
|
sean
|
e0fdafe3fc
|
feat: 完善path验证规则
|
2017-07-24 11:24:08 +08:00 |
|
waliang.wang
|
9d9b7cd444
|
put 接口
|
2017-07-24 11:10:23 +08:00 |
|
waliang.wang
|
a6b29de66f
|
feat - 编辑接口
|
2017-07-24 10:59:17 +08:00 |
|
sean
|
4592c344a2
|
feat: doc and fix some bug
|
2017-07-21 11:46:44 +08:00 |
|
sean
|
6d4948503e
|
fix: fix project interface bug and change app.js to App.js
|
2017-07-21 10:03:34 +08:00 |
|
李放
|
95a485f7be
|
Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev
|
2017-07-20 20:30:28 +08:00 |
|
李放
|
a8774cb5ca
|
opti: 去除log多余接口
|
2017-07-20 20:30:24 +08:00 |
|
sean
|
9d1a4fc83e
|
Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev
|
2017-07-20 19:47:16 +08:00 |
|
sean
|
d6fb9e160e
|
fix: fix interface up bug
|
2017-07-20 19:47:10 +08:00 |
|
李放
|
347fde14bc
|
Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev
|
2017-07-20 19:22:03 +08:00 |
|
李放
|
2fd9ab85a4
|
feat: 添加node的model及基本增删查改功能接口
|
2017-07-20 19:21:46 +08:00 |
|
sean
|
a1bb3932fd
|
fix: group_id to project_id in the interface model
|
2017-07-20 18:37:00 +08:00 |
|
sean
|
02023733cb
|
feat: interface add title field
|
2017-07-20 16:14:20 +08:00 |
|
sean
|
cb61d2a2ee
|
feat: merge to local
|
2017-07-20 15:28:21 +08:00 |
|
sean
|
bb856df4ca
|
feat: project prd_host add protocol field
|
2017-07-20 15:26:26 +08:00 |
|
李放
|
4e56f2f624
|
fix: 修改model listCount没有筛选条件
|
2017-07-20 11:19:39 +08:00 |
|
sean
|
a14d0c3f31
|
Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev
|
2017-07-19 20:01:35 +08:00 |
|
sean
|
4427c175ed
|
fix: count project bug
|
2017-07-19 20:01:29 +08:00 |
|
李放
|
432a995e4a
|
opti: 优化list接口返回total字段
|
2017-07-19 19:55:25 +08:00 |
|
sean
|
ffe94bb826
|
feat: group add permisition
|
2017-07-19 19:38:48 +08:00 |
|
sean
|
3c537590c8
|
feat: user module in the client
|
2017-07-19 13:58:12 +08:00 |
|
sean
|
7ce6def425
|
feat: user client module
|
2017-07-18 19:47:38 +08:00 |
|
sean
|
3dd91589d5
|
feat: user
|
2017-07-18 17:18:16 +08:00 |
|
sean
|
01d215d7a5
|
feat: user module
|
2017-07-18 17:15:29 +08:00 |
|
李放
|
03004ac92a
|
fix: merge code
|
2017-07-18 16:46:19 +08:00 |
|
李放
|
6e0e7a3ad8
|
opti: 优化分页查询逻辑
|
2017-07-18 16:37:28 +08:00 |
|
sean
|
ed978f2473
|
fix: merge to local
|
2017-07-18 15:50:07 +08:00 |
|
sean
|
5d11a7b2d3
|
fix: fix some bug
|
2017-07-18 15:48:05 +08:00 |
|
祝鑫奔
|
e356727125
|
chore: remove files in server_dist/
|
2017-07-18 15:47:06 +08:00 |
|
祝鑫奔
|
7af682c88a
|
Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev
|
2017-07-18 15:41:38 +08:00 |
|
祝鑫奔
|
52f97df53f
|
fix: 解决merge留下的问题
|
2017-07-18 15:41:18 +08:00 |
|
sean
|
20a9374ee8
|
feat: merge to local
|
2017-07-18 15:39:50 +08:00 |
|
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 |
|
sean
|
ef1a26c222
|
feat: modify db config
|
2017-07-17 16:24:00 +08:00 |
|
sean
|
2a4867e5c0
|
feat: modify db config_dev
|
2017-07-17 15:51:15 +08:00 |
|
sean
|
00e4f3e23e
|
chore: modify dev config
|
2017-07-17 13:47:46 +08:00 |
|
sean
|
8be7c6e8a3
|
feat: user module client
|
2017-07-17 11:01:05 +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
|
8f9dfa7e4c
|
add sendMail and install
|
2017-07-11 16:53:14 +08:00 |
|
sean
|
24651b423a
|
add sendMail and install website
|
2017-07-11 16:50:17 +08:00 |
|
waliang.wang
|
f3e736671a
|
Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into wangliang
|
2017-07-11 12:41:27 +08:00 |
|
sean
|
20a8b18bdb
|
add user login and reg
|
2017-07-11 12:13:38 +08:00 |
|
waliang.wang
|
70c4942678
|
解决冲突
|
2017-07-11 12:13:11 +08:00 |
|
sean
|
8311f6021c
|
user login and reg
|
2017-07-11 12:12:43 +08:00 |
|
lwg
|
6014f8b524
|
user
|
2017-07-11 10:17:44 +08:00 |
|
zwjamnsss
|
cd5dff1045
|
merge
|
2017-07-10 21:45:46 +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
|
fb58f369dc
|
fix createAction singer bug
|
2017-07-10 11:59:13 +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
|
874d333df9
|
user
|
2017-07-06 19:56:45 +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 |
|
zwjamnsss
|
cd4a7ff052
|
lint
|
2017-07-06 01:15:06 +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 |
|