test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,439 Commits 42 Branches 174 Tags 409 MiB
Commit Graph

2978 Commits

Author SHA1 Message Date
fit2-zhao 880add8544 fix(接口自动化): 请求校验 2020-12-15 15:33:50 +08:00
shiziyuan9527 e5b007764f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 15:10:39 +08:00
shiziyuan9527 66b9962919 refactor: 创建测试时选中默认项目 2020-12-15 15:08:59 +08:00
wenyann 0590e92890 Merge remote-tracking branch 'origin/master' 2020-12-15 15:07:52 +08:00
wenyann 97bb62a9c4 fix: 修复模版为空时保存报错 2020-12-15 15:07:16 +08:00
fit2-zhao a3ccde7ea6 fix(接口自动化): 修复执行选择环境问题 2020-12-15 14:40:39 +08:00
fit2-zhao cdbaa1c208 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 14:22:05 +08:00
fit2-zhao c85cd23fc0 fix(接口自动化): 部分缺陷修复 2020-12-15 14:21:13 +08:00
wenyann df142d65f4 fix: 修复嵌套弹出框被遮罩层挡住 2020-12-15 14:18:05 +08:00
wenyann e6f51717a2 Merge remote-tracking branch 'origin/master' 2020-12-15 14:02:44 +08:00
wenyann bf5b4fc4c6 feat(API):修改切回新旧版按钮显隐 2020-12-15 14:02:00 +08:00
fit2-zhao f51af8a0ff Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 11:43:35 +08:00
fit2-zhao 236a9241d8 feat(接口自动化): 添加执行操作 2020-12-15 11:43:14 +08:00
Captain.B 5554db1959 chore: 同步模块 2020-12-15 10:47:58 +08:00
fit2-zhao f57b3dcc15 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-15 10:39:44 +08:00
fit2-zhao 0f143ecc98 fix(接口定义): 修复复制缺陷 2020-12-15 10:39:26 +08:00
chenjianxing 27c18ef8a3 refactor：模块树后端重构: 2020-12-15 10:32:11 +08:00
chenjianxing 0dc4e71eb0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 19:43:18 +08:00
chenjianxing 62252a8725 refacotr: 重构测试跟踪模块树 2020-12-14 19:42:46 +08:00
fit2-zhao a8807ec2c6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 18:51:01 +08:00
fit2-zhao 0d8bffb73f fix(接口自动化): 修改移动排序问题 2020-12-14 18:50:41 +08:00
wenyann a76a5c3067 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 18:12:00 +08:00
wenyann 860a499811 feat(API):添加消息通知默认模版 2020-12-14 18:07:02 +08:00
wenyann cbd94afb45 feat(API):添加消息通知默认模版 2020-12-14 18:06:56 +08:00
fit2-zhao 441747a6c2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 18:00:37 +08:00
fit2-zhao 5b378b4475 fix(接口定义): 修改复制名称问题 2020-12-14 18:00:21 +08:00
shiziyuan9527 80a652813f fix: 修复切换项目缺陷 2020-12-14 17:43:57 +08:00
fit2-zhao fd3c8052fc fix(接口定义): 修复执行相关缺陷 2020-12-14 17:35:16 +08:00
fit2-zhao 36acba4121 fix(接口定义): 修复执行环境缺失问题 2020-12-14 17:16:56 +08:00
fit2-zhao 6254ed1fea Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 16:58:00 +08:00
fit2-zhao 82248b22da fix(接口定义): 修改Tree 样式问题 2020-12-14 16:57:42 +08:00
shiziyuan9527 3af1825a26 feat: 切换项目后显示项目名 2020-12-14 16:17:45 +08:00
fit2-zhao 6672c7756e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 16:08:15 +08:00
fit2-zhao 97db3909e8 fix(接口定义): 批量更新完成 2020-12-14 16:07:48 +08:00
Captain.B 2f99251deb fix: 避免前端打包缺少文件 2020-12-14 15:57:56 +08:00
fit2-zhao 1efe5b0c2d fix(接口定义): 部分缺陷修复 2020-12-14 14:35:32 +08:00
fit2-zhao cd16ed684b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-14 12:21:50 +08:00
fit2-zhao 469802030c fix(接口定义): 部分缺陷修复 2020-12-14 12:19:35 +08:00
Captain.B e071f33dbd feat(性能测试-xPack): 增加k8s资源池 2020-12-14 11:42:07 +08:00
fit2-zhao 0bd4675886 feat(接口定义): 案例执行失败详情查看 2020-12-11 19:14:54 +08:00
fit2-zhao 9ff168a539 feat(接口自动化): 统一报告头 2020-12-11 18:24:25 +08:00
fit2-zhao 4402fcd010 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-11 18:02:51 +08:00
fit2-zhao 7d74605533 fix(接口定义): 缺陷修复 2020-12-11 18:01:38 +08:00
shiziyuan9527 721206ac7f fix: 删除项目后切换当前项目值 2020-12-11 17:33:48 +08:00
fit2-zhao b6401b776f fix(接口定义): 修复执行缺陷 2020-12-11 16:50:49 +08:00
chenjianxing f6d4f6257a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-11 15:53:26 +08:00
chenjianxing f8a5f249ed refactor: 滚动条样式 2020-12-11 15:52:55 +08:00
fit2-zhao 7da53d84d6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-11 15:41:48 +08:00
fit2-zhao d4ff468cf9 fix(接口定义): 修复用例加载缺陷 2020-12-11 15:41:33 +08:00
chenjianxing 934db9d33c fix(): 按钮边框颜色调整 2020-12-11 15:18:49 +08:00
chenjianxing d97bcef1a3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-11 14:42:34 +08:00
chenjianxing 12f6fa6c91 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-11 14:37:03 +08:00
chenjianxing 4b217861af fix: 解决修改请求头后 body 显示错位 2020-12-11 14:36:49 +08:00
shiziyuan9527 928f7bcf7c fix: 登录后未保存当前项目值 2020-12-11 14:36:12 +08:00
fit2-zhao a3cfeaca6c feat(接口自动化): 添加请求参数 2020-12-11 14:24:55 +08:00
fit2-zhao 8e138caed5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-11 13:50:08 +08:00
fit2-zhao 53458630d8 feat(接口自动化): 添加接口引用功能 2020-12-11 13:46:51 +08:00
chenjianxing c44957720d fix: 查看引用页面遮罩 2020-12-11 13:32:33 +08:00
chenjianxing df6b6da40f fix: 解决冲突 2020-12-11 12:51:04 +08:00
chenjianxing a45753b1eb refactor: 样式优化 2020-12-11 12:46:55 +08:00
fit2-zhao 5e22b003df Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-11 11:21:33 +08:00
fit2-zhao d75477db11 fix(接口定义): 修复选择案例缺陷 2020-12-11 11:21:05 +08:00
shiziyuan9527 f399ba2885 feat(接口测试): 资源按照项目查询 2020-12-11 10:50:43 +08:00
chenjianxing 54f5e8aad5 refator: 接口用例页面优化 2020-12-11 09:40:00 +08:00
chenjianxing 8a42d6ef37 refacort: 优化apiCaseList 2020-12-10 21:40:41 +08:00
chenjianxing e14ac46e01 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-10 20:04:50 +08:00
chenjianxing d725aea943 refactor: 样式优化 2020-12-10 20:04:30 +08:00
shiziyuan9527 fface4a873 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-10 18:29:55 +08:00
fit2-zhao 069e3105de feat(接口自动化): 修复缺陷 2020-12-10 18:29:32 +08:00
shiziyuan9527 38cf12fbcb feat(性能测试): 资源按照项目查询 2020-12-10 18:29:23 +08:00
fit2-zhao 518898658b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-10 18:16:52 +08:00
fit2-zhao 90a9877178 feat(接口自动化): 统一添加复制功能 2020-12-10 18:16:30 +08:00
chenjianxing 4d1b7af418 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-10 18:08:57 +08:00
chenjianxing abf807ad0c fix: 解决冲突 2020-12-10 18:08:37 +08:00
fit2-zhao 70c22f57e8 feat(接口自动化): 统一样式风格及统一执行处理 2020-12-10 17:42:05 +08:00
fit2-zhao a812d83c76 feat(接口自动化): 统一样式风格 2020-12-10 17:24:30 +08:00
fit2-zhao db0fa8a810 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-10 16:49:14 +08:00
fit2-zhao d5b777a55a feat(接口自动化): 统一样式风格 2020-12-10 16:48:56 +08:00
chenjianxing 61fcf80cd5 refactor: 接口定义页面优化 2020-12-10 16:24:31 +08:00
shiziyuan9527 239ce6bd5b feat(测试跟踪): 资源按照项目查询 2020-12-10 15:16:50 +08:00
wenyann ab57c77967 Merge remote-tracking branch 'origin/master' 2020-12-10 14:59:10 +08:00
wenyann 0a88b7a481 fix(API): 刷新恢复默认 2020-12-10 14:54:43 +08:00
fit2-zhao 8bfcf45844 feat(接口定义): 统一项目获取方式 2020-12-10 14:25:35 +08:00
fit2-zhao 7f98702691 feat(接口自动化): 统一项目获取 2020-12-10 13:45:10 +08:00
fit2-zhao bc49f69ede feat(接口自动化): 完成接口引用 2020-12-10 12:46:14 +08:00
fit2-zhao 1307b4d854 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-10 11:04:09 +08:00
fit2-zhao afa7527738 feat(接口定义): 完成查看引用和添加用例到测试计划功能 2020-12-10 11:03:34 +08:00
shiziyuan9527 4f1f1c85d9 feat: 切换项目 2020-12-10 10:45:22 +08:00
fit2-zhao 1f59d12f7b feat(接口自动化): 完善回收站功能 2020-12-09 19:02:26 +08:00
fit2-zhao 0660600aab Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-09 17:27:16 +08:00
fit2-zhao c021bb5647 feat(接口自动化): 完成场景添加到测试计划几查看引用功能 2020-12-09 17:26:52 +08:00
wenyann 5221ec796d Merge remote-tracking branch 'origin/master' 2020-12-09 16:49:41 +08:00
wenyann 092a79c1f1 feat(API): 接口测试新旧版本切换功能 2020-12-09 16:48:57 +08:00
fit2-zhao c0c37a7aa1 fix(接口定义): 修复部分缺陷 2020-12-09 14:20:05 +08:00
fit2-zhao f800f09b73 fix(接口定义): 修复部分样式问题 2020-12-09 13:22:08 +08:00
fit2-zhao 9f4adbbbf9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-09 12:26:20 +08:00
fit2-zhao 48c69444c7 fix(接口定义): 部分缺陷修复 2020-12-09 12:25:15 +08:00
shiziyuan9527 41290ee516 fix(系统设置): 创建项目跳转问题 2020-12-09 10:47:31 +08:00
Captain.B 9349f06c05 chore: Sync submodule 2020-12-09 10:33:35 +08:00
fit2-zhao d3040ee9df feat(接口自动化): 去除重合部分功能 2020-12-09 09:56:14 +08:00
fit2-zhao 3e15d419fb feat(接口自动化): 冲突合并 2020-12-08 20:11:48 +08:00
fit2-zhao 2ebfcc2db1 feat(接口自动化): 完成定时任务 2020-12-08 19:41:48 +08:00
Captain.B 8783af8006 Merge remote-tracking branch 'origin/master' into master 2020-12-08 17:57:46 +08:00
Captain.B 7e6a5f0a2c fix(性能测试): 修复批量删除测试报告慢的问题 
Closes #835
 2020-12-08 17:57:24 +08:00
fit2-zhao 6a8a718ff2 feat(接口自动化): 完成批量执行等 2020-12-08 17:51:59 +08:00
chenjianxing a11a54c23a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-08 17:41:41 +08:00
chenjianxing 79df8d2475 refactor(测试跟踪): 重构测试计划 2020-12-08 17:41:26 +08:00
BugKing 59c04230f1 fix(接口测试): 补充合并pr #895后缺少的路由 2020-12-08 17:17:48 +08:00
BugKing 7a0004cb5a Merge branch 'v1.5' into master 2020-12-08 17:05:11 +08:00
shiziyuan9527 dd39bb3399 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-08 16:04:25 +08:00
shiziyuan9527 3c9b61fc89 refactor(系统设置): 修改项目管理样式 2020-12-08 16:02:17 +08:00
q4speed c30e933463 Merge remote-tracking branch 'origin/master' 2020-12-08 15:33:21 +08:00
q4speed 83143a3b44 feat(接口自动化): 查看引用 2020-12-08 15:33:07 +08:00
Captain.B 48c9af48c4 Merge remote-tracking branch 'origin/master' into master 2020-12-08 15:19:48 +08:00
shiziyuan9527 c0eeab33ba Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-08 15:19:28 +08:00
shiziyuan9527 8da32177de refactor(系统设置): 创建项目 2020-12-08 15:17:59 +08:00
Captain.B 05141df790 refactor(XPack): 消息通知模版 2020-12-08 15:12:35 +08:00
fit2-zhao 6ce41bdbde Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-08 13:47:49 +08:00
fit2-zhao ffb2fc8bdc feat(接口自动化): 完成场景公共参数，修复接口定义另存用例问题 2020-12-08 13:47:09 +08:00
BugKing 7fe2164f34 style: 调整顶部导航菜单高度 2020-12-08 13:44:40 +08:00
chenjianxing d24c9c43b2 fix: 前端报错 2020-12-08 12:02:12 +08:00
chenjianxing 91d37ccafe feat(接口测试): 接口定义插件格式导入 2020-12-08 11:28:23 +08:00
chenjianxing 0d8d12b17b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-07 20:17:32 +08:00
chenjianxing 036d5a5551 feat(接口测试): 接口定义 postman 导入 2020-12-07 20:17:25 +08:00
fit2-zhao d762644d87 feat(接口自动化): 完成场景调试，和基础报告 2020-12-07 19:08:26 +08:00
fit2-zhao b848830976 feat(接口自动化): 完成场景批量执行，基础报告生成 2020-12-07 19:03:51 +08:00
shiziyuan9527 30e9bb7932 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-07 17:29:23 +08:00
shiziyuan9527 48c82d2852 feat(系统设置): 项目管理迁移至系统设置 2020-12-07 17:28:04 +08:00
Captain.B 09466ec80c fix: 修复v-xpack指令错误 2020-12-07 17:25:56 +08:00
chenfanghang a590e93b89 refactor(接口监控):http状态码监控可跳转到相应报告 2020-12-07 14:29:40 +08:00
chenjianxing 1aab595ab0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-07 11:04:00 +08:00
chenjianxing 7ba3c09a3d refacotr(接口测试): swagger 导入创建模块 2020-12-07 11:03:37 +08:00
fit2-zhao 8d7ec9b8ed Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-04 18:06:27 +08:00
Captain.B 7bfb226314 Merge remote-tracking branch 'origin/master' into master 2020-12-04 18:04:42 +08:00
chenjianxing 768ed785a9 fix(接口测试): metersphere 文件导入错误 2020-12-04 18:01:32 +08:00
fit2-zhao 57986195e7 feat(接口自动化): 完成场景调试，和基础报告 2020-12-04 18:00:37 +08:00
Captain.B faf8c1f80f Merge branch 'v1.5' into master 
# Conflicts:
#	frontend/src/business/components/api/router.js
#	frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
 2020-12-04 17:57:00 +08:00
Captain.B 0abd7209e0 fix(性能测试): 修复多个线程组不能设置线程数的问题 2020-12-04 17:56:06 +08:00
Captain.B 7ee9522298 chore: 同步 submodule 
(cherry picked from commit 9e62022ae9)
 2020-12-04 17:35:53 +08:00
BugKing 25631ce05f Revert "chore: 同步 submodule" 
This reverts commit 9e62022a
 2020-12-04 15:53:21 +08:00
chenjianxing 5b41a76935 fix(测试跟踪): 编辑用例报错 2020-12-04 10:55:51 +08:00
chenjianxing 897017be77 fix(接口测试): json结果自动格式化 2020-12-04 10:44:40 +08:00
chenjianxing 26119e21c7 Merge branch 'v1.5' of https://github.com/metersphere/metersphere into v1.5 2020-12-04 10:43:13 +08:00
chenjianxing 4441824404 refactor(接口测试): 数据库接口表头可复制 fixes #679 2020-12-04 10:42:53 +08:00
BugKing bbcebb078e Merge branch 'v1.5-temp' into v1.5 2020-12-04 09:40:04 +08:00
fit2-zhao 97e3f91008 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 19:37:33 +08:00
fit2-zhao 25238c2b32 feat(接口自动化): 完成场景引用和复制，接口的引用和复制 2020-12-03 19:36:43 +08:00
chenjianxing 02681ef715 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 19:36:15 +08:00
chenjianxing 5d37c09413 fix: 导入id和请求id一致 2020-12-03 19:36:08 +08:00
Captain.B 403e72393c Merge remote-tracking branch 'origin/master' into master 2020-12-03 16:44:57 +08:00
Captain.B 882c1d3b17 refactor: 消息设置页面重构 2020-12-03 16:42:40 +08:00
chenjianxing 18d2d68486 refactor: 删除多余代码 2020-12-03 16:32:27 +08:00
chenjianxing f581a5626f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 16:28:35 +08:00
chenjianxing 3bd7a1d049 refactor(接口测试): swagger 导入重构造 2020-12-03 16:28:23 +08:00
Captain.B 3ebec6a84a refactor: 消息设置滚动条设置 2020-12-03 16:17:52 +08:00
Captain.B 30e3432d6d fix: 修复左上角的logo的样式 2020-12-03 15:23:20 +08:00
fit2-zhao ade3fe2043 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 13:50:53 +08:00
fit2-zhao c967e59511 feat(接口自动化): 完成场景自定义标签 2020-12-03 13:50:11 +08:00
Captain.B da6d7044e3 chore: Sync submodule 2020-12-03 13:27:10 +08:00
Captain.B f2d0f87724 Merge branch 'master' into notice-refactor 2020-12-03 12:50:41 +08:00
Captain.B 22a0a94613 refactor: 重构发送通知 2020-12-03 12:46:02 +08:00
fit2-zhao b7a472a08c Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-02 19:23:05 +08:00
fit2-zhao 77a1724bc7 feat(接口自动化): 场景自动化基本画面完成 2020-12-02 19:22:58 +08:00
q4speed 7ee2374b00 refactor(接口自动化): 修改全选 2020-12-02 18:23:26 +08:00
q4speed 02a5eb9570 fix(接口自动化): 修复点击模块不能正确更新场景列表的bug 2020-12-02 15:48:47 +08:00
fit2-zhao 0450186735 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-02 15:34:58 +08:00
q4speed 4065663f55 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	frontend/src/business/components/api/automation/ApiAutomation.vue
#	frontend/src/i18n/zh-CN.js
 2020-12-02 15:34:04 +08:00
fit2-zhao c90789e48c feat(接口自动化): 场景自动化基本画面完成 2020-12-02 15:34:00 +08:00
q4speed 9e600dab94 feat(接口自动化): 场景列表 2020-12-02 15:32:16 +08:00
fit2-zhao 4e12976dfd fix(接口定义): 统一id 方便后续引用 2020-12-02 14:31:53 +08:00
fit2-zhao d571c9dc07 fix(接口定义): http 协议headers 收入到请求中 2020-12-02 14:21:17 +08:00
chenjianxing 529b003c2b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-01 21:07:39 +08:00
chenjianxing b08775dbb9 feat(接口测试): 接口定义导入 2020-12-01 21:07:32 +08:00
fit2-zhao 1a576c40b8 feat(接口自动化): 基础交互完成 2020-12-01 19:30:10 +08:00
fit2-zhao 184b7ca3f4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-01 17:49:17 +08:00
fit2-zhao 184cd9659c feat(接口自动化): 创建场景 2020-12-01 17:49:09 +08:00
fit2-zhao f62ae2bd59 fix(接口定义): 自动生成代码规范修改 2020-12-01 17:47:39 +08:00
shiziyuan9527 439cf3b89b refactor(测试跟踪): 用例评审查询优化 2020-12-01 15:00:30 +08:00
Captain.B 44e21cea8f fix: 修复display引入的问题 2020-12-01 13:23:23 +08:00
Captain.B 3a16942876 fix: 修复display引入的问题 2020-12-01 13:20:05 +08:00
Captain.B 605e308159 refactor: 消息通知页面修改 2020-12-01 11:00:46 +08:00
Captain.B e1eef7ee41 Merge remote-tracking branch 'origin/master' into master 2020-12-01 10:44:38 +08:00
Captain.B 4c38f01243 chore: Sync submodule 2020-12-01 10:44:18 +08:00
chenjianxing 65c0bf3f32 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-01 10:38:44 +08:00
chenjianxing 80fa0ab394 refactor(测试跟踪): 重构测试跟踪详情 2020-12-01 10:38:36 +08:00
Captain.B 3975954e35 Merge branch 'v1.5' into master 2020-12-01 10:31:36 +08:00
Captain.B b7fb3cc8ec fix: 修复关闭rpsLimit时，不输入rpsLimit无法保存的问题 
Closes #839
 2020-12-01 10:29:57 +08:00
Captain.B 705de64835 Merge branch 'v1.5' into master 2020-12-01 10:15:04 +08:00
Captain.B 4a26b3baf6 fix(性能测试): 去掉input中的placeholder 
Closes #838
 2020-12-01 10:14:06 +08:00
Captain.B edab268a4c Merge branch 'v1.5' into master 2020-12-01 10:00:11 +08:00
BugKing 6a4f78d2fe fix: 修复接口测试监控响应码图表不显示的问题 2020-11-30 20:44:58 +08:00
BugKing 0acc2a915d refactor: 解决合并后的冲突 2020-11-30 19:07:44 +08:00
chenfanghang 8dc013927c feat(接口监控):增加响应时间与状态监控功能 2020-11-30 18:52:57 +08:00
Captain.B 9b975c54d0 Merge remote-tracking branch 'origin/master' into master 2020-11-30 18:17:08 +08:00
Captain.B 1ba7a8365b refactor: 显示设置调整位置，提供hasLicense函数处理v-pack失效的问题 2020-11-30 18:16:53 +08:00
shiziyuan9527 3c05506204 refactor(系统设置): 调整缺陷管理平台图标大小 2020-11-30 17:57:15 +08:00
Captain.B 5491eac52e refactor: 增加一个v-xpack指令 2020-11-30 17:41:51 +08:00
fit2-zhao 4facb91b34 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 17:22:06 +08:00
fit2-zhao 388d9850a2 fix(接口定义): 校验调整 2020-11-30 17:21:47 +08:00
shiziyuan9527 6ed65e22d3 refactor(测试跟踪): 优化查询 2020-11-30 16:40:02 +08:00
shiziyuan9527 834baeac31 Merge branch 'refector' 2020-11-30 14:59:37 +08:00
fit2-zhao b9fc0c8195 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 14:30:08 +08:00
fit2-zhao ae11f66b79 feat(接口自动化): 基础结构创建 2020-11-30 14:29:49 +08:00
chenjianxing a3d98b5921 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 14:27:44 +08:00
chenjianxing 0c7ba5cb80 refactor: 认证相关请求返回4xx响应码 2020-11-30 14:27:28 +08:00
fit2-zhao 6f0458de80 feat(接口定义): 紧凑布局调整不必要的填充 2020-11-27 18:47:03 +08:00
fit2-zhao 1e558b202d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-27 18:32:10 +08:00
fit2-zhao f16abd6631 feat(接口定义): 用例加载功能优化 2020-11-27 18:31:49 +08:00
chenjianxing 30a1858ffa fix: 解决冲突 2020-11-27 18:09:30 +08:00
chenjianxing c53fe5ac4a fix(接口测试): 引用的场景支持禁用启用 2020-11-27 17:57:23 +08:00
Captain.B 88de5c9449 Merge remote-tracking branch 'origin/master' into master 2020-11-27 16:29:58 +08:00
Captain.B a1d32d79a8 Merge branch 'v1.5' into master 2020-11-27 16:29:41 +08:00
chenjianxing c0329ce42a refactor(接口测试): 数据库配置添加清空按钮 2020-11-27 16:02:35 +08:00
fit2-zhao 115ca3005b feat(接口定义): 修改自定义主题色 2020-11-27 15:52:29 +08:00
fit2-zhao 586a6fdb64 fix(接口定义): 修复加载方法 2020-11-27 14:38:22 +08:00
fit2-zhao 73204d7793 feat(接口定义): 合并master 最新代码 2020-11-27 13:59:18 +08:00
fit2-zhao 22108b3048 feat(接口定义): 合并master 最新代码 2020-11-27 13:58:25 +08:00
chenjianxing 8333c3f77d fix(测试跟踪): 首页最近测试跳转错误 2020-11-27 13:39:22 +08:00
fit2-zhao 9931403308 feat(接口定义):细节调整 2020-11-27 12:30:13 +08:00
fit2-zhao 23b2391968 feat(接口定义):高度处理 2020-11-27 11:44:58 +08:00
fit2-zhao e081448183 feat(接口定义):完成回收站功能 2020-11-27 11:30:47 +08:00
chenjianxing 320ca1c542 fix(接口测试): 单接口调试点击请求报错 2020-11-27 11:16:03 +08:00
Captain.B d2cf26b16c chore: 同步 submodule 
(cherry picked from commit 9e62022ae9)
 2020-11-27 10:20:02 +08:00
fit2-zhao 4871c9864a feat(接口定义):细节调整 2020-11-26 18:41:05 +08:00
fit2-zhao bc4aba0210 feat(接口定义): 基本功能优化完成 2020-11-26 18:29:23 +08:00
shiziyuan9527 5d1ecc51d1 refactor(测试跟踪): 优化查询 2020-11-26 18:04:15 +08:00
chenjianxing 7659f1d11b fix(接口测试): 避免定时任务时间刷新报错 2020-11-26 15:54:18 +08:00
chenjianxing 3e9767ef88 fix(接口测试): 引用环境列表通过项目过滤 2020-11-26 15:38:47 +08:00
chenjianxing a2f1e18aa7 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-26 15:05:14 +08:00
chenjianxing d3386b748a fix(测试跟踪): 报告导出样式缺失 2020-11-26 15:04:10 +08:00
fit2-zhao 5bfbf01c3d feat(接口定义): 所有协议基本完成 2020-11-26 14:23:33 +08:00
wenyann c1c8f35296 Merge remote-tracking branch 'origin/master' 2020-11-26 13:55:52 +08:00
wenyann a2e7e0ae88 fix: 2020-11-26 13:55:29 +08:00
chenjianxing c15f3064c0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-26 13:01:22 +08:00
chenjianxing 4868426241 fix(性能测试): 报告导出样式问题 2020-11-26 13:01:07 +08:00
Captain.B 9e62022ae9 chore: 同步 submodule 2020-11-26 11:52:43 +08:00
chenjianxing 479beca209 fix(测试跟踪): 测试计划开始结束时间校验 2020-11-26 10:34:38 +08:00
chenjianxing ab31922cb7 fix: session到期错误提示 2020-11-26 09:53:30 +08:00
chenjianxing cea611a783 fix(接口测试): 去掉body请求描述 2020-11-25 21:08:22 +08:00
chenjianxing a5f2da3104 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-25 19:48:13 +08:00
chenjianxing b5d926e264 fix(接口测试): 只读用户定时任务页面自动跳转 2020-11-25 19:48:04 +08:00
Captain.B 13a3820570 Merge remote-tracking branch 'origin/master' into master 2020-11-25 18:55:36 +08:00
Captain.B 57d7db8b94 Merge branch 'v1.5' into master 2020-11-25 18:55:23 +08:00
fit2-zhao 2ba69e9a32 feat(接口定义): 完成JDBC快捷调试 2020-11-25 18:52:33 +08:00
Captain.B e440d36ead fix: 修复显示设置加载图片的问题 2020-11-25 18:51:34 +08:00
chenjianxing e56c42dcc4 fix(测试跟踪): 测试用例点击全部用例展示问题 2020-11-25 17:43:08 +08:00
chenjianxing a6289cd55d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-25 17:32:12 +08:00
chenjianxing 5bf126fa2e fix(接口测试): 测试报告导出异常 2020-11-25 17:31:55 +08:00
fit2-zhao 78f4383bb3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-25 17:25:33 +08:00
fit2-zhao 2b4f8266fb fix(测试跟踪): 修复关联用例重复问题 2020-11-25 17:24:30 +08:00
Captain.B 4f93da8907 Merge branch 'v1.5' into master 
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
 2020-11-25 16:49:52 +08:00
Captain.B 245da1d1ca fix: 修复显示设置加载图片的问题 2020-11-25 16:49:20 +08:00
Captain.B 0ffe1cc414 Merge remote-tracking branch 'origin/master' into master 2020-11-25 16:39:27 +08:00
Captain.B 756c8d3fff Merge branch 'v1.5' into master 
# Conflicts:
#	frontend/src/business/components/xpack
 2020-11-25 16:39:14 +08:00
Captain.B 17142dc4b3 fix: 修复显示设置加载图片的问题 2020-11-25 16:38:31 +08:00
fit2-zhao 948fcdb3b8 feat(接口定义): SQL协议快捷调试 2020-11-25 16:32:16 +08:00
shiziyuan9527 45a7a05c14 fix(用例评审): 修复只读用户可以给用例评审加评论的问题 2020-11-25 16:23:53 +08:00
wenyann d87aad20b1 Merge remote-tracking branch 'origin/master' 2020-11-25 15:42:01 +08:00
wenyann 4bd6c8ec71 fix: 修复输入项目名称，点击enter键，项目没有创建成功，页面没有提示 
Closes 819
 2020-11-25 15:38:58 +08:00
fit2-zhao 8db0b4349a feat(接口定义): TCP，SQL，DUBBO 协议基本录入完成 2020-11-25 15:31:06 +08:00
Captain.B dcfb7a687a fix: 修复显示设置字数没有限制的问题 2020-11-25 15:26:15 +08:00
shiziyuan9527 1c635c4617 refactor(系统设置): 修改用户ID长度限制 2020-11-25 15:04:19 +08:00
BugKing 4122a81100 refactor: 去掉不必要的注释 2020-11-25 14:09:29 +08:00
BugKing b4a517c4ff style: 修改代码格式 2020-11-25 13:48:40 +08:00
BugKing 2543618ace Merge branch 'v1.5' into master 2020-11-25 13:44:57 +08:00
shiziyuan9527 e43ce4fa0a fix(系统设置): 修复创建用户时电话号码不支持199段的问题 
Closes 818
 2020-11-25 11:26:09 +08:00
BugKing 7b5dd9c14f refactor: 修改版本号 2020-11-25 11:15:29 +08:00
chenjianxing 83daf96f01 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-25 10:18:06 +08:00
chenjianxing 76e0991067 fix: 登入过期，提示报错 2020-11-25 10:17:57 +08:00
Captain.B ece7b9ebb8 Merge remote-tracking branch 'origin/master' into master 2020-11-25 09:40:11 +08:00
Captain.B 0bd6599d36 Merge branch 'v1.5' into master 2020-11-25 09:39:55 +08:00
chenjianxing fbf6b59425 fix: 修复带长度限制的文本框样式 2020-11-24 19:44:04 +08:00
fit2-zhao cbc9c42122 feat(接口定义): TCP 协议基础完成 2020-11-24 19:36:45 +08:00
chenjianxing cbf889831b refactor(接口测试): 数据库配置检验 2020-11-24 19:01:55 +08:00
Captain.B 4a0c640aee refactor: 邮件配置匿名改成免密 2020-11-24 18:33:59 +08:00
chenjianxing ed26d25ac7 refacotr(测试跟踪): 删除测试计划提示 2020-11-24 17:14:29 +08:00
chenjianxing d3ceb8ff5f fix(接口测试): jar包描述错别字 2020-11-24 15:48:34 +08:00
chenjianxing d02f530538 fix(接口测试): 请求体取消自动格式化 2020-11-24 14:36:15 +08:00
Captain.B 848a9481f8 fix(性能测试): 线程数不能小于资源池节点数 2020-11-24 13:30:32 +08:00
Captain.B 7be21db324 fix(性能测试): 线程数不能小于资源池节点数 2020-11-24 13:30:12 +08:00
fit2-zhao eaffeb8508 登录问题合并 2020-11-24 11:05:36 +08:00
fit2-zhao 9408555bba Merge branch 'master' into local-api-delimit 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/APITestService.java
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/business/components/api/report/components/ResponseText.vue
 2020-11-24 10:56:36 +08:00
Captain.B b013b8b790 Merge remote-tracking branch 'origin/master' into master 2020-11-24 10:50:23 +08:00
Captain.B a1b37a3c53 perf: 优化测试用例每页显示速度 2020-11-24 10:50:03 +08:00
fit2-zhao cef0258d2f fix(系统设置): 恢复注释内容 2020-11-24 10:43:51 +08:00
Captain.B f92209383b Merge branch 'v1.5' into master 
# Conflicts:
#	frontend/src/business/components/track/case/components/TestCaseList.vue
 2020-11-24 10:43:09 +08:00
fit2-zhao c6a981e965 feat(接口定义):添加协议处理 2020-11-24 10:42:21 +08:00
Captain.B e6fc2adb58 perf: 优化测试用例每页显示速度 2020-11-24 10:39:25 +08:00
wenyann 8d4df55549 Merge remote-tracking branch 'origin/master' 2020-11-24 10:33:59 +08:00
wenyann 1f107b69ff fix: 消息设置修改 2020-11-24 10:33:28 +08:00
chenjianxing 3225a76c43 fix(系统设置): 删除组织用户 2020-11-23 21:26:44 +08:00
chenjianxing 7ddb5f51a3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-23 20:22:10 +08:00
chenjianxing 4190eb92fd fix(接口测试): sql 查询多表格式化优化 2020-11-23 20:21:56 +08:00
fit2-zhao 4bae9662de feat(接口定义):添加协议处理 2020-11-23 19:25:28 +08:00
fit2-zhao 064735b2a4 feat(接口定义): 断言规则处理 2020-11-23 19:18:47 +08:00
fit2-zhao 0f0b11fd85 feat(接口定义): 基础参数重构 2020-11-23 19:00:21 +08:00
shiziyuan9527 a296de1afd refactor(测试跟踪): 用例评审评论换行 2020-11-23 18:56:49 +08:00
fit2-zhao f8475dca0c feat(接口定义): 按照不同协议处理 2020-11-23 18:15:09 +08:00
shiziyuan9527 f97e20ee06 fix(测试跟踪): 修复测试用例模块改变而测试计划关联用例时左侧模块未刷新的问题 2020-11-23 18:06:09 +08:00
fit2-zhao 7f2fe8acd1 feat(接口定义): 完成提取参数和断言规则 2020-11-23 15:17:19 +08:00