Commit Graph

1746 Commits

Author SHA1 Message Date
Captain.B ad4709e502 feat: mock 数据 2020-08-13 11:11:14 +08:00
wenyann c3280f955d fix: 时间样式调整 2020-08-13 10:18:49 +08:00
Captain.B a1fa5de266 feat: mock 数据 2020-08-13 09:52:51 +08:00
wenyann 9e22233616 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-13 09:52:01 +08:00
wenyann 7530fff681 fix(接口测试): 报告页面时间显示调整,响应不刷新,页面全部展开 2020-08-13 09:51:03 +08:00
shiziyuan9527 47fad33be1 feat: 服务集成 2020-08-12 17:37:14 +08:00
wenyann b0e0aa1327 fix(接口测试): 报告 2020-08-12 16:48:54 +08:00
Captain.B 23f04146b3 Merge branch 'master' into func 2020-08-12 13:32:04 +08:00
Captain.B 6847ff0530 fix: 非 GET 请求中支持 url 参数 2020-08-12 13:14:38 +08:00
Captain.B 42a3f7261b Revert "refactor: 请求参数修改"
This reverts commit 468eea3b
2020-08-12 12:56:52 +08:00
Captain.B 0263662f97 refactor: 请求参数修改 2020-08-12 12:55:41 +08:00
Captain.B be57bf66a5 Merge branch 'master' into func 2020-08-12 12:40:17 +08:00
Captain.B e512957cd6 refactor: 请求参数修改 2020-08-12 12:14:53 +08:00
wenyann 9dca87376e Merge remote-tracking branch 'origin/master' 2020-08-12 10:58:49 +08:00
wenyann 0222b053b0 fix(测试计划): 时间修改 2020-08-12 10:58:10 +08:00
shiziyuan9527 b13fb0f001 feat: 服务集成 2020-08-11 17:17:25 +08:00
wenyann 59c9cdfef2 fix(接口测试): 场景重复 2020-08-11 15:57:50 +08:00
wenyann a8671ca4f3 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/business/components/api/report/components/ScenarioResults.vue
	frontend/src/business/components/common/head/ShowAll.vue
2020-08-11 14:52:02 +08:00
wenyann 66b6c179e8 feat(接口测试):增加接口测试一键运行功能 2020-08-11 14:40:18 +08:00
Captain.B 468eea3b50 refactor: 请求参数修改 2020-08-11 14:28:20 +08:00
chenjianxing 9692b8d2a5 fix(测试跟踪): fix 提缺陷生成D实际结果不正确 2020-08-11 11:22:28 +08:00
chenjianxing b37d6a15f2 fix: 选择raw类型body后,切换成kv请求头错误 2020-08-11 11:15:16 +08:00
chenjianxing f316d99141 Merge branch 'master' of https://github.com/metersphere/server 2020-08-11 10:36:45 +08:00
chenjianxing e187d91c76 feat(接口测试): dubbo 单接口调试 2020-08-11 10:36:18 +08:00
Captain.B 2f1b8e9d1a feat: 请求body支持变量 2020-08-11 10:22:19 +08:00
Captain.B 8b2041bbd9 feat: 请求Headers支持变量 2020-08-11 10:05:09 +08:00
chenjianxing 22950f0893 Merge branch 'master' of https://github.com/metersphere/server 2020-08-10 21:59:26 +08:00
chenjianxing 4e0b340c20 feat(接口测试): 单接口调试 2020-08-10 21:59:11 +08:00
Captain.B 92667da369 refactor(性能测试): 修改测试报告展示压力配置的逻辑 2020-08-10 18:31:53 +08:00
Captain.B 88a9807dfb feat: 显示性能测试的压力配置 2020-08-10 18:17:31 +08:00
Captain.B ece541e80e Merge remote-tracking branch 'origin/master' 2020-08-10 18:07:55 +08:00
Captain.B dfd66d3793 feat: 显示性能测试的压力配置 2020-08-10 18:07:17 +08:00
shiziyuan9527 57ec7ba0c9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-10 17:58:21 +08:00
shiziyuan9527 6e0f0bdd1a refactor: i18n 2020-08-10 17:58:05 +08:00
q4speed 27b5d37033 Merge remote-tracking branch 'origin/master' 2020-08-10 17:04:56 +08:00
q4speed c8e6b5106f refactor: 优化代码 2020-08-10 17:04:34 +08:00
shiziyuan9527 1007479e20 feat(系统设置): 组织菜单下增加服务集成子菜单 2020-08-10 16:18:17 +08:00
Captain.B 585c85e86b Merge branch 'master' of github.com:fit2cloudrd/metersphere-server 2020-08-10 14:59:54 +08:00
Captain.B da226cf76e feat: 显示Jmeter的内置函数提示 2020-08-10 14:59:20 +08:00
shiziyuan9527 2646dc94b4 feat(测试跟踪): 测试计划下用例按照ID字段排序 2020-08-10 14:17:16 +08:00
chenjianxing 94079cd283 refactor: 去掉post请求末尾?号 2020-08-07 19:44:14 +08:00
chenjianxing 95341e5663 fix: body格式化 2020-08-07 19:39:54 +08:00
chenjianxing 1582a46534 refactor: 执行结果不填时,测试用例可通过 2020-08-07 19:22:17 +08:00
chenjianxing 6d6506a3cb fix: 资源池校验 2020-08-07 19:14:33 +08:00
chenjianxing 2e130d3eb5 fix: 步骤描述显示问题 2020-08-07 19:06:09 +08:00
Captain.B 18eb1827ef feat: 高级参数设置前端实现 2020-08-07 17:46:53 +08:00
Captain.B 9d6c1ea86d feat: 高级参数设置前端实现 2020-08-07 17:43:19 +08:00
Captain.B fa13003865 Merge branch 'master' of github.com:fit2cloudrd/metersphere-server 2020-08-07 17:37:45 +08:00
Captain.B 5bc5eeb4db feat: 高级参数设置预览 2020-08-07 17:37:29 +08:00
chenjianxing 683fed8ec9 feat: 接口调试部分代码 2020-08-07 17:16:24 +08:00
Captain.B fdda9b00b0 feat: 使用java运行js脚本,添加相关js 2020-08-07 16:26:54 +08:00
chenjianxing 9b294a00f8 Merge branch 'v1.1' of https://github.com/metersphere/server 2020-08-07 11:36:01 +08:00
chenjianxing df2f972c9a Merge branch 'master' of https://github.com/metersphere/server 2020-08-07 11:26:10 +08:00
chenjianxing 76ae0969c4 feat: 场景内cookie共享 2020-08-07 11:25:56 +08:00
Captain.B 2013aafb86 Merge branch 'func' 2020-08-07 10:36:28 +08:00
Captain.B 00ef9b7db9 feat: 高级参数设置 2020-08-07 10:34:05 +08:00
chenjianxing a9d6c98c09 Merge branch 'master' of https://github.com/metersphere/server 2020-08-07 10:03:33 +08:00
chenjianxing 18c7a30a03 refactor: 首页只显示运行中的定时任务 2020-08-07 10:03:22 +08:00
shiziyuan9527 1f64dd0c86 feat(测试跟踪): 测试计划批量操作 2020-08-06 18:31:23 +08:00
q4speed 5edda89021 fix(接口测试): 修复保存后控制台报错的bug 2020-08-06 17:16:19 +08:00
shiziyuan9527 4a20e5ccad refactor: 优化变量命名 2020-08-06 15:22:23 +08:00
shiziyuan9527 3db24258f4 refactor: 浏览器回退问题 2020-08-06 14:41:20 +08:00
shiziyuan9527 9ebc2163ba fix: 修复点击显示全部时菜单没激活的问题 2020-08-06 14:19:42 +08:00
chenjianxing b82b5d34e0 Merge branch 'master' of https://github.com/metersphere/server 2020-08-05 20:07:20 +08:00
chenjianxing b04904d105 Merge branch 'v1.1' 2020-08-05 20:07:04 +08:00
shiziyuan9527 2d14ace67e feat(测试跟踪): 测试用例批量移动 2020-08-05 18:57:36 +08:00
chenjianxing ec3276edff fix: 测试用例接口测试执行 2020-08-05 18:53:08 +08:00
wenyann a3dc5ce547 fix(测试计划): 修复测试方式为自动时通过按钮禁止 2020-08-05 18:26:31 +08:00
wenyann de6a585d17 Merge remote-tracking branch 'origin/master' 2020-08-05 18:23:24 +08:00
wenyann dd049e7893 fix(测试计划): 修复测试方式为自动时通过按钮禁止 2020-08-05 18:22:56 +08:00
chenjianxing 61496ce11a fix: 侧边栏折叠样式 2020-08-05 18:13:14 +08:00
chenjianxing 0d3f93a71c fix: 保存接口测试跳转 2020-08-05 17:23:03 +08:00
chenjianxing f10c233858 refactor: 保存接口测试不跳转到列表页面 2020-08-05 17:22:01 +08:00
chenjianxing 1803f9cf67 fix: 浏览器回退关闭对话框 2020-08-05 17:00:23 +08:00
chenjianxing f10fef30bf Merge branch 'master' of https://github.com/metersphere/server 2020-08-05 13:10:40 +08:00
chenjianxing ff7d0e0343 fix: 解决冲突 2020-08-05 13:10:24 +08:00
shiziyuan9527 9b5523d336 feat(测试跟踪): 测试用例批量删除 2020-08-05 11:17:17 +08:00
chenjianxing e1089b1eb1 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-08-05 10:14:11 +08:00
chenjianxing 7de5205b99 fix: 模块树拖拽 2020-08-05 10:13:56 +08:00
wenyann c8b59784fa fix(系统设置): 修复用户邮箱格式支持带符号 2020-08-05 10:11:26 +08:00
shiziyuan9527 fdc9b1c2fe feat(测试跟踪): 测试用例批量编辑 2020-08-04 19:01:36 +08:00
chenjianxing bca1ef13cb fix: 点击定时任务启动报错 2020-08-04 18:01:41 +08:00
chenjianxing f274cd3b32 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-08-04 17:54:53 +08:00
chenjianxing 9d293f653e fix: 环境设置beaseUrl 2020-08-04 17:54:36 +08:00
chenjianxing ff76a7e69d refactor: 环境域名可以设置为DbeaseUrl 2020-08-04 17:46:44 +08:00
wenyann 5fb0fc59b7 Merge remote-tracking branch 'origin/master' 2020-08-04 17:36:30 +08:00
chenjianxing 998750d77f 性能测试首页定时任务列表 2020-08-04 17:35:09 +08:00
wenyann e67e3d06cf Merge branch 'v1.1' 2020-08-04 17:30:15 +08:00
wenyann 0cc8ff5d19 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-08-04 17:28:01 +08:00
wenyann 58cfcb13ff fix(系统设置): 组织管理员编辑工作空间弹框问题 2020-08-04 17:27:36 +08:00
chenjianxing 1a33e7ddac fix: 修复冲突 2020-08-04 17:11:28 +08:00
chenjianxing 4ad4a698cd Merge branch 'master' of https://github.com/metersphere/server 2020-08-04 16:38:06 +08:00
chenjianxing 002ace6b16 接口测试首页定时任务列表 2020-08-04 16:37:42 +08:00
wenyann 628a99f697 Merge remote-tracking branch 'origin/master' 2020-08-04 16:36:36 +08:00
wenyann b29720930e feat(测试跟踪): 测试方式自动时关联用例增加其它选项 2020-08-04 16:36:04 +08:00
Captain.B 4cb0940b28 fix: 处理合并分支的冲突 2020-08-04 16:20:36 +08:00
chenjianxing 4f298c6bb0 refactor: 取消请求参数长度限制
(cherry picked from commit fac8442392)
2020-08-04 16:12:08 +08:00
wenyann fdfee3a6b8 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-04 16:10:43 +08:00
wenyann 559fcc3c71 feat(测试跟踪): 测试方式自动时关联用例增加其它选项 2020-08-04 16:10:22 +08:00
Captain.B 9f4dd6e49c Merge branch 'v1.1'
# Conflicts:
#	frontend/src/business/components/api/test/components/ApiScenarioVariables.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
2020-08-04 16:07:26 +08:00
shiziyuan9527 52f6d4f336 feat(测试跟踪): 批量编辑用例组件 2020-08-04 14:58:55 +08:00
Captain.B eebfb72110 refactor(性能测试): 修改测试报告label 2020-08-04 12:36:42 +08:00
q4speed 52c521658e refactor: 优化代码 2020-08-04 10:52:40 +08:00
shiziyuan9527 62cf3ac27c feat(测试跟踪): 测试用例列表添加批量操作按钮 2020-08-03 21:40:00 +08:00
chenjianxing e41ca820df refactor: 场景中有配置环境,创建请求默认引用环境 2020-08-03 17:11:13 +08:00
chenjianxing bd3b9e0164 Merge branch 'master' of https://github.com/metersphere/server 2020-08-03 17:07:03 +08:00
chenjianxing 759bb68491 refactor: 环境域名可以设置为DbeaseUrl 2020-08-03 17:06:45 +08:00
shiziyuan9527 a0600ed4b9 refactor(测试跟踪): 优先级名称变更为用例等级 2020-08-03 14:14:50 +08:00
chenjianxing 7cbb202309 fix: 非管理员用户点击高级搜索退出登入 2020-07-31 18:10:44 +08:00
chenjianxing ad40932869 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-31 16:47:10 +08:00
chenjianxing fac8442392 refactor: 取消请求参数长度限制 2020-07-31 16:42:08 +08:00
shiziyuan9527 b9d48bd00e fix: 修复访问最近报告中已删除的报告报错的问题 2020-07-31 15:45:01 +08:00
chenjianxing c0861c56a3 fix: 项目描述显示回车 2020-07-31 15:27:25 +08:00
chenjianxing 1e73ad065a fix: post 请求URL变量失效 2020-07-31 14:25:24 +08:00
chenjianxing 960641c577 fix: 场景变量长度限制 2020-07-31 09:36:32 +08:00
chenjianxing f6fee2f9b5 fix: 场景变量长度限制 2020-07-31 09:35:47 +08:00
chenjianxing 6e6ce650f7 Merge branch 'master' of https://github.com/metersphere/server 2020-07-30 18:45:55 +08:00
chenjianxing 1b0dc296fc Merge branch 'v1.1' 2020-07-30 18:45:14 +08:00
chenjianxing 049c7f06a4 fix: 测试用例执行步骤删除逻辑 2020-07-30 18:44:50 +08:00
q4speed a7d29c6a50 docs(XPack): 注释 2020-07-30 18:31:58 +08:00
q4speed d040b2c3e4 feat(XPack): 前端XPack 2020-07-30 18:30:02 +08:00
chenjianxing f591f5d9c6 fix: dubbo 配置中心非必填 2020-07-30 17:31:12 +08:00
chenjianxing 282a5d5c17 refactor: 项目描述长度限制 2020-07-30 17:19:46 +08:00
chenjianxing 2f1d776ede refact: 修改请求断言提取长度限制 2020-07-30 17:06:26 +08:00
chenjianxing 2d2ac4f632 feat: 断言支持JSONPath 2020-07-30 17:01:04 +08:00
shiziyuan9527 3423c05f60 refactor(系统设置): 简化代码 2020-07-30 11:10:04 +08:00
chenjianxing 90af469466 fix: 测试用例执行步骤显示 2020-07-30 09:25:49 +08:00
chenjianxing a22827fd2a fix: 测试用例执行步骤显示 2020-07-30 09:23:17 +08:00
chenjianxing e8f7ee688a refactor: merge v1.1 2020-07-29 18:41:01 +08:00
chenjianxing 5933e0a27c fix: swagger 导入post请求body格式化 2020-07-29 18:38:21 +08:00
chenjianxing 3bb35a4452 Merge branch 'v1.1' 2020-07-29 18:22:05 +08:00
chenjianxing 560a22a186 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-29 18:06:44 +08:00
chenjianxing 16adeef77b fix: 增加请求头长度限制 2020-07-29 18:03:49 +08:00
shiziyuan9527 73af237437 fix: 修复在列表页面点击显示全部无效的问题 2020-07-29 17:30:19 +08:00
chenjianxing 09081ba2d5 fix: 测试用例测试步骤没有显示换行 2020-07-29 17:25:16 +08:00
chenjianxing 9d8a56dec3 fix: 折叠按钮样式优化 2020-07-29 16:38:40 +08:00
chenjianxing 335df77ff6 fix: 增加密码长度限制 2020-07-29 15:49:25 +08:00
chenjianxing 7528053dd0 Merge branch 'v1.1' 2020-07-29 13:33:09 +08:00
chenjianxing 5b9279b116 fix: postman 多级目录导入 2020-07-29 13:16:46 +08:00
chenjianxing f0e3fd22a0 Merge branch 'v1.1' 2020-07-28 19:16:36 +08:00
chenjianxing 5aca08a677 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-28 19:16:15 +08:00
chenjianxing e181a4867c feat: post 请求支持参数格式化 2020-07-28 19:16:00 +08:00
shiziyuan9527 270e816599 feat(系统设置): 组织菜单下,一次可以添加多个成员 2020-07-28 18:29:25 +08:00
chenjianxing 15798a7726 Merge branch 'v1.1' 2020-07-28 16:23:08 +08:00
chenjianxing d513ae4403 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-28 16:22:57 +08:00
chenjianxing ac6466ffcd feat: 接口测试结果格式化 2020-07-28 16:22:48 +08:00
q4speed 6c7c148697 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-28 11:08:28 +08:00
q4speed 638eb859e4 feat(接口测试): 给下拉框增加清除功能 2020-07-28 11:08:17 +08:00
shiziyuan9527 865fc14a39 Merge branch 'v1.1' of https://github.com/metersphere/metersphere into v1.1 2020-07-28 10:41:00 +08:00
shiziyuan9527 9ee6fc9f0e refactor: 登录默认为普通登录,隐藏普通登录选项 2020-07-28 10:40:21 +08:00
q4speed 70a45fe807 fix(接口测试): 增加loading的描述 2020-07-28 10:36:35 +08:00
shiziyuan9527 5bf3f355f5 feat: 启用LDAP认证后才显示LDAP登录选项 2020-07-27 18:09:34 +08:00
chenjianxing d7df95c7f6 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-27 15:30:08 +08:00
chenjianxing 274f820daf feat: 添加侧边栏折叠功能 2020-07-27 15:29:58 +08:00
Captain.B 01b6f1b7bf fix: 修复强制停止时刷新页面的bug 2020-07-27 13:35:01 +08:00
Captain.B c6fb64e754 feat: 优化停止性能测试是否保留报告 2020-07-27 13:31:33 +08:00
Captain.B 492dca961c feat: 优化停止性能测试是否保留报告 2020-07-27 13:25:47 +08:00
Captain.B 2522b83f81 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-27 12:27:04 +08:00
Captain.B 62fa6fd9c6 refactor: 执行测试之后跳转到报告查看页面 2020-07-27 11:11:31 +08:00
chenjianxing 0fd89fc6be refactor: post请求url优化 2020-07-27 10:12:25 +08:00
chenjianxing b2b3675429 refactor: post请求url优化 2020-07-27 10:11:45 +08:00
chenjianxing 10d7441487 Merge branch 'master' of https://github.com/metersphere/server 2020-07-24 18:24:02 +08:00
chenjianxing ce2b3e4c98 Merge branch 'v1.1' 2020-07-24 18:23:18 +08:00
chenjianxing 3841ff55d8 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-24 18:22:46 +08:00
chenjianxing 8d389f0298 fix: post 参数encoding 2020-07-24 18:22:31 +08:00
shiziyuan9527 de984bbebb fix: 修改性能测试报告请求统计Label 2020-07-24 18:16:52 +08:00
shiziyuan9527 430e1a3a2c refactor: 简化代码 2020-07-24 17:57:45 +08:00
shiziyuan9527 0ca3455122 refactor: 修改变量命名 2020-07-24 17:47:18 +08:00
chenjianxing 2bdc7b6e29 refactor: 接口测试报告完成状态新增成功失败 2020-07-24 14:24:10 +08:00
chenjianxing be96428a13 refactor: 接口测试报告完成状态新增成功失败 2020-07-24 14:23:41 +08:00
chenjianxing 7ab96f2998 feat: 表格拖拽表头调整宽度 2020-07-24 12:02:16 +08:00
chenjianxing f33246db90 feat: 表格拖拽表头调整宽度 2020-07-24 12:01:17 +08:00
chenjianxing e9ebc1407e Merge branch 'v1.1' 2020-07-23 19:46:46 +08:00
chenjianxing bb8571da2d fix: 接口测试保存校验URL正确性 2020-07-23 19:46:17 +08:00
chenjianxing 61d81a46ee refactor: 取消项目名称特殊字符校验 2020-07-23 16:46:28 +08:00
Captain.B 5eed1e2af8 fix: 修复前端显示日志在切换报告后不生效的问题 2020-07-23 11:36:59 +08:00
wangzhen-fit2cloud ab2020873a refactor: Merge branch 'v1.1' 2020-07-23 10:57:44 +08:00
Captain.B 1215f15d00 refactor: 前端查询日志显示前5块数据 2020-07-23 10:54:19 +08:00
q4speed db0d49eb9d refactor: 去掉警告,简化代码 2020-07-23 10:25:08 +08:00
q4speed 344b9f6f77 Merge remote-tracking branch 'origin/master' 2020-07-23 10:20:56 +08:00
q4speed b316344788 fix(高级查询): 修复部分高级查询报错的bug 2020-07-23 10:20:40 +08:00
chenjianxing b877e03e5c Merge branch 'master' of https://github.com/metersphere/server 2020-07-23 07:36:59 +08:00
chenjianxing 0b03cd128f fix: 切换语言后端国际化不生效 2020-07-23 00:05:34 +08:00
chenjianxing 9a5ce9c4c8 fix: 解决嵌套对话框显示问题 2020-07-22 22:46:45 +08:00
chenjianxing 2bc11e4f4e Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-22 21:33:04 +08:00
chenjianxing e32635ed30 fix: 最近用例跳转显示uuid 2020-07-22 21:32:48 +08:00
wenyann 0e54e56c20 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 21:26:28 +08:00
wenyann 8bb657c28e fix: 修改导出用例请求方法 2020-07-22 21:26:03 +08:00
chenjianxing 73a4ee5d12 fix: 测试用例页面浏览器回退问题 2020-07-22 20:42:59 +08:00
wangzhen-fit2cloud b0e02f2b50 refactor: 修改版本号为 1.1 2020-07-22 19:43:15 +08:00
q4speed 78ccfcd99b Merge remote-tracking branch 'origin/master' 2020-07-22 17:52:37 +08:00
q4speed 473cbe8274 fix(高级查询): 修复高级查询执行查询操作后不能保留查询条件的bug 2020-07-22 17:52:23 +08:00
shiziyuan9527 2660ebb975 Merge branch 'v1.1'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/APITestService.java
2020-07-22 15:56:40 +08:00
wenyann 2c9fd0ddc1 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 15:23:48 +08:00
wenyann d5562998e8 fix: 国际化 2020-07-22 15:23:25 +08:00
chenjianxing 159428b4a4 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-22 14:54:31 +08:00
chenjianxing b208847cc9 fix: 断言描述修改后不生效 2020-07-22 14:54:16 +08:00
Captain.B 4bd14608a3 fix: 修复性能测试日志查看时的 duplicate key 的问题 2020-07-22 14:50:35 +08:00
Captain.B c3176d1a6e Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 13:58:12 +08:00
shiziyuan9527 e9f7e532c4 Merge branch 'v1.1' of https://github.com/metersphere/metersphere into v1.1 2020-07-22 13:55:12 +08:00
shiziyuan9527 4b11a3ff85 fix: 添加用户来源列 2020-07-22 13:54:39 +08:00
q4speed 0fa304a409 style(接口测试): 避免测试报告message内容溢出 2020-07-22 13:45:54 +08:00
chenjianxing 451f7311bf fix: 解决冲突 2020-07-22 13:38:31 +08:00
chenjianxing d1f2251536 refactor: swagger 增加url导入 2020-07-22 13:36:49 +08:00
Captain.B fcffefadf2 refactor: 修改没有角色的用户的视图 2020-07-22 13:35:38 +08:00
Captain.B 933a7b3608 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 13:23:09 +08:00
Captain.B 23351a71e2 feat: 增加测试用例和测试计划的高级搜索 2020-07-22 13:22:54 +08:00
q4speed c247110668 fix(接口测试): 修复get provider成功后的提示,i18n 2020-07-22 13:20:37 +08:00
q4speed f4100f43e6 fix(接口测试): 修复get provider成功后的提示 2020-07-22 13:19:39 +08:00
shiziyuan9527 d8383748fd fix: 测试计划执行接口测试产生的测试报告触发方式为空的问题 2020-07-22 12:57:42 +08:00
shiziyuan9527 8312c4f090 fix: ldap i18n 2020-07-22 12:47:03 +08:00
shiziyuan9527 0b1a0964d1 Merge branch 'v1.1' of https://github.com/metersphere/metersphere into v1.1 2020-07-22 11:35:30 +08:00
shiziyuan9527 ffd4ae427d fix: LDAP支持邮箱登录 2020-07-22 11:35:19 +08:00
q4speed be21158f60 fix(接口测试): 修复场景的Dubbo配置有默认值 2020-07-22 11:02:26 +08:00
chenjianxing bac8f3215e refactor: merge v1.1 2020-07-22 00:04:16 +08:00
chenjianxing f62c6bdb4e refactor: 修改报告图表顺序 2020-07-21 23:54:03 +08:00
chenjianxing dabfb990c3 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-21 22:21:08 +08:00
chenjianxing 751df79f2d refactor: 修改定时任务间隔校验 2020-07-21 22:20:46 +08:00
shiziyuan9527 5d2844c4d3 fix: 接口测试保存之后跳转到接口测试列表 2020-07-21 22:13:01 +08:00
chenjianxing 73774dae50 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-21 22:08:46 +08:00
chenjianxing feeebf7205 fix: 模块重名校验 2020-07-21 22:08:30 +08:00
shiziyuan9527 df2a6af6a4 fix: 测试报告模版名称特殊字符检查 2020-07-21 21:37:29 +08:00
shiziyuan9527 c9b312600a fix: 性能测试测试名称没有标注限制字符 2020-07-21 20:52:36 +08:00
shiziyuan9527 1e08429b21 Merge branch 'v1.1' of https://github.com/metersphere/metersphere into v1.1 2020-07-21 20:48:34 +08:00
shiziyuan9527 91bf921f12 fix: Viewer权限用户名称变为只读用户 2020-07-21 20:47:57 +08:00
chenjianxing 1f94c6181c fix: 环境配置变量名过长显示问题 2020-07-21 20:29:42 +08:00
chenjianxing 4eeede9322 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-21 20:09:29 +08:00
chenjianxing 2e62d31a66 fix: 测试报告开始结束时间校验 2020-07-21 20:09:19 +08:00
chenjianxing cc7c5b9e23 fix: swagger 导入后无法保存 2020-07-21 19:09:05 +08:00
q4speed 1db793a11b fix(接口测试):
场景的Dubbo配置自动赋值给空的请求配置;
Interface配置中提供getProviderList功能
2020-07-21 17:49:08 +08:00
shiziyuan9527 deff09ac54 fix: 用户名称限制长度的问题 2020-07-21 15:21:19 +08:00
Captain.B b196e88014 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-21 14:55:29 +08:00
Captain.B 9a5c02827b feat: 增加测试用例和测试计划的高级搜索 2020-07-21 14:53:42 +08:00
shiziyuan9527 2acc7e586a fix: 系统菜单用户列表能修改LDAP来源用户的邮箱 2020-07-21 14:10:21 +08:00
shiziyuan9527 7bd9f429c2 fix: 系统菜单用户列表能修改LDAP来源用户的密码 2020-07-21 13:52:12 +08:00
shiziyuan9527 459c15db23 fix: 测试计划关联测试用例弹框的按钮可以触发多次 2020-07-21 11:43:05 +08:00
q4speed 382087086f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
2020-07-21 11:37:21 +08:00
q4speed 390384c6a4 feat(接口测试): 增加Dubbo支持 2020-07-21 11:34:30 +08:00
wangzhen-fit2cloud 6c93ed6b27 Merge branch 'v1.1' of github.com:metersphere/metersphere into v1.1 2020-07-21 10:47:24 +08:00
wangzhen-fit2cloud 09dd4a0064 refactor: 修改接口测试导入页面文字描述 2020-07-21 10:47:11 +08:00
Captain.B a2022f8cf0 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-21 10:22:34 +08:00
Captain.B cfac8dfe6c fix: 修复登录页面浏览器标签页上的图标在firefox上不显示的问题 2020-07-21 10:22:19 +08:00
wenyann 9ca7fdf576 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-21 10:16:35 +08:00
wenyann e4cb8647d5 fix: 1.导入用例维护人信息错误 2关联用例后更新用例优先级
3系统参数默认显示错误
2020-07-21 10:15:47 +08:00
chenjianxing e88983ecb3 fix: cron表达式输入提示优化 2020-07-21 01:50:44 +08:00
chenjianxing b7c0acb837 fix: 关闭定时任务,不显示下次执行时间 2020-07-21 01:42:25 +08:00
chenjianxing 4fffe246ed fix: 导入用例页面项目实时更新 2020-07-21 01:38:12 +08:00
chenjianxing 466ce4e790 fix: 导入用例文件上传提示 2020-07-21 01:30:42 +08:00
chenjianxing a52e45cc20 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-21 00:48:24 +08:00
chenjianxing c052d1ea95 fix: 保存环境 2020-07-21 00:47:58 +08:00