Commit Graph

4833 Commits

Author SHA1 Message Date
fit2-zhao bcbc9e5a53 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-11 14:45:33 +08:00
fit2-zhao fa53228f97 fix(接口自动化): 修复SQL类型请求无法切换环境问题 2021-01-11 14:45:11 +08:00
Captain.B 2564c81302 Merge remote-tracking branch 'origin/master' 2021-01-11 14:19:25 +08:00
Captain.B d64691fe9a refactor: 性能测试表头优化 2021-01-11 14:08:48 +08:00
fit2-zhao b542049389 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-11 13:47:29 +08:00
fit2-zhao 489b2b8f10 feat(接口定义): 高级查询 2021-01-11 13:46:56 +08:00
Captain.B a00334acf3 fix: 修复查询个人信息时越权的问题
Closes #1089
2021-01-11 11:38:24 +08:00
fit2-zhao 5c8b5be24f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 18:34:55 +08:00
fit2-zhao 3ea76df748 feat(接口自动化): 场景变量页面i18n 提示优化 2021-01-08 18:32:24 +08:00
shiziyuan9527 313fb0a244 feat(测试计划): 性能测试用例执行结果 2021-01-08 18:13:47 +08:00
Captain.B e9482b3ecb Merge remote-tracking branch 'origin/master' 2021-01-08 18:05:11 +08:00
Captain.B f84d373020 fix: 修复共享变量导致通知不能发送 2021-01-08 18:04:35 +08:00
BugKing fb681bf9b3 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2021-01-08 17:56:09 +08:00
BugKing f541a70235 fix(系统设置): 修复项目列表环境管理按钮丢失问题 2021-01-08 17:54:18 +08:00
fit2-zhao f22a917f12 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 17:54:16 +08:00
fit2-zhao a57e07bba5 feat(接口自动化): 完成场景变量 2021-01-08 17:54:09 +08:00
fit2-zhao fe74a26fd2 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
2021-01-08 17:53:45 +08:00
Captain.B 3a26a9cfbc fix: 修复个人信息设置功能的bug
Closes #1087
2021-01-08 17:46:43 +08:00
Captain.B ddd640c7c1 fix: 修复个人信息设置功能的bug
Closes #1087
2021-01-08 17:44:29 +08:00
chenjianxing 9723f85c46 fix: 解决冲突 2021-01-08 17:16:32 +08:00
chenjianxing 5465d9cf64 feat: 场景添加jsonpath功能 2021-01-08 17:12:06 +08:00
shiziyuan9527 2bba395f40 refactor(测试计划): 性能测试用例执行优化 2021-01-08 16:18:37 +08:00
Captain.B 7cd5d8c661 refactor: 性能测试执行前检查资源池的状态 2021-01-08 16:08:47 +08:00
fit2-zhao 30762dae9f feat(接口自动化): 完成场景变量基础存储功能 2021-01-08 15:54:45 +08:00
Captain.B 1c385a991f Merge remote-tracking branch 'origin/master' 2021-01-08 15:22:56 +08:00
Captain.B e98d1eee56 refactor: 接口测试用例列表表头优化 2021-01-08 15:22:37 +08:00
chenjianxing a7bc099305 refactor: 全选按钮样式 2021-01-08 15:18:04 +08:00
chenjianxing 46736b254f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 14:52:34 +08:00
chenjianxing e188bb203f refactor: 固定场景保存按钮 2021-01-08 14:51:38 +08:00
chenjianxing 2286f66e0c fix: 解决冲突 2021-01-08 14:50:24 +08:00
Captain.B d37ae32045 refactor: 接口列表表头优化 2021-01-08 14:43:06 +08:00
chenjianxing c62adcfc32 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2021-01-08 14:42:17 +08:00
chenjianxing aa53e696cc fix: swagger2.0 导入失败 2021-01-08 14:40:07 +08:00
shiziyuan9527 2f8d0e9163 feat(测试计划): 批量取消性能测试用例关联 2021-01-08 14:20:04 +08:00
chenjianxing 5cbaeb06c4 refactor: 接口用例和接口自动化页面全选框样式 2021-01-08 14:12:25 +08:00
fit2-zhao 7c3b718863 fix(接口定义): 冲突合并 2021-01-08 13:49:58 +08:00
fit2-zhao ff0b258785 fix(接口定义): 修复用例最后结果统计问题 2021-01-08 13:37:57 +08:00
Captain.B ed819b4710 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
2021-01-08 13:37:18 +08:00
Captain.B 67c71ff01a refactor: 统一显示标签 2021-01-08 13:35:43 +08:00
fit2-zhao c291de3292 feat(接口自动化): 场景变量处理 2021-01-08 13:29:00 +08:00
shiziyuan9527 a8a9664070 feat(测试计划): 取消项目关联时取消性能测试用例关联 2021-01-08 11:36:41 +08:00
shiziyuan9527 963156a969 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 11:34:24 +08:00
chenjianxing 252f26ae61 fix: 接口列表tag报错 2021-01-08 11:13:50 +08:00
chenjianxing 0ab925251c feat: 添加jsonpath提取推荐 2021-01-08 11:05:35 +08:00
wenyann 019135b947 fix: 修复测试计划不全问题 2021-01-08 10:42:39 +08:00
shiziyuan9527 0caf64769a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 10:22:58 +08:00
chenjianxing 529a8b74ac Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 19:34:13 +08:00
chenjianxing 37da6206ea feat: jsonpaht断言推荐 2021-01-07 19:34:00 +08:00
shiziyuan9527 a2856898d6 refactor(测试计划): 性能测试用例按照项目查询 2021-01-07 18:57:12 +08:00
fit2-zhao f70e241602 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 18:32:48 +08:00