Commit Graph

3414 Commits

Author SHA1 Message Date
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
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
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
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
chenjianxing 71eda1637d Merge branch 'master' into v1.4 2020-10-26 11:34:12 +08:00
pencui 712de81915
新增http请求,jsonpath断言批量功能 (#599)
* 新增jsonpath断言批量推荐功能

* 修复xpack下错误的代码结构

* 补正改版后的jsonpath解析功能

Co-authored-by: root <root@localhost.localdomain>
2020-10-26 11:33:36 +08:00
chenjianxing 76455e54a5 refactor(接口测试): swagger 导入请求名称使用Summary 2020-10-26 10:57:04 +08:00
chenjianxing a7a2f495d6 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-26 10:02:04 +08:00
chenjianxing a0b2dbb53e refactor(接口测试): 修改全局变量代码模版 2020-10-26 10:01:55 +08:00
chenjianxing 8a894503b2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-26 09:59:49 +08:00
chenjianxing 7969c38ef8 refactor(接口测试): 修改全局变量代码模版 2020-10-26 09:59:40 +08:00
wenyann 578cd10143 Merge remote-tracking branch 'origin/master' 2020-10-23 18:30:59 +08:00
wenyann bc07ab7a98 feat: 消息设置测试计划时间处理 2020-10-23 18:30:37 +08:00
Captain.B d85b0141d2 Merge remote-tracking branch 'origin/master' into master 2020-10-23 18:02:07 +08:00
Captain.B aed4f98b72 Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-23 18:01:11 +08:00