Commit Graph

1779 Commits

Author SHA1 Message Date
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
wenyann 5def220676 Merge remote-tracking branch 'origin/master' 2020-11-05 14:55:17 +08:00
wenyann e54bd0dc14 fix: 性能测试消息发送失败 2020-11-05 14:54:39 +08:00
shiziyuan9527 1625bff625 fix: 删除项目时强制删除项目下的资源 2020-11-05 14:41:13 +08:00
Captain.B b3682de7a4 feat(系统设置): 显示设置 2020-11-05 12:32:24 +08:00
Captain.B da97ae04fd Merge remote-tracking branch 'origin/master' into master 2020-11-05 09:36:08 +08:00
Captain.B e0c0b05ace feat(系统设置): 显示设置 2020-11-05 09:35:36 +08:00
wenyann c1f4c8cba3 fix: 修复用例评审评论链接 2020-11-04 18:09:11 +08:00
chenjianxing 5303b19d08 fit: 定时任务邮件通知页面权限问题 2020-11-04 15:13:23 +08:00
Captain.B 2183154d4d Merge remote-tracking branch 'origin/master' into master 2020-11-04 14:03:58 +08:00
Captain.B 24bae7736d refactor(性能测试): 性能测试生成错误之后转到日志详情 2020-11-04 14:03:28 +08:00
chenjianxing 66fb90d8fb fix(测试跟踪): 测试用例导出报错 2020-11-04 12:35:38 +08:00
chenjianxing 26ba9a93ea Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-04 11:17:07 +08:00
chenjianxing b5fe5fad10 fix(接口测试): xpath断言保存不生效 2020-11-04 11:16:58 +08:00
shiziyuan9527 7e395a4209 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-04 10:49:00 +08:00
shiziyuan9527 12e86889f7 feat(测试跟踪): 测试计划列表增加进度列 2020-11-04 10:48:50 +08:00
chenjianxing aea60b4827 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-03 21:19:12 +08:00
wenyann c0d933b94b fix: 推送消息显示用户名称 2020-11-03 18:30:24 +08:00
chenjianxing 4dc7d457f3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-03 17:34:26 +08:00
chenjianxing db65773cb0 Merge branch 'v1.4' 2020-11-03 17:34:13 +08:00
shiziyuan9527 ce0a688130 refactor(测试跟踪): 优化测试跟踪首页查询 2020-11-03 14:33:20 +08:00
wenyann 4576b38f80 Merge remote-tracking branch 'origin/master' 2020-11-03 11:21:32 +08:00
wenyann 65872f1659 fix: 删除无用代码 2020-11-03 11:20:38 +08:00
chenjianxing b97cf5aeaf feat(接口测试): xpath断言 2020-11-03 09:36:11 +08:00
Captain.B 587f41b962 Merge remote-tracking branch 'origin/master' into master 2020-11-02 17:12:08 +08:00
Captain.B b44e3d623e Merge branch 'v1.4' into master 2020-11-02 17:11:44 +08:00
Captain.B 891b6b8efa fix: 修复flyway 2020-11-02 17:11:36 +08:00
Captain.B e983319e9a fix: 修复flyway 2020-11-02 17:11:09 +08:00
wenyann 352d464ca6 fix: 修复测试计划,钉钉提示语为空,修改日志 2020-11-02 16:51:06 +08:00
shiziyuan9527 b749f6277b refactor: 添加方法注释 2020-11-02 15:21:08 +08:00
chenjianxing 870f9f9388 Merge branch 'v1.4' 2020-11-02 14:37:36 +08:00
Captain.B d5f231bf32 fix(性能测试): 修复性能测试定时任务报告不发送通知
(cherry picked from commit 4534463216)
2020-11-02 13:21:37 +08:00
Captain.B 4534463216 fix(性能测试): 修复性能测试定时任务报告不发送通知 2020-11-02 13:20:44 +08:00
Captain.B fc27054a1f Merge remote-tracking branch 'origin/master' into master 2020-10-30 18:16:37 +08:00
Captain.B d4160967d7 Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-30 15:59:15 +08:00
Captain.B 8fc99f8514 refactor: 判断是否是ldaps不区分大小写 2020-10-30 15:58:49 +08:00
Captain.B f1f4cc334c refactor: 判断是否是ldaps不区分大小写 2020-10-30 15:58:29 +08:00
shiziyuan9527 4e911ebb92 fix(测试跟踪): 修复测试用例模块未拖拽成功时也会发送请求的问题 2020-10-30 15:43:30 +08:00
Captain.B 2ea919a056 Merge remote-tracking branch 'origin/master' into master 2020-10-30 15:23:02 +08:00
Captain.B e17c64b0b8 feat(性能测试): 上传的csv文件自动转成相对路径 2020-10-30 15:22:43 +08:00
shiziyuan9527 021d3caf4f feat(测试跟踪): 测试用例同级模块排序 2020-10-30 15:20:27 +08:00
chenjianxing 713257c4d5 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-30 14:07:57 +08:00
chenjianxing 5cf7018490 fix(接口测试): 插件录制导入put请求报错 2020-10-30 14:07:47 +08:00
wenyann ed211e2e5d fix: 去除警告⚠️ 2020-10-30 14:01:01 +08:00
q4speed b7ce2f8025 fix(接口测试): pom去掉重复依赖 2020-10-30 13:50:49 +08:00
wenyann b2469cb1c4 fix: 排序空指针异常 2020-10-30 13:20:57 +08:00
q4speed 2063612252 fix(接口测试): 修复dubbo客户端v2.7.7以上版本在进行泛化调用server端为v2.6.x以前版本时出现No Provider错误 2020-10-30 12:07:41 +08:00
wenyann e9d13d89d9 feat:flyway修改 2020-10-30 10:45:38 +08:00
wenyann fcfc7a2615 feat: 设置默认值 2020-10-30 10:35:09 +08:00
chenjianxing b2c03a4bde fix: flyway 文件版本冲突 2020-10-30 09:42:42 +08:00
chenjianxing 36bcea6ca6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-29 20:54:42 +08:00
chenjianxing aa4ba14780 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-29 20:53:19 +08:00
chenjianxing 3927da1d02 refactor(接口测试): 测试报告格式化优化 2020-10-29 20:52:16 +08:00
shiziyuan9527 af295a9fd8 refactor: flyway 2020-10-29 18:43:29 +08:00
wenyann 12387c9253 feat: 消息设置内容修改 2020-10-29 18:35:07 +08:00
shiziyuan9527 08183e425e Merge branch 'tree-sort' 2020-10-29 18:30:46 +08:00
shiziyuan9527 25d62b6397 feat(测试跟踪): 测试用例同级模块排序 2020-10-29 18:16:35 +08:00
wenyann 9b07c26e05 Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-29 17:40:04 +08:00
wenyann 2fd79fdd5c feat: 消息设置内容修改,排序 2020-10-29 17:39:38 +08:00
Captain.B 4a855be014 refactor: 启动失败清理任务 2020-10-29 15:04:48 +08:00
Captain.B 8300285c8b refactor: 去掉不用的import 2020-10-29 14:21:39 +08:00
Captain.B 32fff6a239 refactor: 修改字段长度 2020-10-29 09:35:30 +08:00
chenjianxing aa0a7bfa20 fix: 修复消息通知sql脚本版本 2020-10-28 19:34:12 +08:00
wenyann 753b9da5c1 Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-28 18:54:37 +08:00
wenyann 55d41d50a2 feat: 消息设置性能测试 2020-10-28 18:54:02 +08:00
q4speed 9be3a0370c Merge remote-tracking branch 'origin/v1.4' into v1.4
# Conflicts:
#	frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
2020-10-28 17:30:19 +08:00
q4speed b7af640080 feat(接口测试): 增加脚本断言 2020-10-28 17:25:41 +08:00
shiziyuan9527 5b305a288a fix(用例评审): 用例评审列表用户ID修改为用户名 2020-10-28 17:05:23 +08:00
Captain.B baa5b09b0d feat(性能测试): 性能测试error统计 2020-10-28 16:42:19 +08:00
Captain.B 20e7b04d5b fix: 修复改了资源池之后资源池ID变了的问题 2020-10-28 12:33:57 +08:00
Captain.B 9a34a5f27f fix: 修复改了资源池之后资源池ID变了的问题 2020-10-28 12:19:19 +08:00
Captain.B d26c05a306 feat: 测试计划用例列表高级搜索中增加按执行人搜索 2020-10-28 10:37:01 +08:00
chenjianxing 319b54ca7e fix(测试跟踪): 测试用例导出报错 2020-10-28 09:58:48 +08:00
chenjianxing 4dfc963c40 Merge branch 'v1.4' 2020-10-27 23:47:44 +08:00
chenjianxing c63327397a Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-27 23:47:00 +08:00
chenjianxing 72006d16f0 fix(测试跟踪): 解决旧版本保存用例导出报错 2020-10-27 23:45:53 +08:00
Captain.B f119fe08d1 Merge branch 'v1.4' into master 2020-10-27 17:55:05 +08:00
Captain.B c16bc0ca8e feat(LDAP): 支持LDAPS, 区分ldap和ldaps 2020-10-27 17:53:48 +08:00
Captain.B d55a2605cf Merge branch 'v1.4' into master 2020-10-27 17:45:06 +08:00
Captain.B 8988059e54 feat(LDAP): 支持LDAPS 2020-10-27 17:43:50 +08:00
Captain.B 32f130c05e Merge branch 'v1.4' into master 2020-10-27 13:26:00 +08:00
fit2-zhao f239183989 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-27 11:44:32 +08:00
fit2-zhao 200c397950 feat(测试跟踪): 添加索引 2020-10-27 11:29:05 +08:00
shiziyuan9527 7add174a32 feat(测试跟踪): 用例评审评论支持编辑和删除 2020-10-27 11:26:34 +08:00
chenjianxing 32771d7c6e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-26 19:12:58 +08:00
chenjianxing 8efda5ef5e refactor(接口测试): 优化jsonpath推荐 2020-10-26 19:12:46 +08:00
Captain.B 04d10717de Merge branch 'v1.4' into master 2020-10-26 17:49:42 +08:00
wenyann d9db503bb3 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-26 17:13:11 +08:00
wenyann 6b5361f8b2 fix(消息设置):性能测试通知 2020-10-26 17:12:50 +08:00
chenjianxing acdca004f5 merge origin 2020-10-26 14:36:49 +08:00
chenjianxing fd962b2c1d fix(接口测试): TCP请求导入报错 2020-10-26 14:32:39 +08:00
Captain.B da55ae6ca3 Merge branch 'v1.4' into master 2020-10-26 14:22:24 +08:00
Captain.B d5e635d872 fix: 修复logback中的sql日志无法配置的问题 2020-10-26 14:21:29 +08:00
Captain.B a186fda880 Merge branch 'v1.4' into master 2020-10-26 13:51:40 +08:00
chenjianxing 42ef1bcc89 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-26 11:34:46 +08:00