Commit Graph

586 Commits

Author SHA1 Message Date
fit2-zhao 60bb8bdf18 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-05 18:30:12 +08:00
fit2-zhao fc610db2ca feat(XPack): 完成报表列表功能及筛选功能 2021-03-05 17:47:49 +08:00
Captain.B 2dd0d94276 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-05 13:29:47 +08:00
Captain.B 329ed8dd77 feat(性能测试): 支持自由组合场景 2021-03-05 13:13:29 +08:00
song.tianyang 0c6704b742 Merge remote-tracking branch 'origin/master' 2021-03-04 19:21:32 +08:00
song.tianyang 41cb3e0283 feat: 设置模块,系统->用户、组织->成员 新增批量处理功能【添加工作空间】【添加角色】;工作空间->成员 新增批量处理功能【添加角色】
设置模块,系统->用户、组织->成员 新增批量处理功能【添加工作空间】【添加角色】;工作空间->成员 新增批量处理功能【添加角色】
2021-03-04 19:21:18 +08:00
fit2-zhao 70f71b2e70 feat(XPack): i18n 统一提交 2021-03-04 10:29:41 +08:00
fit2-zhao c8c96d8919 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-03 18:47:42 +08:00
Captain.B f4dbf03580 Merge branch 'scenario' 2021-03-03 17:35:02 +08:00
Captain.B 4a9ccc2ea5 feat(性能测试): 支持组合场景场景 2021-03-03 17:33:55 +08:00
fit2-zhao ce9d9c8c43 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-03 17:33:27 +08:00
fit2-zhao 445df3a281 fix(接口自动化): i18n合并 2021-03-03 17:28:57 +08:00
song.tianyang 1df8b0c38a Merge remote-tracking branch 'origin/master' 2021-03-02 18:27:11 +08:00
song.tianyang 1c4d0c9012 feat: 用户excel批量导入功能
用户excel批量导入功能
2021-03-02 18:22:22 +08:00
wenyann 8690b9afd8 feat: 创建评审加执行按钮 2021-03-02 12:52:21 +08:00
chenjianxing 089a994b01 fix: 测试用例导出全选 2021-02-25 13:47:47 +08:00
chenjianxing 2a7ccf7b24 refactor: 统一接口定义和场景导出 2021-02-22 13:57:40 +08:00
fit2-zhao b0486b6faf Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
#	frontend/src/business/components/api/automation/ApiAutomation.vue
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
2021-02-20 11:52:23 +08:00
song.tianyang 1f6736cad0 Merge remote-tracking branch 'origin/master' 2021-02-19 18:30:13 +08:00
song.tianyang d1789dd154 feat: 接口定义->文档 增加JSON-Schema的显示和查找功能
接口定义->文档 增加JSON-Schema的显示和查找功能
2021-02-19 18:29:47 +08:00
chenjianxing f42e7ac3eb feat: 场景用例导出 2021-02-19 15:41:27 +08:00
Captain.B cecdcebc49 feat: K8S 资源池支持nodeSelector 2021-02-19 13:11:19 +08:00
fit2-zhao 38ce17b583 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
2021-02-05 10:14:14 +08:00
chenjianxing 9b66d9c261 Merge branch 'v1.7' 2021-02-03 19:07:03 +08:00
fit2-zhao 76bcd14500 fix(接口定义): 排序修改 2021-02-03 18:50:02 +08:00
fit2-zhao e69ee40438 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-03 17:48:37 +08:00
song.tianyang 683c533db0 Merge branch 'v1.7'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	backend/src/main/java/io/metersphere/track/service/TestPlanService.java
#	frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
#	frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
#	frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
2021-02-03 17:11:04 +08:00
song.tianyang e3903adcd0 refactor: 添加国际化字段
添加国际化字段
2021-02-03 16:57:04 +08:00
Coooder-X 9a9f8f628b fear: (系统设置) 项目-jar包管理,支持查找 (#1350) 2021-02-03 11:23:17 +08:00
Coooder-X 893485d592
fear: (系统设置) 项目-jar包管理,支持查找 (#1350) 2021-02-03 11:20:15 +08:00
chenjianxing b6f59bb15c fix: 滚动条宽度变化导致关联页面页面变形 2021-02-03 11:18:54 +08:00
chenjianxing f26b96a38b fix: 国际化 2021-02-02 19:42:14 +08:00
chenjianxing 6dcd2c5f48 fix: 模块移动国际化 2021-02-02 16:14:28 +08:00
wenyann 6cc2b73d67 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7
 Conflicts:
	frontend/src/business/components/api/definition/components/list/ApiList.vue
2021-02-01 17:40:43 +08:00
wenyann 89ad020b38 feat: 接口定义批量移动 2021-02-01 17:36:45 +08:00
fit2-zhao c94aab0219 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-01 16:04:17 +08:00
shiziyuan9527 f9f897c027 refactor(测试计划): 清理无用代码 2021-02-01 15:21:22 +08:00
fit2-zhao 561c9fea71 feat(接口自动化): 添加导入导出 2021-02-01 14:35:53 +08:00
Captain.B 9752736e3a fix: 修复登录页面图片位置和显示title不对的bug 2021-02-01 14:00:21 +08:00
wenyann 86c079c62a feat: swagger定时同步 2021-01-29 11:08:52 +08:00
fit2-zhao ed3dc1c25f fix(接口定义): i18n 名称提示问题修复 2021-01-28 16:36:06 +08:00
Captain.B 215a181d23 fix: 修复添加认证源名称提示不对的问题 2021-01-28 14:58:09 +08:00
chenjianxing f6fb6fb9ab fix: 登入页面图片缺失 2021-01-27 22:22:29 +08:00
Captain.B ac95fca6fe refactor: 认证源设置页面国际化 2021-01-27 18:34:07 +08:00
song.tianyang c9fdccf85e fix: 测试计划-测试用例表格增加列固定
测试计划-测试用例表格增加列固定
2021-01-27 17:23:05 +08:00
song.tianyang 3dd54a302a fix: 接口自动化-场景列表-批量移动,弹框显示问题
解决接口自动化-场景列表-批量移动,弹框显示的问题
2021-01-27 16:45:08 +08:00
chenjianxing 13ddaa5aca refactor: 修改添加标签描述 2021-01-27 11:33:17 +08:00
shiziyuan9527 c3c9b70238 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 16:15:01 +08:00
shiziyuan9527 b783d21f6d refactor(测试计划): 修改搜索提示文本 2021-01-26 16:14:48 +08:00
wenyann 48b0adc065 Merge remote-tracking branch 'origin/master' 2021-01-26 16:05:42 +08:00