Commit Graph

3314 Commits

Author SHA1 Message Date
wenyann 6e5397489f Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-22 10:22:43 +08:00
wenyann dd5ee58e28 Merge remote-tracking branch 'origin/v1.4' into v1.4
# Conflicts:
#	backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
2020-10-22 10:21:46 +08:00
chenjianxing 133e1b2aea fix(系统设置): 管理员不能禁用自己 2020-10-22 10:16:09 +08:00
wenyann b5db4991e4 feat: 消息设置 2020-10-22 10:13:26 +08:00
chenjianxing 45bbd11a85 Merge branch 'v1.4' of https://github.com/metersphere/server into v1.4 2020-10-22 10:07:52 +08:00
chenjianxing 038ae06c45 fix: 只读用户点测试跟踪自动跳转 2020-10-22 10:07:36 +08:00
Captain.B c51329433a Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-22 09:54:46 +08:00
Captain.B a9394eacb3 fix(性能测试): 修复压力配置-开启RPS上限按钮,执行测试后,按钮自动关闭 2020-10-22 09:54:34 +08:00
chenjianxing 935ad0f4f0 fix(接口测试): 修复误删代码 2020-10-22 09:43:39 +08:00
shiziyuan9527 040b10c2f5 fix(测试跟踪): 修复复制测试用例时附件未复制的问题 2020-10-21 21:36:25 +08:00
Captain.B 0d6d47091d Merge branch 'v1.4' into master 2020-10-21 20:49:04 +08:00
Captain.B 2fc8e96219 fix(测试计划): 修复测试计划高级搜索 SQL 报错 2020-10-21 20:47:44 +08:00
chenjianxing 8c22317947 refactor: 删除无用代码 2020-10-21 19:47:37 +08:00
chenjianxing 063b821de7 Merge branch 'master' of https://github.com/metersphere/server 2020-10-21 19:10:46 +08:00
chenjianxing e98755d38e fix(接口测试): jar包描述长度限制 2020-10-21 19:09:20 +08:00
shiziyuan9527 815fada034 fix: 修复点击创建用例无反应的问题 2020-10-21 19:05:05 +08:00
fit2-zhao 2d5982aac6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-21 18:29:56 +08:00
fit2-zhao 892fcdebe4 fix(测试跟踪): xmind 2020 版本 导入异常修复 2020-10-21 18:29:40 +08:00
chenjianxing 21983d1ccb fix(接口测试): 编辑jar包描述字段显示问题 2020-10-21 18:29:11 +08:00
chenjianxing 4a07f74706 Merge branch 'master' of https://github.com/metersphere/server 2020-10-21 18:26:09 +08:00
chenjianxing 71a54ba8bf fix(性能测试): 全选后切换显示数量后批量删除报错 2020-10-21 18:26:00 +08:00
chenjianxing 8b863e5eaa Merge branch 'master' of https://github.com/metersphere/server 2020-10-21 18:06:35 +08:00
chenjianxing 6fffba9976 refactor(接口测试): 环境的环境域名末尾不自动添加/ 2020-10-21 18:06:27 +08:00
Captain.B 005cdc9eb5 Merge branch 'master' into v1.4 2020-10-21 17:15:39 +08:00
Captain.B 01e19e4baa Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-21 16:15:35 +08:00
Captain.B 92ab3f7ba3 fix(性能测试): 测试计划高级搜索 SQL 报错 2020-10-21 16:15:12 +08:00
BugKing 7c2d0dd8af Merge branch 'master' into v1.4 2020-10-21 16:04:46 +08:00
shiziyuan9527 fe1bea3316 feat(测试跟踪): 用例相关的计划和评审中展示附件列表 2020-10-21 16:04:41 +08:00
fit2-zhao c29dc84782 fix(测试跟踪): 修复关联用例列表显示缺陷 2020-10-21 15:53:34 +08:00
chenjianxing 0b6ee308eb refactor(测试跟踪): 模块树最大深度8层 2020-10-21 14:40:42 +08:00
chenjianxing 42d3e2098b Merge branch 'master' of https://github.com/metersphere/server 2020-10-21 14:32:42 +08:00
chenjianxing 6daec8eff0 fix(接口测试): 加载jar包 2020-10-21 14:32:22 +08:00
q4speed 1b7250cb7d Merge remote-tracking branch 'origin/master' 2020-10-21 14:17:39 +08:00
q4speed 47c3e40805 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-21 14:17:00 +08:00
q4speed c074fd77ef fix(接口测试): 修复TCP请求服务器或IP必填的bug 2020-10-21 14:14:22 +08:00
shiziyuan9527 4866c32746 feat(测试跟踪): 保存评审结果后自动跳转下一条用例 2020-10-21 14:14:13 +08:00
shiziyuan9527 49bd060cad refactor(测试跟踪): 测试用例附件的修改时间改为上传时间 2020-10-21 13:41:09 +08:00
q4speed 4b1b420f33 refactor(接口测试): 优化代码 2020-10-21 10:42:11 +08:00
Captain.B 17d060d279 Merge branch 'master' into v1.4 2020-10-21 10:25:53 +08:00
chenjianxing 8f4460a880 refactor: 回退jar包部分代码 2020-10-21 10:21:32 +08:00
Captain.B 2b99693b3f refactor: 调整flyway 2020-10-21 09:43:52 +08:00
Captain.B 40d217b75b refactor: 调整flyway 2020-10-21 09:41:53 +08:00
Captain.B 869a4a315e Merge branch 'master' into v1.4 2020-10-21 09:26:06 +08:00
wenyann e35a400bb0 Merge remote-tracking branch 'origin/master' 2020-10-21 00:10:19 +08:00
wenyann b38fbf034e feat: 消息设置 2020-10-21 00:09:23 +08:00
shiziyuan9527 bd8ca07af6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-20 18:55:42 +08:00
shiziyuan9527 876cc63d02 refactor: i18n 2020-10-20 18:51:41 +08:00
chenjianxing e3a90f98ca Merge branch 'master' of https://github.com/metersphere/server 2020-10-20 18:44:14 +08:00
chenjianxing 1632b3fe13 refactor: 代码优化 2020-10-20 18:44:05 +08:00
shiziyuan9527 21dd0e7508 refactor(用例评审): 调整用例评审页面评审按钮的位置 2020-10-20 18:35:33 +08:00