Commit Graph

3457 Commits

Author SHA1 Message Date
Captain.B
41340cde89 refactor: 修改 kafka 日志 <!-- avoid recursive logging --> 2020-11-02 12:10:32 +08:00
Captain.B
fc27054a1f Merge remote-tracking branch 'origin/master' into master 2020-10-30 18:16:37 +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
e09e04c9ec refactor: 点击报告行跳转报告页面 2020-10-30 15:37:55 +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
wenyann
d1665940c7 fix: i18n 2020-10-30 14:39:55 +08:00
wenyann
ed211e2e5d fix: 去除警告⚠️ 2020-10-30 14:01:01 +08:00
wenyann
b2469cb1c4 fix: 排序空指针异常 2020-10-30 13:20:57 +08:00
chenjianxing
6416f6c2fc fix(接口测试): 环境中变量填写样式问题 2020-10-30 11:42:37 +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
c3f34416fa merge branch 'v1.4' 2020-10-29 20:53:56 +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
cfa053968d Merge branch 'v1.4' into master 2020-10-29 15:55:40 +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
d47ba3348e Merge branch 'v1.4' into master 2020-10-29 10:33:24 +08:00
Captain.B
32fff6a239 refactor: 修改字段长度 2020-10-29 09:35:30 +08:00
chenjianxing
e0ad8aab85 Merge branch 'v1.4' 2020-10-28 19:46:51 +08:00
chenjianxing
aa0a7bfa20 fix: 修复消息通知sql脚本版本 2020-10-28 19:34:12 +08:00
chenjianxing
f5f5b35968 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 19:30:24 +08:00
chenjianxing
d564296a97 fix(接口测试): 场景url拼接不正确 2020-10-28 19:30:15 +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
chenjianxing
29cd976431 fix(接口测试): 文件上传自定义content-type 2020-10-28 18:02:36 +08:00
chenjianxing
0dbf3b943d Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 17:34:26 +08:00
chenjianxing
2bb75e753d fix(接口测试): 项目列表控制台报错 2020-10-28 17:33:54 +08:00
q4speed
53ba1ac3e1 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 17:32:18 +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
chenjianxing
370863834d Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 17:29:37 +08:00
chenjianxing
ab1c90a47b refactor(接口测试): sql请求结果格式化 2020-10-28 17:29:29 +08:00
chenjianxing
b28438be76 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-28 17:28:48 +08:00
chenjianxing
4aefb1c0ac refactor(接口测试): sql请求结果格式化 2020-10-28 17:28:37 +08:00
q4speed
b7af640080 feat(接口测试): 增加脚本断言 2020-10-28 17:25:41 +08:00
Captain.B
e97231657b Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-28 17:20:19 +08:00
Captain.B
9987bb9be4 feat(性能测试): 性能测试error统计 2020-10-28 17:20:04 +08:00
shiziyuan9527
5b305a288a fix(用例评审): 用例评审列表用户ID修改为用户名 2020-10-28 17:05:23 +08:00
shiziyuan9527
f3f496b484 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 16:42:45 +08:00