Commit Graph

4208 Commits

Author SHA1 Message Date
wenyann
7e2c7fd5aa Merge remote-tracking branch 'origin/master' 2020-12-18 17:43:25 +08:00
wenyann
6e13f0b85b fix:修复测试计划空指针异常 2020-12-18 17:42:49 +08:00
Captain.B
80eaf15b1f chore: Sync 2020-12-18 17:27:46 +08:00
shiziyuan9527
cfe621fe35 refactor(系统设置): 项目描述统一字体 2020-12-18 17:19:49 +08:00
fit2-zhao
616d00024c Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-12-18 17:14:44 +08:00
fit2-zhao
9ef40e9187 fix(接口自动化): 修复导入场景缺陷 2020-12-18 17:13:57 +08:00
shiziyuan9527
93369cb04a refactor(系统设置): 修改服务集成跳转关联项目路由 2020-12-18 16:40:25 +08:00
fit2-zhao
ee9c1ba153 fix(接口自动化): 场景步骤权限控制 2020-12-18 16:37:27 +08:00
shiziyuan9527
f6ab4489be fix(测试计划): 修复输入框提示问题 2020-12-18 16:28:31 +08:00
shiziyuan9527
dc8b661616 fix(系统设置): 修复切换项目缺陷 2020-12-18 15:01:43 +08:00
Captain.B
4c6523639c refactor: 设置临时的 test 配置 deepcopy 2020-12-18 14:46:51 +08:00
Captain.B
269ddab398 refactor: 设置临时的 test 配置 2020-12-18 14:43:46 +08:00
fit2-zhao
55c26387dd Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-18 14:31:27 +08:00
fit2-zhao
fdc408bfbf fix(接口自动化): 修复导入场景缺陷 2020-12-18 14:31:04 +08:00
Captain.B
92a7460eee refactor: 设置临时的 test 配置 2020-12-18 14:24:05 +08:00
BugKing
137264b14e Merge branch 'pipeline-test' into master 2020-12-18 13:42:55 +08:00
BugKing
f4430b16bc build: 转义 Jenkinsfile 中的变量引用 2020-12-18 13:39:56 +08:00
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
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
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