Commit Graph

3681 Commits

Author SHA1 Message Date
fit2-zhao
eaffeb8508 登录问题合并 2020-11-24 11:05:36 +08:00
fit2-zhao
c48bb25956 Merge branch 'master' into local-api-delimit
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/APITestService.java
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/business/components/api/report/components/ResponseText.vue
2020-11-24 11:01:29 +08:00
fit2-zhao
9408555bba Merge branch 'master' into local-api-delimit
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/APITestService.java
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/business/components/api/report/components/ResponseText.vue
2020-11-24 10:56:36 +08:00
fit2-zhao
cef0258d2f fix(系统设置): 恢复注释内容 2020-11-24 10:43:51 +08:00
fit2-zhao
c6a981e965 feat(接口定义):添加协议处理 2020-11-24 10:42:21 +08:00
wenyann
8d4df55549 Merge remote-tracking branch 'origin/master' 2020-11-24 10:33:59 +08:00
wenyann
1f107b69ff fix: 消息设置修改 2020-11-24 10:33:28 +08:00
chenjianxing
3225a76c43 fix(系统设置): 删除组织用户 2020-11-23 21:26:44 +08:00
chenjianxing
f023b9c602 refactor: 添加xpath测试用例 2020-11-23 20:58:45 +08:00
chenjianxing
7ddb5f51a3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-23 20:22:10 +08:00
chenjianxing
4190eb92fd fix(接口测试): sql 查询多表格式化优化 2020-11-23 20:21:56 +08:00
fit2-zhao
4bae9662de feat(接口定义):添加协议处理 2020-11-23 19:25:28 +08:00
fit2-zhao
064735b2a4 feat(接口定义): 断言规则处理 2020-11-23 19:18:47 +08:00
fit2-zhao
0f0b11fd85 feat(接口定义): 基础参数重构 2020-11-23 19:00:21 +08:00
shiziyuan9527
a296de1afd refactor(测试跟踪): 用例评审评论换行 2020-11-23 18:56:49 +08:00
Captain.B
5058b5e08a Merge remote-tracking branch 'origin/master' into master 2020-11-23 18:37:33 +08:00
Captain.B
6fd3cefa81 Merge branch 'v1.5' into master 2020-11-23 18:37:16 +08:00
Captain.B
c0b4b813f3 fix: 修复创建测试计划时重复提交,成功创建多个相同的计划 2020-11-23 18:36:56 +08:00
fit2-zhao
637253f538 Merge branch 'local-api-delimit' of https://github.com/metersphere/metersphere into local-api-delimit 2020-11-23 18:15:27 +08:00
fit2-zhao
f8475dca0c feat(接口定义): 按照不同协议处理 2020-11-23 18:15:09 +08:00
shiziyuan9527
f97e20ee06 fix(测试跟踪): 修复测试用例模块改变而测试计划关联用例时左侧模块未刷新的问题 2020-11-23 18:06:09 +08:00
shiziyuan9527
ab0f3535f8 fix(系统设置): 修复修改个人信息邮箱时可修改为已存在邮箱的问题 2020-11-23 16:44:02 +08:00
BugKing
d4ba08b340 fix: 修改 flyway 文件名称 2020-11-23 16:26:09 +08:00
fit2-zhao
816482d16d feat(接口定义): 数据库脚本 2020-11-23 15:43:44 +08:00
fit2-zhao
3ebc834e1f feat(接口定义): 完成提取参数和断言规则 2020-11-23 15:34:17 +08:00
fit2-zhao
7f2fe8acd1 feat(接口定义): 完成提取参数和断言规则 2020-11-23 15:17:19 +08:00
shiziyuan9527
ea3895d315 refactor: 删除无用代码 2020-11-23 14:44:54 +08:00
fit2-zhao
595c9572de feat(接口定义): 提取处理 2020-11-23 13:16:27 +08:00
wenyann
4ba24afeee fix: 添加日志,调整代码格式 2020-11-23 12:36:33 +08:00
fit2-zhao
ac0d65ee1e feat(接口定义): 断言处理 2020-11-23 12:32:49 +08:00
fit2-zhao
e008baaf2e Merge branch 'master' into local-api-delimit
# Conflicts:
#	backend/src/main/resources/i18n/messages_en_US.properties
#	backend/src/main/resources/i18n/messages_zh_CN.properties
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/business/components/api/test/ApiTestConfig.vue
2020-11-23 12:31:48 +08:00
chenjianxing
744de357c3 fit(接口测试): jsonpath 断言推荐自动转义正则特殊字符 2020-11-23 12:08:30 +08:00
chenjianxing
21ea6bc70a refactor: 升级jyphon 2020-11-23 11:37:01 +08:00
fit2-zhao
06e8d48344 feat(接口定义): 增加断言 2020-11-23 11:36:04 +08:00
chenjianxing
1b1611514c fix(接口测试): 响应时间断言格式校验 2020-11-23 11:28:26 +08:00
chenjianxing
5e7fd1f72a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-23 10:59:32 +08:00
chenjianxing
0b90d44eaa fix(测试跟踪): 关联用例为其他时,跳转到系统设置页面 2020-11-23 10:59:25 +08:00
chenjianxing
1fce27a3c1 fix(测试跟踪): 测试用例全部用例按钮无效 2020-11-23 10:20:52 +08:00
Captain.B
be8b56a36f chore: sync submodule 2020-11-23 10:00:51 +08:00
chenjianxing
ab87a73602 fix(接口测试): 环境host域名长度限制增大 2020-11-23 09:46:09 +08:00
fit2-zhao
58cbe145f7 feat(接口定义): 认证配置 完成 2020-11-20 18:56:21 +08:00
wenyann
6d3b3ccfa4 Merge remote-tracking branch 'origin/master' 2020-11-20 14:58:11 +08:00
wenyann
fc4b266511 fix: 修改任务通知-编辑,无法修改webhook地址 2020-11-20 14:57:19 +08:00
Captain.B
1ee83581a0 fix: 修复显示设置相关问题 2020-11-20 14:36:23 +08:00
Captain.B
f4fc6fc94b fix: 修复显示设置相关问题 2020-11-20 14:00:39 +08:00
Captain.B
16ab55bf4c fix(性能测试): 修复报告页并发数显示不对 2020-11-20 10:45:12 +08:00
fit2-zhao
bdaff53eaf feat(接口定义): 请求数据格式按照jmeter 数据格式重构完成 2020-11-19 19:14:06 +08:00
Captain.B
63c30b737b Merge remote-tracking branch 'origin/master' into master 2020-11-19 16:59:40 +08:00
Captain.B
c2bdb6947a fix: 修复显示图片报 Missing URI template variable 2020-11-19 16:59:14 +08:00
shiziyuan9527
54e18656a5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-19 16:41:06 +08:00