Commit Graph

4290 Commits

Author SHA1 Message Date
fit2-zhao
8e7b1f7489 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-22 17:43:02 +08:00
fit2-zhao
93914ed5b6 fix(接口自动化): 修复场景引用缺陷 2020-12-22 17:42:53 +08:00
Captain.B
bb3845e28f Merge remote-tracking branch 'origin/master' into master 2020-12-22 17:17:06 +08:00
Captain.B
2face9c83a feat: 资源池支持image 2020-12-22 17:16:55 +08:00
fit2-zhao
936b8637d5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-22 17:08:12 +08:00
fit2-zhao
41d063fde7 refactor(接口自动化): 重构标签 2020-12-22 17:07:50 +08:00
shiziyuan9527
5353a1b3b7 refactor(性能测试): 调整样式 2020-12-22 17:02:41 +08:00
fit2-zhao
ef2412a3e2 feat(接口自动化): 标签定义 2020-12-22 16:49:47 +08:00
BugKing
2cf68db349 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2020-12-22 16:45:43 +08:00
shiziyuan9527
58a52520b1 fix: 修复LDAP登入请求重定向的问题 2020-12-22 16:34:22 +08:00
BugKing
3f9fe798d7 fix(接口自动化): 修改添加自定义请求名称 label 2020-12-22 16:32:03 +08:00
Captain.B
32bb40608f Merge branch 'v1.6' into master 2020-12-22 16:31:34 +08:00
Captain.B
126430b18f refactor: 显示avgTransactions 2020-12-22 16:31:19 +08:00
Captain.B
cfd203623e Merge remote-tracking branch 'origin/master' into master 2020-12-22 15:55:59 +08:00
Captain.B
588e5b17eb refactor: 显示avgTransactions 2020-12-22 15:55:14 +08:00
shiziyuan9527
73a24895a7 feat(测试跟踪): 测试计划页面添加评论列表 2020-12-22 15:21:38 +08:00
fit2-zhao
6b83a68db2 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
2020-12-22 14:08:52 +08:00
fit2-zhao
5b6a4ddd82 fix(接口自动化):修复部分缺陷,合并sql 脚本 2020-12-22 14:05:53 +08:00
song.tianyang
fd554c2098 refactor: 更改不规范的包命名
更改不规范的包命名
2020-12-22 14:01:45 +08:00
song.tianyang
4cc1fc0935 Merge remote-tracking branch 'origin/master' 2020-12-22 13:58:01 +08:00
song.tianyang
23e65450c7 fix: 首页数据统计错误
修复首页-接口数量统计-未开始接口的统计错误
2020-12-22 13:57:35 +08:00
Captain.B
78d8b6708d Merge branch 'v1.6' into master 2020-12-22 12:00:29 +08:00
Captain.B
dcc1df4133 refactor: 测试报告日志查询修改 2020-12-22 12:00:03 +08:00
wenyann
f63b20ba2e Merge remote-tracking branch 'origin/master' 2020-12-22 11:00:22 +08:00
wenyann
ec9b3ac37a fix:编辑个人信息,电话必填项 2020-12-22 10:59:47 +08:00
song.tianyang
bf400b5d3c Merge remote-tracking branch 'origin/master' 2020-12-22 10:55:16 +08:00
song.tianyang
f905aa62cb style: 调整数据统计方位、增加确认框
调整接口数量统计、接口用力数量统计的不同接口数量统计显示区域的位置;在关闭定时任务时增加确认框防止误操作
2020-12-22 10:55:02 +08:00
fit2-zhao
41146ad7d1 fix(接口自动化):修复执行缺陷 2020-12-22 10:12:24 +08:00
chenjianxing
ecfb1cf2fe refactor: 代码整理 2020-12-21 21:46:15 +08:00
chenjianxing
642de28841 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-21 19:38:04 +08:00
chenjianxing
434bf22bd9 fix: 解决冲突 2020-12-21 19:37:49 +08:00
fit2-zhao
045681c68a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-21 19:28:25 +08:00
fit2-zhao
3d302ac30b fix(接口自动化):修复DUBBO 协议执行缺陷 2020-12-21 19:28:06 +08:00
chenjianxing
ab7b06296f fix: 解决冲突 2020-12-21 19:25:46 +08:00
song.tianyang
c24aac4103 fix(修改接口覆盖率统计错误的问题): 修改接口覆盖率统计错误的问题
修改接口覆盖率统计错误的问题
2020-12-21 19:12:47 +08:00
song.tianyang
9449c6ad98 Merge remote-tracking branch 'origin/master' 2020-12-21 19:08:10 +08:00
song.tianyang
2136b6bea0 fix(测试环境与开发环境不一样引起的报错问题): 解决测试环境与开发环境不一样引起的报错问题
修改SQL,暂时改为不统计场景案例。待场景案例功能上线之后再进行修改
2020-12-21 19:07:51 +08:00
shiziyuan9527
c05723fad2 fix(测试用例): 修复批量编辑用例成功后用例列表显示所有用例的问题 2020-12-21 18:35:29 +08:00
song.tianyang
60d40f48ab fix(接口自动化页面进入报错): 删除过期的页面引用
删除由于引用了过期画面而导致的console报错
2020-12-21 18:26:30 +08:00
chenjianxing
1b8291bf0d fix: 解决冲突 2020-12-21 18:22:22 +08:00
song.tianyang
5cbbb73405 Merge remote-tracking branch 'origin/master' 2020-12-21 18:19:31 +08:00
song.tianyang
5b0be270d2 refactor(接口测试功能首页): 接口测试首页样式及统计数据更换
接口测试首页由于更换了样式、展示数据等,重新开发该页面的
2020-12-21 18:19:13 +08:00
chenjianxing
8090c2d700 feat: 测试计划接口用例关联 2020-12-21 18:05:19 +08:00
Captain.B
e2e740693c Merge remote-tracking branch 'origin/master' into master 2020-12-21 17:58:26 +08:00
Captain.B
95e437f6e5 refactor: 性能测试报告label修改 2020-12-21 17:58:08 +08:00
fit2-zhao
99819b6163 fix(接口自动化):修复共享cookie 问题 2020-12-21 17:54:58 +08:00
shiziyuan9527
6bf11a7334 refactor(测试用例): 修改查看用例页面样式 2020-12-21 17:27:49 +08:00
Captain.B
09b599e7e5 fix: 执行job前设置namespace 2020-12-21 16:59:23 +08:00
Captain.B
4c716a0946 Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-12-21 16:58:52 +08:00
Captain.B
9630fabfa2 fix: 执行job前设置namespace 2020-12-21 16:58:21 +08:00