Commit Graph

4308 Commits

Author SHA1 Message Date
chenjianxing
2581666165 fix: 解决冲突 2020-12-22 20:58:27 +08:00
chenjianxing
5a076ed70f fix: 测试计划关联多个项目接口列表出错 2020-12-22 20:55:05 +08:00
song.tianyang
128f98849c Merge remote-tracking branch 'origin/master' 2020-12-22 20:12:02 +08:00
song.tianyang
b060bcb389 fix(接口测试功能首页): 修复tips不随机更换、数据统计的缺陷
修复tips不随机更换的缺陷,改为每次进入页面随机更换tips;修复接口用例数量统计:未覆盖+已覆盖总数超过了接口总数的错误;修复统计已删除至回收站中的接口的错误;修复首页数据每次都要刷新浏览器才更新数据的错误
2020-12-22 20:11:52 +08:00
fit2-zhao
c4197029f7 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-22 20:02:56 +08:00
fit2-zhao
8ed6857960 fix(接口自动化): 修复部分缺陷 2020-12-22 20:02:37 +08:00
song.tianyang
cac54095aa Merge remote-tracking branch 'origin/master' 2020-12-22 19:04:29 +08:00
song.tianyang
4552b58b0c feat(接口自动化): 增加定时任务功能
为场景增加定时任务功能,功能位置放于场景表格每一行都"操作"处
2020-12-22 19:03:52 +08:00
song.tianyang
ae647f79c3 Merge remote-tracking branch 'origin/master' 2020-12-22 20:08:41 +08:00
song.tianyang
e997234fda Merge remote-tracking branch 'origin/master' 2020-12-22 20:02:17 +08:00
song.tianyang
5180210910 style: 更改首页统计详情字体
更改首页统计卡牌右下角的统计详情字体
2020-12-22 20:02:07 +08:00
Captain.B
5105160715 Merge remote-tracking branch 'origin/master' into master 2020-12-22 18:36:24 +08:00
Captain.B
8659c67c02 fix: 尝试修复firefox无法展示图标的问题 2020-12-22 18:36:05 +08:00
fit2-zhao
2a75fd8d4e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-22 18:18:50 +08:00
fit2-zhao
fb46812176 fix(接口自动化): 修改用例缺陷 2020-12-22 18:18:32 +08:00
Captain.B
5835bc6ab3 refactor(性能测试): 查询报告日志修改 2020-12-22 18:03:56 +08:00
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
chenjianxing
9ecb428004 fix: 解决冲突 2020-12-22 17:35:29 +08:00
chenjianxing
471f88aac6 feat: 接口测试关联场景用例 2020-12-22 17:27:30 +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