Commit Graph

3429 Commits

Author SHA1 Message Date
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
Captain.B baa5b09b0d feat(性能测试): 性能测试error统计 2020-10-28 16:42:19 +08:00
shiziyuan9527 b9e5bb3355 fix(测试跟踪): 修复测试方式为自动时通过按钮被禁用的问题 2020-10-28 16:42:13 +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
Captain.B c8d3456a61 Merge branch 'v1.4' into master 2020-10-27 09:52:23 +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 3989c53eda refactor: 测试跟踪首页修改 2020-10-26 18:24:35 +08:00
Captain.B ad97428e1d feat: 测试用例前置条件换行显示 2020-10-26 18:11:30 +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
Captain.B e33e92c6d7 refactor(消息通知): 拆分组件 2020-10-26 16:13:54 +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