Commit Graph

411 Commits

Author SHA1 Message Date
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
shiziyuan9527 62cf3ac27c feat(测试跟踪): 测试用例列表添加批量操作按钮 2020-08-03 21:40:00 +08:00
shiziyuan9527 a0600ed4b9 refactor(测试跟踪): 优先级名称变更为用例等级 2020-08-03 14:14:50 +08:00
shiziyuan9527 b9d48bd00e fix: 修复访问最近报告中已删除的报告报错的问题 2020-07-31 15:45:01 +08:00
chenjianxing 2d2ac4f632 feat: 断言支持JSONPath 2020-07-30 17:01:04 +08:00
chenjianxing 335df77ff6 fix: 增加密码长度限制 2020-07-29 15:49:25 +08:00
q4speed 70a45fe807 fix(接口测试): 增加loading的描述 2020-07-28 10:36:35 +08:00
Captain.B 492dca961c feat: 优化停止性能测试是否保留报告 2020-07-27 13:25:47 +08:00
Captain.B 62fa6fd9c6 refactor: 执行测试之后跳转到报告查看页面 2020-07-27 11:11:31 +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
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
chenjianxing 451f7311bf fix: 解决冲突 2020-07-22 13:38:31 +08:00
chenjianxing d1f2251536 refactor: swagger 增加url导入 2020-07-22 13:36:49 +08:00
q4speed c247110668 fix(接口测试): 修复get provider成功后的提示,i18n 2020-07-22 13:20:37 +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
chenjianxing bac8f3215e refactor: merge v1.1 2020-07-22 00:04:16 +08:00
chenjianxing 751df79f2d refactor: 修改定时任务间隔校验 2020-07-21 22:20:46 +08:00
shiziyuan9527 df2a6af6a4 fix: 测试报告模版名称特殊字符检查 2020-07-21 21:37:29 +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 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
q4speed 1db793a11b fix(接口测试):
场景的Dubbo配置自动赋值给空的请求配置;
Interface配置中提供getProviderList功能
2020-07-21 17:49:08 +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 09dd4a0064 refactor: 修改接口测试导入页面文字描述 2020-07-21 10:47:11 +08:00
chenjianxing c052d1ea95 fix: 保存环境 2020-07-21 00:47:58 +08:00
AgAngle 2860b91508 refactor: 接口测试保存提示 2020-07-19 22:35:53 +08:00
chenjianxing f20c9ca591 Merge branch 'master' of https://github.com/metersphere/server 2020-07-17 18:26:00 +08:00
chenjianxing 985385aba2 refactor: 优化接口测试导入 2020-07-17 18:25:09 +08:00
wenyann 9e0653947c Merge branch 'v1.0' 2020-07-17 14:42:02 +08:00
shiziyuan9527 95abc82d44 fix: 测试计划编辑用例时因为用例关联的测试不存在而产生的bug 2020-07-17 13:54:28 +08:00
wenyann 4a22ef3224 Merge remote-tracking branch 'origin/master' 2020-07-16 11:20:04 +08:00
wenyann 8fd6cfba4f fix: 修改校验提示 2020-07-16 11:19:19 +08:00
shiziyuan9527 b5f471c67d feat: 测试用例列表添加ID展示列 2020-07-15 18:52:46 +08:00
chenjianxing ddf4d7f938 Merge branch 'master' of https://github.com/metersphere/server 2020-07-15 15:35:49 +08:00
chenjianxing 685da4ccef feat: Swagger2 导入接口测试 2020-07-15 15:35:36 +08:00
q4speed dfde0171dd fix: 修复"reset"其他语种内容 2020-07-15 11:57:28 +08:00
q4speed cac4d74f56 feat: 2020-07-15 11:54:52 +08:00
q4speed 60423f43a6 fix: 修复繁体中文部分创建人没有翻译的bug 2020-07-14 14:04:40 +08:00
q4speed 4b83f68b6a fix: 修复高级搜索国际化bug 2020-07-14 11:17:42 +08:00
q4speed 97bdb3f5e1 style: 修复小屏幕样式 2020-07-14 10:45:24 +08:00
q4speed c98c8bd340 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/i18n/en-US.js
	frontend/src/i18n/zh-CN.js
	frontend/src/i18n/zh-TW.js
2020-07-13 10:27:06 +08:00
q4speed 8df025f84c Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/i18n/en-US.js
	frontend/src/i18n/zh-CN.js
	frontend/src/i18n/zh-TW.js
2020-07-13 10:25:17 +08:00
q4speed a975a85d56 i18n 2020-07-13 10:18:05 +08:00
shiziyuan9527 d9ab83afa0 i18n 2020-07-10 17:34:33 +08:00
q4speed 8cb07f6ab6 高级查询控件i18n 2020-07-10 16:49:23 +08:00
q4speed 37577b76b0 高级查询控件 2020-07-10 16:43:43 +08:00
shiziyuan9527 019933d4d2 i18n 2020-07-09 16:35:29 +08:00
wenyann fc39278cae 在提交Case结论时增加防呆处理 2020-07-09 16:22:51 +08:00
chenjianxing 93b011a4ac Merge branch 'master' of https://github.com/metersphere/server 2020-07-08 17:56:17 +08:00
chenjianxing 5318537e12 支持 postman 导入 2020-07-08 17:56:05 +08:00
shiziyuan9527 e45810701d ldap 2020-07-08 15:47:44 +08:00
chenjianxing 3341602733 i18n 2020-07-07 09:13:32 +08:00
shiziyuan9527 74417e6bec Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-02 17:35:26 +08:00
shiziyuan9527 f9c9709fd3 i18n 2020-07-02 17:34:36 +08:00
Captain.B 48c0299ca8 再次执行测试功能 2020-07-02 16:43:49 +08:00
Captain.B 910ce17270 立即停止测试功能 2020-06-29 13:40:02 +08:00
wenyann a29fd908f6 '删除提示' 2020-06-23 13:23:40 +08:00
chenjianxing 4972b11b4b Merge branch 'v1.0' of https://github.com/metersphere/server into v1.0 2020-06-23 13:09:58 +08:00
Captain.B 4055ef2f83 点击显示 secretkey i18n 2020-06-23 09:31:03 +08:00
wenyann c3fc3010b6 Merge branches 'master' and 'v1.0' of https://github.com/metersphere/metersphere into v1.0 2020-06-22 18:29:29 +08:00
Captain.B 78b0f4a4d9 用户添加apikey 2020-06-22 18:22:58 +08:00
wenyann 20f59cad3a '删除提示' 2020-06-19 14:03:16 +08:00
chenjianxing 26a450de6d merge v1.0 2020-06-17 18:03:48 +08:00
wenyann 47fc83bcc3 '用户创建密码框提示' 2020-06-16 15:47:34 +08:00
shiziyuan9527 5f1ff0753f 性能测试压力配置添加参数校验 2020-06-16 15:29:33 +08:00
q4speed 5ae9522282 接口测试增加导出配置 2020-06-16 11:01:35 +08:00
wenyann 02a5c99a8b '用户创建密码框提示' 2020-06-16 10:49:39 +08:00
chenjianxing a3bd0a7be5 测试报告失败用例列表i18n 2020-06-15 18:59:55 +08:00
shiziyuan9527 f675a8fa82 i18n 2020-06-11 15:41:50 +08:00
chenjianxing 115e545181 只读用户权限问题 2020-06-10 19:04:48 +08:00
chenjianxing 247bb88666 资源池启用校验优化 2020-06-10 11:11:38 +08:00
王振 82c0d658f2 update i18n 2020-06-08 17:49:42 +08:00
chenjianxing f247cab1f1 删除组织提示 2020-06-08 13:22:46 +08:00
chenjianxing bd320ff002 删除工作空间提示 2020-06-08 13:17:14 +08:00
chenjianxing ad2f41f07a 删除项目确认 2020-06-08 12:58:38 +08:00
chenjianxing 5c2fb3fca1 删除测试计划确认 2020-06-08 11:55:10 +08:00
chenjianxing d07676e678 i18n 2020-06-05 17:37:27 +08:00
chenjianxing 5833c3b902 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-04 15:56:47 +08:00
chenjianxing 8e8dbf5259 关于页 2020-06-04 15:56:22 +08:00
shiziyuan9527 076e0b657f i18n 2020-06-04 14:32:43 +08:00
wenyann ff0d49fb6f 'session国际化' 2020-06-02 19:39:31 +08:00
wenyann 1a562ef255 '修改测试报告展示' 2020-06-02 18:14:03 +08:00
q4speed 8e3af5ad68 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 16:12:30 +08:00
q4speed 2d118712a2 创建接口测试时,带入最后选择的项目 2020-06-02 16:12:20 +08:00
chenjianxing 96e3111768 i18n 2020-06-02 15:24:43 +08:00
shiziyuan9527 fbcd87f7ca 性能测试名称校验 2020-06-02 11:35:39 +08:00
q4speed f4d3e95170 1.增加URL验证
2.URL不填不能保存或运行
2020-05-29 18:44:00 +08:00
shiziyuan9527 c03656f5ad 性能测试报告添加创建人 2020-05-29 17:21:50 +08:00
shiziyuan9527 ab19dc0627 Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-05-29 17:02:49 +08:00
shiziyuan9527 464fd7abb0 添加性能测试创建人 2020-05-29 17:02:39 +08:00
chenjianxing d97eacd5e4 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-29 16:46:58 +08:00
shiziyuan9527 b602eae04c Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-05-29 16:42:54 +08:00
shiziyuan9527 3fc0f46f35 性能测试修改文件上传个数 2020-05-29 16:42:28 +08:00
q4speed 34d2fac553 复制接口测试 2020-05-29 16:29:57 +08:00
q4speed b116516af1 Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-05-29 14:57:32 +08:00
q4speed 11979fd663 从接口测试 创建 性能测试 2020-05-29 14:57:19 +08:00
shiziyuan9527 3dbd617ded i18n 2020-05-29 14:15:32 +08:00
chenjianxing 18eee8c2a6 没有模块时,提示先创建模块 2020-05-29 14:15:20 +08:00
shiziyuan9527 a3f97c8362 项目描述添加长度限制 2020-05-29 11:05:49 +08:00
chenjianxing 5cd7841004 测试计划-测试用例关联测试 2020-05-28 14:27:11 +08:00
chenjianxing 660035b1a8 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-27 12:25:18 +08:00
chenjianxing 74827189bc fix 删除项目 2020-05-27 12:25:02 +08:00
shiziyuan9527 65a54d9286 i18n 2020-05-27 10:38:19 +08:00
wenyann 7760fbea72 修改session过期提示 2020-05-26 18:45:22 +08:00
wenyann 499ddca4c3 Merge remote-tracking branch 'origin/dev' into dev 2020-05-26 17:29:16 +08:00
wenyann 0511cfedb7 .. 2020-05-26 17:27:37 +08:00
shiziyuan9527 c8be28e2aa i18n 2020-05-26 16:35:33 +08:00
q4speed 12b4aae62c 完成follow_redirects,展示子请求内容 2020-05-26 14:32:20 +08:00
wenyann 57c8150a5d 修改组织成员提示 2020-05-25 19:13:59 +08:00
chenjianxing cf0f35eba3 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-25 17:26:06 +08:00
chenjianxing b7b33ad2bb 删除项目提示并删除测试跟踪资源 2020-05-25 17:25:49 +08:00
shiziyuan9527 a16c0be406 i18n 2020-05-25 17:00:54 +08:00
q4speed 063e3ec03d 增加失败场景 2020-05-22 17:49:48 +08:00
shiziyuan9527 9ec6dd2170 创建编辑工作空间时校验特殊字符 2020-05-22 15:49:59 +08:00
q4speed 4896115c1c Merge remote-tracking branch 'origin/dev' into dev 2020-05-22 13:25:44 +08:00
q4speed 44cfaf811a 增加创建人列 2020-05-22 13:25:16 +08:00
chenjianxing f415a121a5 无项目时创建模块报错 2020-05-22 10:39:30 +08:00
chenjianxing 647f3eac34 修改节点时填充原名称 2020-05-21 14:51:24 +08:00
chenjianxing d031adf090 模版名称校验 2020-05-21 14:41:08 +08:00
wenyann 94dd8372a4 Merge remote-tracking branch 'origin/dev' into dev 2020-05-21 12:00:06 +08:00
wenyann 0560f85bf4 修改 2020-05-21 11:59:36 +08:00
wenyann 5ce5b89e89 修改 2020-05-21 11:59:29 +08:00
chenjianxing a64c63cc7d 备注长度限制 2020-05-21 09:13:44 +08:00
wenyann 2f1c847e87 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
2020-05-20 17:27:03 +08:00
wenyann 7f06194cff 邮件服务设置 2020-05-20 17:22:45 +08:00
q4speed b3724c0fe2 修复标题bug 2020-05-20 15:25:42 +08:00
Captain.B 5142f5bf37 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-20 14:17:18 +08:00
q4speed f5bdeb1695 增加场景的按钮,修复复制后id重复问题 2020-05-19 19:07:25 +08:00
Captain.B f91f0cc91a role 去掉下划线 2020-05-19 15:21:19 +08:00
Captain.B f0853e4c4d label width 2020-05-19 15:17:21 +08:00
shiziyuan9527 037e75053c 系统用户列表修改 2020-05-19 14:34:11 +08:00
q4speed cc4b5015d1 所属测试 2020-05-19 14:26:18 +08:00
Captain.B ba3fe5a1ab i18n 2020-05-18 15:51:13 +08:00
Captain.B 7638513556 heatmap 2020-05-18 14:45:11 +08:00
q4speed 78aaf1ebf3 跳转链接 2020-05-18 14:14:23 +08:00
chenjianxing be6d48f497 修改缺陷字段名称 2020-05-18 09:34:16 +08:00
chenjianxing 71dd8d531d 前端国际化 2020-05-17 16:31:01 +08:00
chenjianxing a4ab4e238b 批量删除测试用例 2020-05-16 15:06:24 +08:00
q4speed b4f300d275 i18n 2020-05-14 15:03:44 +08:00
Captain.B 6f76bbfe9f i18n 2020-05-14 14:52:16 +08:00
q4speed 96a70308e3 默认加载所有语言文件 2020-05-14 14:33:38 +08:00
Captain.B d082ebc7d2 zh-tw 2020-05-14 11:34:15 +08:00
shiziyuan9527 a8dd83b3cc i18n 2020-05-13 18:12:15 +08:00
shiziyuan9527 96e275c095 用户角色国际化 2020-05-13 17:58:26 +08:00
q4speed 709c207fcc 场景公用变量和Header 2020-05-13 12:59:41 +08:00
q4speed 80a50999a7 Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 15:27:10 +08:00
q4speed eddc19fa75 增加提取功能的JMX内容 2020-05-12 15:26:55 +08:00
shiziyuan9527 17be7deb21 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/business/components/settings/system/User.vue
2020-05-12 15:23:42 +08:00
shiziyuan9527 a05782e6c1 设置系统管理员入口 2020-05-12 15:19:40 +08:00
Captain.B 34ef1be442 i18n 2020-05-12 14:44:56 +08:00
q4speed bc294c354c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/i18n/zh-CN.js
2020-05-12 11:27:36 +08:00
q4speed 796f00f403 增加提取功能的页面 2020-05-12 11:25:04 +08:00
Captain.B 101401d6fc 样式 2020-05-12 11:24:38 +08:00
BugKing 5719f67c04
Update zh-CN.js 2020-05-11 18:25:22 +08:00
shiziyuan9527 d183914eff i18n 2020-05-11 18:08:00 +08:00
wenyann 4a958d6f44 Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 14:13:16 +08:00
wenyann 8880599f29 修改密码 2020-05-11 14:12:29 +08:00
q4speed f07078fdf6 修复element ui国际化文件加载失败的bug 2020-05-11 11:48:52 +08:00
wenyann a690ffecde Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev
 Conflicts:
	frontend/src/i18n/en-US.js
2020-05-09 17:40:17 +08:00
wenyann 6924832fee demo 2020-05-09 17:38:30 +08:00
q4speed 29a78a42c7 API翻译同步 2020-05-09 16:03:30 +08:00
q4speed efec984b90 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 14:51:51 +08:00
q4speed 2a7be35de1 API报告页面 2020-05-09 14:51:37 +08:00
wenyann 998134b1f1 修改用户密码 2020-05-09 12:06:09 +08:00
Captain.B 841019d4a7 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
 Conflicts:
	frontend/src/i18n/zh-CN.js
2020-05-08 18:03:34 +08:00
Captain.B 843d7ed3b1 日志下载 2020-05-08 18:02:58 +08:00
wenyann 62ee448245 demo 2020-05-08 17:19:28 +08:00
q4speed 6745d8b5fc 修复key value不能正确显示的问题 2020-05-08 11:04:04 +08:00
q4speed b5e7b74633 Merge remote-tracking branch 'origin/dev' into dev 2020-05-08 00:00:05 +08:00
q4speed 39aed31aa5 生成report 2020-05-07 23:59:51 +08:00
Captain.B 02ab2f230a Merge remote-tracking branch 'origin/dev' into dev 2020-05-07 13:37:22 +08:00
Captain.B 17c8a98f56 修改资源池状态 2020-05-07 13:37:05 +08:00
shiziyuan9527 dee5790ae7 i18n 2020-05-07 11:37:39 +08:00
shiziyuan9527 6f7848ee0d i18n 2020-05-06 18:04:56 +08:00
shiziyuan9527 b0c5bd52ec 组织,工作空间相关资源关联删除 2020-05-06 14:12:03 +08:00
q4speed 1cae0333f9 Merge remote-tracking branch 'origin/dev' into dev 2020-04-30 16:50:59 +08:00
q4speed d97f72315c 生成jmx 2020-04-30 16:50:43 +08:00
shiziyuan9527 e5ead937d7 修改消息提示 2020-04-27 18:20:23 +08:00
chenjianxing e4b02ec997 删除计划前校验 2020-04-27 09:43:08 +08:00
chenjianxing 6854a6f5d3 测试用例批量移动 2020-04-26 16:55:50 +08:00
chenjianxing bc518448a6 fix 测试用例 2020-04-26 14:25:22 +08:00
chenjianxing 288dd65b70 修改测试计划阶段 2020-04-24 17:00:24 +08:00
q4speed 5c40ea5327 Merge remote-tracking branch 'origin/dev' into dev 2020-04-24 14:09:22 +08:00
q4speed 290532224a NaN 2020-04-24 14:09:10 +08:00
chenjianxing 6e3ec26fc0 克隆测试用例 2020-04-24 13:56:32 +08:00
q4speed 1294739df6 run button 2020-04-23 17:08:48 +08:00
q4speed b2d0e0cf3b Merge remote-tracking branch 'origin/dev' into dev 2020-04-22 17:30:07 +08:00
q4speed 6aa69cee66 api测试,未完待续 2020-04-22 17:29:54 +08:00
chenjianxing b32a6f1377 测试用例面包屑 2020-04-21 23:07:36 +08:00
chenjianxing fcddbfcb48 fix 我的实例 2020-04-21 13:56:10 +08:00
chenjianxing eb61f51fd0 国际化 2020-04-21 13:19:46 +08:00
chenjianxing 3fd4e2ee6c 样式 2020-04-21 10:05:51 +08:00
q4speed 98a5ede3f6 api测试界面,未完待续 2020-04-20 18:40:02 +08:00
q4speed d2817334b7 Merge remote-tracking branch 'origin/dev' into dev 2020-04-17 18:38:57 +08:00