Commit Graph

2822 Commits

Author SHA1 Message Date
chenjianxing 79df8d2475 refactor(测试跟踪): 重构测试计划 2020-12-08 17:41:26 +08:00
BugKing 59c04230f1 fix(接口测试): 补充合并pr #895后缺少的路由 2020-12-08 17:17:48 +08:00
BugKing 7a0004cb5a Merge branch 'v1.5' into master 2020-12-08 17:05:11 +08:00
shiziyuan9527 dd39bb3399 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-08 16:04:25 +08:00
shiziyuan9527 3c9b61fc89 refactor(系统设置): 修改项目管理样式 2020-12-08 16:02:17 +08:00
q4speed c30e933463 Merge remote-tracking branch 'origin/master' 2020-12-08 15:33:21 +08:00
q4speed 83143a3b44 feat(接口自动化): 查看引用 2020-12-08 15:33:07 +08:00
Captain.B 48c9af48c4 Merge remote-tracking branch 'origin/master' into master 2020-12-08 15:19:48 +08:00
shiziyuan9527 c0eeab33ba Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-08 15:19:28 +08:00
shiziyuan9527 8da32177de refactor(系统设置): 创建项目 2020-12-08 15:17:59 +08:00
Captain.B 05141df790 refactor(XPack): 消息通知模版 2020-12-08 15:12:35 +08:00
fit2-zhao 6ce41bdbde Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-08 13:47:49 +08:00
fit2-zhao ffb2fc8bdc feat(接口自动化): 完成场景公共参数,修复接口定义另存用例问题 2020-12-08 13:47:09 +08:00
BugKing 7fe2164f34 style: 调整顶部导航菜单高度 2020-12-08 13:44:40 +08:00
chenjianxing d24c9c43b2 fix: 前端报错 2020-12-08 12:02:12 +08:00
chenjianxing 91d37ccafe feat(接口测试): 接口定义插件格式导入 2020-12-08 11:28:23 +08:00
chenjianxing 0d8d12b17b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-07 20:17:32 +08:00
chenjianxing 036d5a5551 feat(接口测试): 接口定义 postman 导入 2020-12-07 20:17:25 +08:00
fit2-zhao d762644d87 feat(接口自动化): 完成场景调试,和基础报告 2020-12-07 19:08:26 +08:00
fit2-zhao b848830976 feat(接口自动化): 完成场景批量执行,基础报告生成 2020-12-07 19:03:51 +08:00
shiziyuan9527 30e9bb7932 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-07 17:29:23 +08:00
shiziyuan9527 48c82d2852 feat(系统设置): 项目管理迁移至系统设置 2020-12-07 17:28:04 +08:00
Captain.B 09466ec80c fix: 修复v-xpack指令错误 2020-12-07 17:25:56 +08:00
chenfanghang a590e93b89 refactor(接口监控):http状态码监控可跳转到相应报告 2020-12-07 14:29:40 +08:00
chenjianxing 1aab595ab0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-07 11:04:00 +08:00
chenjianxing 7ba3c09a3d refacotr(接口测试): swagger 导入创建模块 2020-12-07 11:03:37 +08:00
fit2-zhao 8d7ec9b8ed Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-04 18:06:27 +08:00
Captain.B 7bfb226314 Merge remote-tracking branch 'origin/master' into master 2020-12-04 18:04:42 +08:00
chenjianxing 768ed785a9 fix(接口测试): metersphere 文件导入错误 2020-12-04 18:01:32 +08:00
fit2-zhao 57986195e7 feat(接口自动化): 完成场景调试,和基础报告 2020-12-04 18:00:37 +08:00
Captain.B faf8c1f80f Merge branch 'v1.5' into master
# Conflicts:
#	frontend/src/business/components/api/router.js
#	frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
2020-12-04 17:57:00 +08:00
Captain.B 0abd7209e0 fix(性能测试): 修复多个线程组不能设置线程数的问题 2020-12-04 17:56:06 +08:00
Captain.B 7ee9522298 chore: 同步 submodule
(cherry picked from commit 9e62022ae9)
2020-12-04 17:35:53 +08:00
BugKing 25631ce05f Revert "chore: 同步 submodule"
This reverts commit 9e62022a
2020-12-04 15:53:21 +08:00
chenjianxing 5b41a76935 fix(测试跟踪): 编辑用例报错 2020-12-04 10:55:51 +08:00
chenjianxing 897017be77 fix(接口测试): json结果自动格式化 2020-12-04 10:44:40 +08:00
chenjianxing 26119e21c7 Merge branch 'v1.5' of https://github.com/metersphere/metersphere into v1.5 2020-12-04 10:43:13 +08:00
chenjianxing 4441824404 refactor(接口测试): 数据库接口表头可复制 fixes #679 2020-12-04 10:42:53 +08:00
BugKing bbcebb078e Merge branch 'v1.5-temp' into v1.5 2020-12-04 09:40:04 +08:00
fit2-zhao 97e3f91008 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 19:37:33 +08:00
fit2-zhao 25238c2b32 feat(接口自动化): 完成场景引用和复制,接口的引用和复制 2020-12-03 19:36:43 +08:00
chenjianxing 02681ef715 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 19:36:15 +08:00
chenjianxing 5d37c09413 fix: 导入id和请求id一致 2020-12-03 19:36:08 +08:00
Captain.B 403e72393c Merge remote-tracking branch 'origin/master' into master 2020-12-03 16:44:57 +08:00
Captain.B 882c1d3b17 refactor: 消息设置页面重构 2020-12-03 16:42:40 +08:00
chenjianxing 18d2d68486 refactor: 删除多余代码 2020-12-03 16:32:27 +08:00
chenjianxing f581a5626f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 16:28:35 +08:00
chenjianxing 3bd7a1d049 refactor(接口测试): swagger 导入重构造 2020-12-03 16:28:23 +08:00
Captain.B 3ebec6a84a refactor: 消息设置滚动条设置 2020-12-03 16:17:52 +08:00
Captain.B 30e3432d6d fix: 修复左上角的logo的样式 2020-12-03 15:23:20 +08:00
fit2-zhao ade3fe2043 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-03 13:50:53 +08:00
fit2-zhao c967e59511 feat(接口自动化): 完成场景自定义标签 2020-12-03 13:50:11 +08:00
Captain.B da6d7044e3 chore: Sync submodule 2020-12-03 13:27:10 +08:00
Captain.B f2d0f87724 Merge branch 'master' into notice-refactor 2020-12-03 12:50:41 +08:00
Captain.B 22a0a94613 refactor: 重构发送通知 2020-12-03 12:46:02 +08:00
fit2-zhao b7a472a08c Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-02 19:23:05 +08:00
fit2-zhao 77a1724bc7 feat(接口自动化): 场景自动化基本画面完成 2020-12-02 19:22:58 +08:00
q4speed 7ee2374b00 refactor(接口自动化): 修改全选 2020-12-02 18:23:26 +08:00
q4speed 02a5eb9570 fix(接口自动化): 修复点击模块不能正确更新场景列表的bug 2020-12-02 15:48:47 +08:00
fit2-zhao 0450186735 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-02 15:34:58 +08:00
q4speed 4065663f55 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	frontend/src/business/components/api/automation/ApiAutomation.vue
#	frontend/src/i18n/zh-CN.js
2020-12-02 15:34:04 +08:00
fit2-zhao c90789e48c feat(接口自动化): 场景自动化基本画面完成 2020-12-02 15:34:00 +08:00
q4speed 9e600dab94 feat(接口自动化): 场景列表 2020-12-02 15:32:16 +08:00
fit2-zhao 4e12976dfd fix(接口定义): 统一id 方便后续引用 2020-12-02 14:31:53 +08:00
fit2-zhao d571c9dc07 fix(接口定义): http 协议headers 收入到请求中 2020-12-02 14:21:17 +08:00
chenjianxing 529b003c2b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-01 21:07:39 +08:00
chenjianxing b08775dbb9 feat(接口测试): 接口定义导入 2020-12-01 21:07:32 +08:00
fit2-zhao 1a576c40b8 feat(接口自动化): 基础交互完成 2020-12-01 19:30:10 +08:00
fit2-zhao 184b7ca3f4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-01 17:49:17 +08:00
fit2-zhao 184cd9659c feat(接口自动化): 创建场景 2020-12-01 17:49:09 +08:00
fit2-zhao f62ae2bd59 fix(接口定义): 自动生成代码规范修改 2020-12-01 17:47:39 +08:00
shiziyuan9527 439cf3b89b refactor(测试跟踪): 用例评审查询优化 2020-12-01 15:00:30 +08:00
Captain.B 44e21cea8f fix: 修复display引入的问题 2020-12-01 13:23:23 +08:00
Captain.B 3a16942876 fix: 修复display引入的问题 2020-12-01 13:20:05 +08:00
Captain.B 605e308159 refactor: 消息通知页面修改 2020-12-01 11:00:46 +08:00
Captain.B e1eef7ee41 Merge remote-tracking branch 'origin/master' into master 2020-12-01 10:44:38 +08:00
Captain.B 4c38f01243 chore: Sync submodule 2020-12-01 10:44:18 +08:00
chenjianxing 65c0bf3f32 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-01 10:38:44 +08:00
chenjianxing 80fa0ab394 refactor(测试跟踪): 重构测试跟踪详情 2020-12-01 10:38:36 +08:00
Captain.B 3975954e35 Merge branch 'v1.5' into master 2020-12-01 10:31:36 +08:00
Captain.B b7fb3cc8ec fix: 修复关闭rpsLimit时,不输入rpsLimit无法保存的问题
Closes #839
2020-12-01 10:29:57 +08:00
Captain.B 705de64835 Merge branch 'v1.5' into master 2020-12-01 10:15:04 +08:00
Captain.B 4a26b3baf6 fix(性能测试): 去掉input中的placeholder
Closes #838
2020-12-01 10:14:06 +08:00
Captain.B edab268a4c Merge branch 'v1.5' into master 2020-12-01 10:00:11 +08:00
BugKing 6a4f78d2fe fix: 修复接口测试监控响应码图表不显示的问题 2020-11-30 20:44:58 +08:00
BugKing 0acc2a915d refactor: 解决合并后的冲突 2020-11-30 19:07:44 +08:00
chenfanghang 8dc013927c feat(接口监控):增加响应时间与状态监控功能 2020-11-30 18:52:57 +08:00
Captain.B 9b975c54d0 Merge remote-tracking branch 'origin/master' into master 2020-11-30 18:17:08 +08:00
Captain.B 1ba7a8365b refactor: 显示设置调整位置,提供hasLicense函数处理v-pack失效的问题 2020-11-30 18:16:53 +08:00
shiziyuan9527 3c05506204 refactor(系统设置): 调整缺陷管理平台图标大小 2020-11-30 17:57:15 +08:00
Captain.B 5491eac52e refactor: 增加一个v-xpack指令 2020-11-30 17:41:51 +08:00
fit2-zhao 4facb91b34 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 17:22:06 +08:00
fit2-zhao 388d9850a2 fix(接口定义): 校验调整 2020-11-30 17:21:47 +08:00
shiziyuan9527 6ed65e22d3 refactor(测试跟踪): 优化查询 2020-11-30 16:40:02 +08:00
shiziyuan9527 834baeac31 Merge branch 'refector' 2020-11-30 14:59:37 +08:00
fit2-zhao b9fc0c8195 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 14:30:08 +08:00
fit2-zhao ae11f66b79 feat(接口自动化): 基础结构创建 2020-11-30 14:29:49 +08:00
chenjianxing a3d98b5921 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-30 14:27:44 +08:00
chenjianxing 0c7ba5cb80 refactor: 认证相关请求返回4xx响应码 2020-11-30 14:27:28 +08:00
fit2-zhao 6f0458de80 feat(接口定义): 紧凑布局调整不必要的填充 2020-11-27 18:47:03 +08:00
fit2-zhao 1e558b202d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-27 18:32:10 +08:00
fit2-zhao f16abd6631 feat(接口定义): 用例加载功能优化 2020-11-27 18:31:49 +08:00
chenjianxing 30a1858ffa fix: 解决冲突 2020-11-27 18:09:30 +08:00
chenjianxing c53fe5ac4a fix(接口测试): 引用的场景支持禁用启用 2020-11-27 17:57:23 +08:00
Captain.B 88de5c9449 Merge remote-tracking branch 'origin/master' into master 2020-11-27 16:29:58 +08:00
Captain.B a1d32d79a8 Merge branch 'v1.5' into master 2020-11-27 16:29:41 +08:00
chenjianxing c0329ce42a refactor(接口测试): 数据库配置添加清空按钮 2020-11-27 16:02:35 +08:00
fit2-zhao 115ca3005b feat(接口定义): 修改自定义主题色 2020-11-27 15:52:29 +08:00
fit2-zhao 586a6fdb64 fix(接口定义): 修复加载方法 2020-11-27 14:38:22 +08:00
fit2-zhao 73204d7793 feat(接口定义): 合并master 最新代码 2020-11-27 13:59:18 +08:00
fit2-zhao 22108b3048 feat(接口定义): 合并master 最新代码 2020-11-27 13:58:25 +08:00
chenjianxing 8333c3f77d fix(测试跟踪): 首页最近测试跳转错误 2020-11-27 13:39:22 +08:00
fit2-zhao 9931403308 feat(接口定义):细节调整 2020-11-27 12:30:13 +08:00
fit2-zhao 23b2391968 feat(接口定义):高度处理 2020-11-27 11:44:58 +08:00
fit2-zhao e081448183 feat(接口定义):完成回收站功能 2020-11-27 11:30:47 +08:00
chenjianxing 320ca1c542 fix(接口测试): 单接口调试点击请求报错 2020-11-27 11:16:03 +08:00
Captain.B d2cf26b16c chore: 同步 submodule
(cherry picked from commit 9e62022ae9)
2020-11-27 10:20:02 +08:00
fit2-zhao 4871c9864a feat(接口定义):细节调整 2020-11-26 18:41:05 +08:00
fit2-zhao bc4aba0210 feat(接口定义): 基本功能优化完成 2020-11-26 18:29:23 +08:00
shiziyuan9527 5d1ecc51d1 refactor(测试跟踪): 优化查询 2020-11-26 18:04:15 +08:00
chenjianxing 7659f1d11b fix(接口测试): 避免定时任务时间刷新报错 2020-11-26 15:54:18 +08:00
chenjianxing 3e9767ef88 fix(接口测试): 引用环境列表通过项目过滤 2020-11-26 15:38:47 +08:00
chenjianxing a2f1e18aa7 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-26 15:05:14 +08:00
chenjianxing d3386b748a fix(测试跟踪): 报告导出样式缺失 2020-11-26 15:04:10 +08:00
fit2-zhao 5bfbf01c3d feat(接口定义): 所有协议基本完成 2020-11-26 14:23:33 +08:00
wenyann c1c8f35296 Merge remote-tracking branch 'origin/master' 2020-11-26 13:55:52 +08:00
wenyann a2e7e0ae88 fix: 2020-11-26 13:55:29 +08:00
chenjianxing c15f3064c0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-26 13:01:22 +08:00
chenjianxing 4868426241 fix(性能测试): 报告导出样式问题 2020-11-26 13:01:07 +08:00
Captain.B 9e62022ae9 chore: 同步 submodule 2020-11-26 11:52:43 +08:00
chenjianxing 479beca209 fix(测试跟踪): 测试计划开始结束时间校验 2020-11-26 10:34:38 +08:00
chenjianxing ab31922cb7 fix: session到期错误提示 2020-11-26 09:53:30 +08:00
chenjianxing cea611a783 fix(接口测试): 去掉body请求描述 2020-11-25 21:08:22 +08:00
chenjianxing a5f2da3104 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-25 19:48:13 +08:00
chenjianxing b5d926e264 fix(接口测试): 只读用户定时任务页面自动跳转 2020-11-25 19:48:04 +08:00
Captain.B 13a3820570 Merge remote-tracking branch 'origin/master' into master 2020-11-25 18:55:36 +08:00
Captain.B 57d7db8b94 Merge branch 'v1.5' into master 2020-11-25 18:55:23 +08:00
fit2-zhao 2ba69e9a32 feat(接口定义): 完成JDBC快捷调试 2020-11-25 18:52:33 +08:00
Captain.B e440d36ead fix: 修复显示设置加载图片的问题 2020-11-25 18:51:34 +08:00
chenjianxing e56c42dcc4 fix(测试跟踪): 测试用例点击全部用例展示问题 2020-11-25 17:43:08 +08:00
chenjianxing a6289cd55d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-25 17:32:12 +08:00
chenjianxing 5bf126fa2e fix(接口测试): 测试报告导出异常 2020-11-25 17:31:55 +08:00
fit2-zhao 78f4383bb3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-25 17:25:33 +08:00
fit2-zhao 2b4f8266fb fix(测试跟踪): 修复关联用例重复问题 2020-11-25 17:24:30 +08:00
Captain.B 4f93da8907 Merge branch 'v1.5' into master
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-11-25 16:49:52 +08:00
Captain.B 245da1d1ca fix: 修复显示设置加载图片的问题 2020-11-25 16:49:20 +08:00
Captain.B 0ffe1cc414 Merge remote-tracking branch 'origin/master' into master 2020-11-25 16:39:27 +08:00
Captain.B 756c8d3fff Merge branch 'v1.5' into master
# Conflicts:
#	frontend/src/business/components/xpack
2020-11-25 16:39:14 +08:00
Captain.B 17142dc4b3 fix: 修复显示设置加载图片的问题 2020-11-25 16:38:31 +08:00
fit2-zhao 948fcdb3b8 feat(接口定义): SQL协议快捷调试 2020-11-25 16:32:16 +08:00
shiziyuan9527 45a7a05c14 fix(用例评审): 修复只读用户可以给用例评审加评论的问题 2020-11-25 16:23:53 +08:00
wenyann d87aad20b1 Merge remote-tracking branch 'origin/master' 2020-11-25 15:42:01 +08:00
wenyann 4bd6c8ec71 fix: 修复输入项目名称,点击enter键,项目没有创建成功,页面没有提示
Closes 819
2020-11-25 15:38:58 +08:00
fit2-zhao 8db0b4349a feat(接口定义): TCP,SQL,DUBBO 协议基本录入完成 2020-11-25 15:31:06 +08:00
Captain.B dcfb7a687a fix: 修复显示设置字数没有限制的问题 2020-11-25 15:26:15 +08:00
shiziyuan9527 1c635c4617 refactor(系统设置): 修改用户ID长度限制 2020-11-25 15:04:19 +08:00
BugKing 4122a81100 refactor: 去掉不必要的注释 2020-11-25 14:09:29 +08:00
BugKing b4a517c4ff style: 修改代码格式 2020-11-25 13:48:40 +08:00
BugKing 2543618ace Merge branch 'v1.5' into master 2020-11-25 13:44:57 +08:00
shiziyuan9527 e43ce4fa0a fix(系统设置): 修复创建用户时电话号码不支持199段的问题
Closes 818
2020-11-25 11:26:09 +08:00
BugKing 7b5dd9c14f refactor: 修改版本号 2020-11-25 11:15:29 +08:00
chenjianxing 83daf96f01 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-25 10:18:06 +08:00
chenjianxing 76e0991067 fix: 登入过期,提示报错 2020-11-25 10:17:57 +08:00
Captain.B ece7b9ebb8 Merge remote-tracking branch 'origin/master' into master 2020-11-25 09:40:11 +08:00
Captain.B 0bd6599d36 Merge branch 'v1.5' into master 2020-11-25 09:39:55 +08:00
chenjianxing fbf6b59425 fix: 修复带长度限制的文本框样式 2020-11-24 19:44:04 +08:00
fit2-zhao cbc9c42122 feat(接口定义): TCP 协议基础完成 2020-11-24 19:36:45 +08:00
chenjianxing cbf889831b refactor(接口测试): 数据库配置检验 2020-11-24 19:01:55 +08:00
Captain.B 4a0c640aee refactor: 邮件配置匿名改成免密 2020-11-24 18:33:59 +08:00
chenjianxing ed26d25ac7 refacotr(测试跟踪): 删除测试计划提示 2020-11-24 17:14:29 +08:00
chenjianxing d3ceb8ff5f fix(接口测试): jar包描述错别字 2020-11-24 15:48:34 +08:00
chenjianxing d02f530538 fix(接口测试): 请求体取消自动格式化 2020-11-24 14:36:15 +08:00
Captain.B 848a9481f8 fix(性能测试): 线程数不能小于资源池节点数 2020-11-24 13:30:32 +08:00
Captain.B 7be21db324 fix(性能测试): 线程数不能小于资源池节点数 2020-11-24 13:30:12 +08:00
fit2-zhao eaffeb8508 登录问题合并 2020-11-24 11:05:36 +08:00
fit2-zhao 9408555bba Merge branch 'master' into local-api-delimit
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/APITestService.java
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/business/components/api/report/components/ResponseText.vue
2020-11-24 10:56:36 +08:00
Captain.B b013b8b790 Merge remote-tracking branch 'origin/master' into master 2020-11-24 10:50:23 +08:00
Captain.B a1b37a3c53 perf: 优化测试用例每页显示速度 2020-11-24 10:50:03 +08:00
fit2-zhao cef0258d2f fix(系统设置): 恢复注释内容 2020-11-24 10:43:51 +08:00
Captain.B f92209383b Merge branch 'v1.5' into master
# Conflicts:
#	frontend/src/business/components/track/case/components/TestCaseList.vue
2020-11-24 10:43:09 +08:00
fit2-zhao c6a981e965 feat(接口定义):添加协议处理 2020-11-24 10:42:21 +08:00
Captain.B e6fc2adb58 perf: 优化测试用例每页显示速度 2020-11-24 10:39:25 +08:00
wenyann 8d4df55549 Merge remote-tracking branch 'origin/master' 2020-11-24 10:33:59 +08:00
wenyann 1f107b69ff fix: 消息设置修改 2020-11-24 10:33:28 +08:00
chenjianxing 3225a76c43 fix(系统设置): 删除组织用户 2020-11-23 21:26:44 +08:00
chenjianxing 7ddb5f51a3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-23 20:22:10 +08:00
chenjianxing 4190eb92fd fix(接口测试): sql 查询多表格式化优化 2020-11-23 20:21:56 +08:00
fit2-zhao 4bae9662de feat(接口定义):添加协议处理 2020-11-23 19:25:28 +08:00
fit2-zhao 064735b2a4 feat(接口定义): 断言规则处理 2020-11-23 19:18:47 +08:00
fit2-zhao 0f0b11fd85 feat(接口定义): 基础参数重构 2020-11-23 19:00:21 +08:00
shiziyuan9527 a296de1afd refactor(测试跟踪): 用例评审评论换行 2020-11-23 18:56:49 +08:00
fit2-zhao f8475dca0c feat(接口定义): 按照不同协议处理 2020-11-23 18:15:09 +08:00
shiziyuan9527 f97e20ee06 fix(测试跟踪): 修复测试用例模块改变而测试计划关联用例时左侧模块未刷新的问题 2020-11-23 18:06:09 +08:00
fit2-zhao 7f2fe8acd1 feat(接口定义): 完成提取参数和断言规则 2020-11-23 15:17:19 +08:00
shiziyuan9527 ea3895d315 refactor: 删除无用代码 2020-11-23 14:44:54 +08:00
fit2-zhao 595c9572de feat(接口定义): 提取处理 2020-11-23 13:16:27 +08:00
wenyann 4ba24afeee fix: 添加日志,调整代码格式 2020-11-23 12:36:33 +08:00
fit2-zhao ac0d65ee1e feat(接口定义): 断言处理 2020-11-23 12:32:49 +08:00
fit2-zhao e008baaf2e Merge branch 'master' into local-api-delimit
# Conflicts:
#	backend/src/main/resources/i18n/messages_en_US.properties
#	backend/src/main/resources/i18n/messages_zh_CN.properties
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/business/components/api/test/ApiTestConfig.vue
2020-11-23 12:31:48 +08:00
chenjianxing 744de357c3 fit(接口测试): jsonpath 断言推荐自动转义正则特殊字符 2020-11-23 12:08:30 +08:00
fit2-zhao 06e8d48344 feat(接口定义): 增加断言 2020-11-23 11:36:04 +08:00
chenjianxing 1b1611514c fix(接口测试): 响应时间断言格式校验 2020-11-23 11:28:26 +08:00
chenjianxing 5e7fd1f72a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-23 10:59:32 +08:00
chenjianxing 0b90d44eaa fix(测试跟踪): 关联用例为其他时,跳转到系统设置页面 2020-11-23 10:59:25 +08:00
chenjianxing 1fce27a3c1 fix(测试跟踪): 测试用例全部用例按钮无效 2020-11-23 10:20:52 +08:00
Captain.B be8b56a36f chore: sync submodule 2020-11-23 10:00:51 +08:00
chenjianxing ab87a73602 fix(接口测试): 环境host域名长度限制增大 2020-11-23 09:46:09 +08:00
fit2-zhao 58cbe145f7 feat(接口定义): 认证配置 完成 2020-11-20 18:56:21 +08:00
wenyann 6d3b3ccfa4 Merge remote-tracking branch 'origin/master' 2020-11-20 14:58:11 +08:00
wenyann fc4b266511 fix: 修改任务通知-编辑,无法修改webhook地址 2020-11-20 14:57:19 +08:00
Captain.B 1ee83581a0 fix: 修复显示设置相关问题 2020-11-20 14:36:23 +08:00
Captain.B f4fc6fc94b fix: 修复显示设置相关问题 2020-11-20 14:00:39 +08:00
Captain.B 16ab55bf4c fix(性能测试): 修复报告页并发数显示不对 2020-11-20 10:45:12 +08:00
fit2-zhao bdaff53eaf feat(接口定义): 请求数据格式按照jmeter 数据格式重构完成 2020-11-19 19:14:06 +08:00
Captain.B 6629af30e5 refactor: 修改用例编辑的操作列宽度
Closes #782
2020-11-19 12:24:59 +08:00
Captain.B 0f5fdd4d27 refactor: 修改用例编辑的操作列宽度 2020-11-19 12:22:47 +08:00
Captain.B 8429add30e refactor(性能测试): 将压测时间单位改为秒 2020-11-19 10:08:54 +08:00
shiziyuan9527 7d1f976905 fix(测试跟踪): 修复测试计划切换模块时分页未重置的问题 2020-11-18 14:55:01 +08:00
fit2-zhao 8fd084db51 接口定义-基本执行方法完成 2020-11-18 14:31:39 +08:00
Captain.B 6d609eb990 style: css 中的 ' 改成 " 2020-11-18 12:29:41 +08:00
shiziyuan9527 8329a7deed fix(测试跟踪): 修复未关联Tapd项目提交缺陷时会出现处理人框的问题 2020-11-18 11:06:13 +08:00
Captain.B f3ee4fce98 style: 去掉多余的console.log
Closes #778
2020-11-18 10:13:45 +08:00
Captain.B 7f0efeab68 refactor: 测试报告的loading提示
Closes #778
2020-11-17 18:12:43 +08:00
Captain.B 0b2feb4d57 refactor: 修改user列表操作列宽度 2020-11-17 17:42:06 +08:00
Captain.B 654e1ef622 chore: 同步 submodule 2020-11-17 16:28:57 +08:00
Captain.B 82c258b553 refactor: 测试报告的loading提示 2020-11-17 16:27:39 +08:00
shiziyuan9527 519d43a8a5 refactor: i18n 2020-11-17 15:58:59 +08:00
shiziyuan9527 55f933aa55 feat(测试跟踪): 集成Zentao 2020-11-17 15:25:00 +08:00
BugKing 2924a73fcb style: 修改 CSS 文件格式 2020-11-17 10:44:36 +08:00
chenjianxing 62f32e5d38 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-16 22:06:57 +08:00
chenjianxing 23af8e25ea fix: 报告导出空白页 2020-11-16 22:06:50 +08:00
fit2-zhao 515c92060b 接口定义-基本执行方法完成 2020-11-16 20:14:17 +08:00
Captain.B 460d2377c5 fix: 修复设置页面图片和title的问题 2020-11-16 18:19:11 +08:00
shiziyuan9527 0ecb9870a1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-16 16:11:42 +08:00
shiziyuan9527 1858ef5857 refactor: i18n 2020-11-16 16:10:33 +08:00
shiziyuan9527 4598c10864 feat(测试跟踪): 集成zentao 2020-11-16 16:04:11 +08:00
chenjianxing acaddcbe7a feat: 添加组织成员角色 2020-11-16 15:53:03 +08:00
shiziyuan9527 a94c8473f3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-16 13:57:53 +08:00
zhao.yong ae065ae3ba 改造执行方法,放到后台处理 2020-11-13 18:40:38 +08:00
Captain.B abd12d5d77 refactor: 下载jtl 2020-11-13 16:58:57 +08:00
Captain.B f40f0bbede refactor: 下载jtl 2020-11-13 16:32:59 +08:00
wenyann d3862866fe fix: 登陆密码长度,邮箱设置 2020-11-13 14:19:14 +08:00
wenyann a94453b518 fix: 登陆密码长度,邮箱设置 2020-11-13 14:15:54 +08:00
q4speed 0218d3411e fix(接口测试): 修复合并分支问题 2020-11-13 11:07:15 +08:00
fit2-zhao 1a7d70a142 Merge remote-tracking branch 'remotes/origin/jmx-convert' into local-api-delimit
# Conflicts:
#	backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
#	backend/src/main/java/io/metersphere/api/dto/scenario/request/HttpRequest.java
#	frontend/src/business/components/api/test/ApiTestConfig.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
2020-11-13 10:44:03 +08:00
fit2-zhao fccabe6311 Merge remote-tracking branch 'remotes/origin/jmx-convert' into local-api-delimit
# Conflicts:
#	backend/src/main/java/io/metersphere/api/dto/scenario/KeyValue.java
#	backend/src/main/java/io/metersphere/api/dto/scenario/request/HttpRequest.java
#	frontend/src/business/components/api/test/ApiTestConfig.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
2020-11-13 10:43:37 +08:00
fit2-zhao 5005cbdd85 Merge branch 'master' into local-api-delimit
# Conflicts:
#	frontend/package.json
2020-11-13 09:43:20 +08:00
fit2-zhao a887840214 feat(接口定制): 基础保存功能完善 2020-11-13 09:38:37 +08:00
Captain.B 100798e0f2 refactor: 修改操作列的 min-width 2020-11-12 15:12:38 +08:00
q4speed fecc4c4a7e refactor: 删除测试 2020-11-11 17:40:36 +08:00