Commit Graph

254 Commits

Author SHA1 Message Date
wenbo.dong
dba1d60d26 feat: 创建项目请求 2017-07-14 18:02:01 +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
祝鑫奔
53482b7d11 docs: 增加搜索文档返回示例 2017-07-14 17:00:43 +08:00
祝鑫奔
51de666414 docs: 增加搜索文档返回示例 2017-07-14 17:00:30 +08:00
wenbo.dong
4334a1b0d1 feat: 新建项目功能 2017-07-14 16:54:20 +08:00
祝鑫奔
86142d9848 feat: 增加用户名/email/组/项目模糊搜索 2017-07-14 16:41:14 +08:00
zwjamnsss
5df25fbcfa opti remove actionType.js 2017-07-14 15:50:00 +08:00
suxiaoxin
1135a4ab81 chore: 修改默认的80端口 2017-07-14 15:30:22 +08:00
suxiaoxin
74eaf2c308 fix: js path 2017-07-14 15:16:27 +08:00
suxiaoxin
6c93c08ee6 fix: js path 2017-07-14 15:16:15 +08:00
zwjamnsss
e321e45952 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-14 15:16:04 +08:00
zwjamnsss
93acde85b0 feat group api 2017-07-14 15:15:59 +08:00
suxiaoxin
06352a936c chore: del repeat commit message config 2017-07-14 15:14:04 +08:00
suxiaoxin
88a88c6a6f feat: merge dev to local 2017-07-14 15:06:06 +08:00
suxiaoxin
18132f64e4 refactor: 修改dev配置和index首页 2017-07-14 15:04:24 +08:00
waliang.wang
0127e9e5b6 修改首页路由 2017-07-14 14:44:32 +08:00
waliang.wang
2411abc1e2 文件夹命名 2017-07-14 12:19:10 +08:00
suxiaoxin
775f03b182 refactor: add commit message 2017-07-14 12:00:55 +08:00
waliang.wang
dac5c9e328 删除多余action文件 2017-07-14 11:41:14 +08:00
waliang.wang
68079e102e 接口展现页面 项目成员管理 2017-07-14 11:27:34 +08:00
zwjamnsss
6ebc77d323 proxy 2017-07-14 11:22:08 +08:00
wenbo.dong
29d26944a5 docs: 修改登录页注释 2017-07-14 11:07:39 +08:00
suxiaoxin
216abe2c0f Merge branch 'dev' into 'master'
merge: dev to master

merge: dev to master

See merge request !12
2017-07-13 20:52:43 +08:00
waliang.wang
27c48c5ece 管理项目成员模块 2017-07-13 20:09:04 +08:00
wenbo.dong
b6fe780097 feat: 登录时记住密码 2017-07-13 16:58:39 +08:00
wenbo.dong
809f2835a7 feat: 记住密码到cookie中 2017-07-13 16:48:20 +08:00
qitmac000249
a42b9abea7 Feat 增加footer组件 2017-07-13 16:39:14 +08:00
suxiaoxin
f11378a82e merge dev to local 2017-07-13 16:14:26 +08:00
suxiaoxin
19466c6d6c fix: login username bug 2017-07-13 16:13:47 +08:00
yhui.yang
3de51a6032 feat:add Loading 2017-07-13 15:55:46 +08:00
yhui.yang
c2472e45de Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-13 15:53:40 +08:00
yhui.yang
cad5d750e4 feat:add Loading 2017-07-13 15:53:25 +08:00
zwjamnsss
7715b0f4c6 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-13 15:10:23 +08:00
zwjamnsss
d086927a51 font-family 2017-07-13 15:10:13 +08:00
suxiaoxin
cb0d9cca67 rm chrome_tools 2017-07-13 11:17:52 +08:00
zwjamnsss
55690f1bbb default eslint 2017-07-13 10:13:37 +08:00
qitmac000068
0fcad29701 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 21:13:41 +08:00
qitmac000068
a64ea192a3 fix:修改了header和登录框的逻辑 2017-07-12 21:13:22 +08:00
suxiaoxin
6a6b5973bc merge dev to local 2017-07-12 20:47:33 +08:00
suxiaoxin
496577a611 add chrome_ext 2017-07-12 20:47:20 +08:00
zwjamnsss
ffae5939e8 remove 2017-07-12 17:17:52 +08:00
zwjamnsss
54e3493c2f none 2017-07-12 17:17:15 +08:00
wenbo.dong
c6c2353474 e branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 17:03:18 +08:00
wenbo.dong
ac9296c4b4 add: 修改文件大小写 2017-07-12 17:03:15 +08:00
suxiaoxin
146d69f3bb merge dev to local dev 2017-07-12 17:01:56 +08:00
suxiaoxin
80b1095852 add third qunar sso login 2017-07-12 17:01:27 +08:00
zwjamnsss
da257fa1d9 Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 16:56:26 +08:00
zwjamnsss
20bdd1ce96 remove eslint.json 2017-07-12 16:56:22 +08:00
wenbo.dong
72df36d58b Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev 2017-07-12 16:39:42 +08:00