Commit Graph

11626 Commits

Author SHA1 Message Date
haifeng414 a2c9277c61 Merge remote-tracking branch 'origin/dev' into dev 2020-02-19 11:47:51 +08:00
haifeng414 52b9d0d21e 未找到关联文件时报错 2020-02-19 11:47:35 +08:00
shiziyuan9527 fd0389c86f 修改调用方式 2020-02-19 11:31:01 +08:00
Captain.B 14a6b787e0 Merge remote-tracking branch 'origin/dev' into dev 2020-02-19 11:05:08 +08:00
Captain.B 7acd70fd8b v-loading 2020-02-19 11:01:24 +08:00
haifeng414 fe87891dab Merge remote-tracking branch 'origin/dev' into dev 2020-02-19 10:55:43 +08:00
haifeng414 1bd6b77182 修改ajax回调的使用方式 2020-02-19 10:55:18 +08:00
shiziyuan9527 9a316738e3 用户列表分页和组织列表分页 2020-02-18 22:43:13 +08:00
shiziyuan9527 1265cacfd6 修改创建图标位置 2020-02-18 20:08:52 +08:00
W23123 d085c2a27d 成员管理 0.999 2020-02-18 17:41:51 +08:00
W23123 825d213221 成员管理 0.99 2020-02-18 17:31:45 +08:00
W23123 7773eda15a Merge remote-tracking branch 'origin/dev' into dev 2020-02-18 17:20:44 +08:00
W23123 71cf45d8af 成员管理 0.9 2020-02-18 17:20:21 +08:00
Captain.B 40f0159f89 workspace check owner 2020-02-18 16:27:25 +08:00
Captain.B e3825f388a project page 2020-02-18 14:16:23 +08:00
Captain.B be1daa5e87 project page limit 2020-02-18 14:06:47 +08:00
Captain.B d5470c33c9 Merge branch 'dev' of bin.github.com:fit2cloudrd/metersphere-server into dev 2020-02-18 13:49:47 +08:00
Captain.B 16a152e5ea workspace page limit 2020-02-18 13:49:06 +08:00
haifeng414 677bdb959a Merge remote-tracking branch 'origin/dev' into dev 2020-02-18 13:41:31 +08:00
haifeng414 828faeba0a 修改过滤器位置 2020-02-18 13:40:32 +08:00
W23123 d347a6dbe8 修改创建图标 2020-02-18 12:50:05 +08:00
W23123 b1343ef0d9 成员分页列表 2020-02-18 12:19:46 +08:00
W23123 f668fd6891 成员管理后端接口 加上角色验证 2020-02-18 11:34:33 +08:00
shiziyuan9527 dac30f47a5 角色切换 2020-02-17 23:58:09 +08:00
haifeng414 a30af57c28 完成创建和编辑测试时文件保存相关逻辑 2020-02-17 21:59:34 +08:00
haifeng414 a5de8cebbb 测试列表按照名称搜索 2020-02-17 16:55:33 +08:00
haifeng414 25a8ca4604 Merge remote-tracking branch 'origin/dev' into dev 2020-02-17 16:25:29 +08:00
haifeng414 54ad67d899 上传的文件保存到数据库 2020-02-17 15:00:13 +08:00
Captain.B 02c52f0fca project add list 0.1 2020-02-17 13:04:02 +08:00
haifeng414 1862341e94 删除临时添加的依赖 2020-02-15 14:05:15 +08:00
haifeng414 de2ad1337b 保存测试到数据库 2020-02-15 14:04:05 +08:00
haifeng414 25cefe71df Merge remote-tracking branch 'origin/dev' into dev 2020-02-15 10:44:28 +08:00
haifeng414 3b8f2ff32b 修改所有测试页面样式 2020-02-15 10:44:10 +08:00
shiziyuan9527 361ea39dd1 添加v-permission指令 2020-02-14 21:18:47 +08:00
haifeng414 70becf8c29 Merge remote-tracking branch 'origin/dev' into dev 2020-02-14 12:37:03 +08:00
haifeng414 6f70ceea9a 编辑测试时回显一部分数据 2020-02-14 12:34:14 +08:00
Captain.B 7f702e64a5 content -> setting 2020-02-14 12:23:19 +08:00
haifeng414 c9f185366c 解决路由跳转传参问题 2020-02-13 22:49:39 +08:00
haifeng414 416553217a 测试列表的分页实现 2020-02-13 18:24:38 +08:00
Captain.B cf28e1013d Merge remote-tracking branch 'origin/dev' into dev 2020-02-13 15:41:14 +08:00
Captain.B ebf322cde3 登录设置权限 0.1 2020-02-13 15:40:51 +08:00
haifeng414 05f62c24af Merge remote-tracking branch 'origin/dev' into dev 2020-02-13 15:38:37 +08:00
haifeng414 40f2763fa6 测试菜单栏简单实现 2020-02-13 15:38:03 +08:00
shiziyuan9527 9d997d8744 Add TestResourcePool.vue 2020-02-13 15:22:48 +08:00
Captain.B 163912046b 从cookie中取出用户 2020-02-13 14:31:57 +08:00
W23123 fec574d869 Merge remote-tracking branch 'origin/dev' into dev 2020-02-13 12:22:21 +08:00
haifeng414 10a9991252 Merge remote-tracking branch 'origin/dev' into dev 2020-02-13 12:22:12 +08:00
W23123 da97b957fd 成员管理路由 2020-02-13 12:22:06 +08:00
haifeng414 62c7ab8617 完成简单的保存逻辑 2020-02-13 12:21:56 +08:00
Captain.B 53979cc3b7 login demo 2020-02-13 11:51:42 +08:00
Captain.B fe9d6a44c6 workspace del confirm 2020-02-13 11:21:12 +08:00
Captain.B 5a7c21304a Merge branch 'master' into dev 2020-02-12 22:25:05 +08:00
haifeng414 c636d111a7 添加若干交互组件 2020-02-12 22:23:15 +08:00
haifeng414 a732a7291b 文件下载和删除的前端逻辑 2020-02-12 20:55:02 +08:00
shiziyuan9527 a3de4322ff User enable/disable 2020-02-12 19:16:00 +08:00
shiziyuan9527 baeea268f7 Merge remote-tracking branch 'origin/dev' into dev 2020-02-12 17:11:15 +08:00
shiziyuan9527 5783bf4812 Add Organization.vue 2020-02-12 17:04:44 +08:00
Captain.B b443995e15 cookie 2020-02-12 16:59:07 +08:00
Captain.B 689907cc80 vuex 2020-02-12 16:45:41 +08:00
haifeng414 1c1d419852 文件信息显示 2020-02-12 16:41:19 +08:00
Captain.B 57af617fed router roles demo 2020-02-12 16:27:51 +08:00
Captain.B 7579953c51 Merge branch 'master' into dev 2020-02-12 14:40:31 +08:00
haifeng414 be712b42f7 上传文件并输出到控制台 2020-02-12 14:21:23 +08:00
Captain.B 041093d292 Merge branch 'master' into dev
# Conflicts:
#	frontend/src/performance/components/router/router.js
2020-02-12 13:37:56 +08:00
shiziyuan9527 f2b2de0aa2 user update 2020-02-12 12:28:13 +08:00
haifeng414 e084b00d89 添加创建测试的tab 2020-02-12 11:33:08 +08:00
shiziyuan9527 27098f14e2 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-02-11 17:36:36 +08:00
Captain.B 3982976042 workspace delete 2020-02-11 17:34:03 +08:00
shiziyuan9527 8b227c09ac add User.vue and User delete,list 2020-02-11 17:24:30 +08:00
Captain.B 7ca97ac14a workspace list 2020-02-11 15:51:59 +08:00
Captain.B b09ffedbac workspace add 2020-02-11 15:24:24 +08:00
Captain.B f51ddf2039 add enter key code 2020-02-11 11:19:31 +08:00
Captain.B aa25f9513c ignore .settings 2020-02-03 18:47:15 +08:00
Captain.B 8830231352 package name changed. 2020-02-03 16:30:16 +08:00
Captain.B 253a7da6cc 8888 port not working on my mac 2020-02-03 15:16:37 +08:00
Captain.B c27167a3ba frontend backend 2020-02-03 14:04:27 +08:00