Commit Graph

4743 Commits

Author SHA1 Message Date
Captain.B 59f8f5106e Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-12-18 13:25:07 +08:00
Captain.B 2cebe9763e refactor: 设置limit执行多个job 2020-12-18 13:22:16 +08:00
wenyann 2ff9cdde0c Merge remote-tracking branch 'origin/master' 2020-12-18 12:58:43 +08:00
wenyann 602e500926 fix:首页切换 2020-12-18 12:58:17 +08:00
fit2-zhao a59238d93c fix(接口自动化): 修复场景步骤移除缺陷 2020-12-18 12:46:09 +08:00
BugKing 18e32230d0 refactor: 修改 submodule 地址为 ssh 格式 2020-12-18 12:04:00 +08:00
BugKing afc2f2d960 build: 增加 Jenkinsfile 2020-12-18 11:57:58 +08:00
fit2-zhao aab7e61c8b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-18 11:35:35 +08:00
fit2-zhao 096ee6bd5b fix(接口自动化): 修复重构缺陷 2020-12-18 11:35:17 +08:00
song.tianyang ab5fa68921 Merge remote-tracking branch 'origin/master' 2020-12-18 11:26:40 +08:00
Captain.B d03b242701 chore: Sync 2020-12-18 11:15:01 +08:00
fit2-zhao 3a174fcef0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-18 11:14:12 +08:00
fit2-zhao db0b1768a9 fix(接口自动化): 请求路径校验 2020-12-18 11:13:51 +08:00
shiziyuan9527 a4189ecacc fix(系统设置): 修复项目设置缺陷 2020-12-18 11:12:39 +08:00
shiziyuan9527 4ec766605c refactor: i18n 2020-12-18 10:56:18 +08:00
fit2-zhao 75eeae71de fix(接口自动化): 请求路径校验 2020-12-18 10:54:49 +08:00
fit2-zhao 3db39fb276 fix(接口自动化): 修复回收站恢复缺陷 2020-12-18 10:28:28 +08:00
fit2-zhao 855f96a25a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-18 10:12:47 +08:00
fit2-zhao 3eba438fce fix(接口自动化): 修复报告缺陷 2020-12-18 10:12:29 +08:00
Captain.B 62f52fba18 chore: Sync 2020-12-18 10:02:35 +08:00
fit2-zhao 80c624d6b7 fix(接口自动化): 修复执行缺陷 2020-12-17 19:30:25 +08:00
fit2-zhao 97e5549bc1 fix(接口自动化): 修复执行缺陷 2020-12-17 19:27:01 +08:00
song.tianyang df2f5df2f7 refactor: 重构首页CSS样式
清除无效CSS样式、未使用CSS样式
2020-12-17 19:10:51 +08:00
fit2-zhao b781ecaaf3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 19:01:03 +08:00
fit2-zhao f0d45a9aa0 fix(接口自动化): 修复组件缺陷 2020-12-17 19:00:39 +08:00
Captain.B 4eb155362e refactor: 设置limit执行多个job 2020-12-17 18:54:20 +08:00
Captain.B da6b3382ff Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-12-17 18:52:42 +08:00
song.tianyang 62d1522dc6 Merge remote-tracking branch 'origin/master' 2020-12-17 18:48:26 +08:00
Captain.B bbfb7987a2 refactor: 设置limit执行多个job 2020-12-17 18:48:04 +08:00
song.tianyang 5539df37b9 refactor: 重构统计SQL书写位置
将统计SQL书写位置挪至由{table}Mapper挪至Ext{table}Mapper
2020-12-17 18:47:52 +08:00
fit2-zhao 3a7c731376 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionExecResultMapper.java
2020-12-17 18:39:58 +08:00
fit2-zhao 689be330f0 fix(接口定义): 修复部分缺陷 2020-12-17 18:33:34 +08:00
fit2-zhao 310756d5f7 fix(接口定义): 修复部分缺陷 2020-12-17 18:32:54 +08:00
song.tianyang ac11493d77 fix: 样式定义错误
修复样式:错误的将局部样式定义成了全局样式
2020-12-17 18:28:53 +08:00
song.tianyang a14065a0cc Merge remote-tracking branch 'origin/master' 2020-12-17 18:22:55 +08:00
song.tianyang 3e4b38e394 fix: 新旧版本切换时首页展示问题
修复缺陷:进行新旧版本切换时,接口测试功能的首页没有跟随新旧版本进行切换
2020-12-17 18:22:18 +08:00
Captain.B f30493a881 chore: Sync 2020-12-17 18:08:37 +08:00
Captain.B fef2bc7e8a Merge remote-tracking branch 'origin/master' into master 2020-12-17 18:02:16 +08:00
Captain.B fa269fde93 refactor: k8s 环境变量 2020-12-17 18:01:41 +08:00
shiziyuan9527 d7f2494f84 fix(系统设置): 修复切换项目缺陷 2020-12-17 17:52:32 +08:00
shiziyuan9527 d7b4c140b7 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 17:43:23 +08:00
song.tianyang 66c01949af feat: 接口测试模块-首页页面展示以及后台接口适配
接口测试模块-首页开发,包含接口、用例、场景、定时任务、失败案例和运行中任务等功能的开发
2020-12-17 17:37:19 +08:00
song.tianyang 7707f9902d feat: 接口测试模块-首页开发Service方法
接口测试模块-首页开发,包含接口、用例、场景、定时任务、失败案例和运行中任务等功能的开发
2020-12-17 17:35:27 +08:00
shiziyuan9527 cfdbdb7fa3 fix(系统设置): 修复切换项目缺陷 2020-12-17 16:59:37 +08:00
fit2-zhao e05657fe11 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 16:47:36 +08:00
fit2-zhao 9482d72783 fix(接口定义): 修复部分缺陷 2020-12-17 16:47:18 +08:00
q4speed 4c1f6bb985 fix(接口测试): 修复dubbo测试报告一直不能完成的bug 2020-12-17 16:27:21 +08:00
chenjianxing 556ddddd84 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 16:14:16 +08:00
chenjianxing 3b6e1748e8 fix: 添加接口用例,接口定义列表未更新 2020-12-17 16:14:02 +08:00
fit2-zhao 7a43d3d5fd Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 16:08:50 +08:00