Commit Graph

3619 Commits

Author SHA1 Message Date
chenjianxing 2c47bcc073 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-13 19:33:58 +08:00
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
BugKing a680fc5779
docs: 更新 readme 图片地址 2020-11-13 10:46:51 +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
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
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
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
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
shiziyuan9527 e6231fc07e fix(测试跟踪): 修复测试计划左侧模块树展开异常的问题 2020-11-09 10:53:13 +08:00
wenyann 1e5e19417e style(API): 接口测试报告页面在左侧请求列表中增加结果状态显示 2020-11-06 13:58:06 +08:00
chenjianxing fcf879d06f fix(测试跟踪): 用例导出报错 2020-11-06 09:39:46 +08:00
Captain.B 8ccca7dc03 feat(系统设置): 显示设置 sql 2020-11-05 18:04:27 +08:00
Captain.B c3c79dd929 Merge remote-tracking branch 'origin/master' into master 2020-11-05 17:18:58 +08:00
Captain.B d8b0af015c refactor(系统设置): 显示设置当license无效的时候不显示菜单 2020-11-05 17:18:35 +08:00
chenjianxing 63e234b74b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-05 17:16:48 +08:00
chenjianxing 33ebc1e065 refactor(接口测试): 选择mutipart/from-data后,清除其他content-type 2020-11-05 17:16:30 +08:00
Captain.B 0b08a3d06d Merge remote-tracking branch 'origin/master' into master 2020-11-05 16:53:53 +08:00
Captain.B 4f7768a8e0 feat(性能测试): 性能测试支持jar 2020-11-05 16:45:45 +08:00
chenjianxing ae83c6aecd Merge branch 'v1.4' 2020-11-05 15:42:54 +08:00
shiziyuan9527 6e287d6188 feat: 删除资源池时提示哪些测试正在使用 2020-11-05 15:30:38 +08:00
Captain.B ff6015754a Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-11-05 15:18:12 +08:00
Captain.B 31ee098a9c feat(系统设置): 显示设置拦截器过滤修改 2020-11-05 15:15:46 +08:00