Commit Graph

4187 Commits

Author SHA1 Message Date
wenyann 085af5b862 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-13 17:06:51 +08:00
wenyann eba91d88d2 fix: i18n 2020-11-13 17:06:40 +08:00
shiziyuan9527 919f08431d feat: 集成zentao 2020-11-13 17:01:36 +08:00
Captain.B abd12d5d77 refactor: 下载jtl 2020-11-13 16:58:57 +08:00
Captain.B b9e79cec6e refactor(性能测试): 性能测试保存jtl 2020-11-13 16:37:56 +08:00
Captain.B f40f0bbede refactor: 下载jtl 2020-11-13 16:32:59 +08:00
Captain.B e26d3a668e refactor(性能测试): 性能测试保存jtl 2020-11-13 15:55:57 +08:00
Captain.B 28e1fb3a6f Merge remote-tracking branch 'origin/master' into master 2020-11-13 15:54:33 +08:00
Captain.B 7127f9eb3f refactor(性能测试): 性能测试保存jtl 2020-11-13 15:53:24 +08:00
wenyann d3862866fe fix: 登陆密码长度,邮箱设置 2020-11-13 14:19:14 +08:00
wenyann a94453b518 fix: 登陆密码长度,邮箱设置 2020-11-13 14:15:54 +08:00
fit2-zhao db4e528efd Merge branch 'local-api-delimit' of https://github.com/metersphere/metersphere into local-api-delimit 2020-11-13 11:27:44 +08:00
q4speed 5da28af6c5 feat(接口测试): 后端转换JMX增加场景断言 2020-11-13 11:25:19 +08:00
fit2-zhao a64723e383 Merge branch 'master' into local-api-delimit 2020-11-13 11:20:24 +08:00
q4speed 0218d3411e fix(接口测试): 修复合并分支问题 2020-11-13 11:07:15 +08:00
BugKing a680fc5779
docs: 更新 readme 图片地址 2020-11-13 10:46:51 +08:00
fit2-zhao 1a7d70a142 Merge remote-tracking branch 'remotes/origin/jmx-convert' into local-api-delimit
# Conflicts:
#	backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
#	backend/src/main/java/io/metersphere/api/dto/scenario/request/HttpRequest.java
#	frontend/src/business/components/api/test/ApiTestConfig.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
2020-11-13 10:44:03 +08:00
fit2-zhao fccabe6311 Merge remote-tracking branch 'remotes/origin/jmx-convert' into local-api-delimit
# Conflicts:
#	backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
#	backend/src/main/java/io/metersphere/api/dto/scenario/request/HttpRequest.java
#	frontend/src/business/components/api/test/ApiTestConfig.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
2020-11-13 10:43:37 +08:00
fit2-zhao 5005cbdd85 Merge branch 'master' into local-api-delimit
# Conflicts:
#	frontend/package.json
2020-11-13 09:43:20 +08:00
fit2-zhao a887840214 feat(接口定制): 基础保存功能完善 2020-11-13 09:38:37 +08:00
Captain.B 28aebdd2f0 fix(测试跟踪): 修复测试用例选择自动且关联用例为其他时,在测试计划中查看该用例出现问题 2020-11-12 15:26:06 +08:00
Captain.B 100798e0f2 refactor: 修改操作列的 min-width 2020-11-12 15:12:38 +08:00
BugKing f921173b60
Update README.md 2020-11-12 11:13:14 +08:00
q4speed 759e6e7f0d fix(接口测试): 修复空指针bug 2020-11-12 10:21:42 +08:00
Captain.B aee13a6df8 refactor(性能测试): 修改 dockerfile 保存jtl 2020-11-11 18:00:39 +08:00
Captain.B ecfc1d2596 feat(性能测试): 设置reportId参数 2020-11-11 17:59:05 +08:00
q4speed fecc4c4a7e refactor: 删除测试 2020-11-11 17:40:36 +08:00
q4speed 02e8b7b12b refactor(接口测试): 测试 2020-11-11 17:10:13 +08:00
q4speed b9126f282b fix(接口测试): 修复testclass和guiclass不正确的bug 2020-11-11 17:08:09 +08:00
shiziyuan9527 437630eb81 feat: zentao组件添加地址属性 2020-11-11 17:02:26 +08:00
Captain.B 67f411f583 Merge remote-tracking branch 'origin/master' into master 2020-11-11 16:03:41 +08:00
Captain.B 8394d88093 refactor(性能测试): 修改文件名称 2020-11-11 16:02:36 +08:00
shiziyuan9527 1ed403f92a refactor: i18n 2020-11-11 15:45:46 +08:00
shiziyuan9527 c2e3dd99a9 refactor: 拆分组件 2020-11-11 15:07:45 +08:00
q4speed fbfb606ef2 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into jmx-convert
 Conflicts:
	frontend/src/business/components/api/test/model/ScenarioModel.js
2020-11-11 13:49:09 +08:00
q4speed 5a3310a837 refactor(接口测试): 后台转换JMX 2020-11-11 13:40:24 +08:00
Captain.B 6b443008cd feat(接口测试): 增加场景级别断言配置 2020-11-11 12:09:56 +08:00
Captain.B d772fac5e3 chore: 同步submodule 2020-11-10 17:35:26 +08:00
Captain.B 8ab1065805 Merge remote-tracking branch 'origin/master' into master 2020-11-10 17:34:12 +08:00
Captain.B cb16e89eb2 fix(性能测试): 修复 rpsenable 不能切换的问题 2020-11-10 17:33:48 +08:00
shiziyuan9527 9e09d24323 fix(接口测试): 修复报告批量删除时展示数量与选中数量不一致的问题 2020-11-10 17:29:55 +08:00
shiziyuan9527 5b7dda9825 refactor: 规范组件名 2020-11-10 16:57:40 +08:00
Captain.B 3b656cb538 refactor: 修改表格 th 的 hover 事件 2020-11-10 10:58:43 +08:00
Captain.B 123a2a9046 feat(性能测试): 支持配置不同的线程组参数 2020-11-10 10:41:07 +08:00
Captain.B e1b5c32f3c refactor(接口测试): 接口的报告列表增加分页 2020-11-09 18:56:12 +08:00
fit2-zhao 9bdb4f9625 feat(接口定制): 基础保存功能完善 2020-11-09 18:44:56 +08:00
Captain.B ac8d1da7d4 feat(性能测试): 支持配置不同的线程组参数 2020-11-09 17:37:11 +08:00
Captain.B 3e57e9359d Merge branch 'master' of github.com:metersphere/metersphere into master 2020-11-09 16:49:41 +08:00
Captain.B 2d1a5a1995 feat(性能测试): 支持配置不同的线程组参数 2020-11-09 16:45:39 +08:00
chenjianxing f087d3cbb4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-09 13:55:47 +08:00