Commit Graph

2576 Commits

Author SHA1 Message Date
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
q4speed 02e8b7b12b refactor(接口测试): 测试 2020-11-11 17:10:13 +08:00
shiziyuan9527 437630eb81 feat: zentao组件添加地址属性 2020-11-11 17:02:26 +08:00
Captain.B 67f411f583 Merge remote-tracking branch 'origin/master' into master 2020-11-11 16:03:41 +08:00
Captain.B 8394d88093 refactor(性能测试): 修改文件名称 2020-11-11 16:02:36 +08:00
shiziyuan9527 1ed403f92a refactor: i18n 2020-11-11 15:45:46 +08:00
shiziyuan9527 c2e3dd99a9 refactor: 拆分组件 2020-11-11 15:07:45 +08:00
q4speed fbfb606ef2 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into jmx-convert
 Conflicts:
	frontend/src/business/components/api/test/model/ScenarioModel.js
2020-11-11 13:49:09 +08:00
q4speed 5a3310a837 refactor(接口测试): 后台转换JMX 2020-11-11 13:40:24 +08:00
Captain.B 6b443008cd feat(接口测试): 增加场景级别断言配置 2020-11-11 12:09:56 +08:00
Captain.B d772fac5e3 chore: 同步submodule 2020-11-10 17:35:26 +08:00
Captain.B 8ab1065805 Merge remote-tracking branch 'origin/master' into master 2020-11-10 17:34:12 +08:00
Captain.B cb16e89eb2 fix(性能测试): 修复 rpsenable 不能切换的问题 2020-11-10 17:33:48 +08:00
shiziyuan9527 9e09d24323 fix(接口测试): 修复报告批量删除时展示数量与选中数量不一致的问题 2020-11-10 17:29:55 +08:00
shiziyuan9527 5b7dda9825 refactor: 规范组件名 2020-11-10 16:57:40 +08:00
Captain.B 3b656cb538 refactor: 修改表格 th 的 hover 事件 2020-11-10 10:58:43 +08:00
Captain.B 123a2a9046 feat(性能测试): 支持配置不同的线程组参数 2020-11-10 10:41:07 +08:00
Captain.B e1b5c32f3c refactor(接口测试): 接口的报告列表增加分页 2020-11-09 18:56:12 +08:00
fit2-zhao 9bdb4f9625 feat(接口定制): 基础保存功能完善 2020-11-09 18:44:56 +08:00
Captain.B ac8d1da7d4 feat(性能测试): 支持配置不同的线程组参数 2020-11-09 17:37:11 +08:00
Captain.B 2d1a5a1995 feat(性能测试): 支持配置不同的线程组参数 2020-11-09 16:45:39 +08:00
fit2-zhao 8404272115 Merge branch 'master' into local-api-delimit 2020-11-06 18:24:59 +08:00
fit2-zhao b8b5d7d1d3 初版本保存完成 2020-11-06 18:24:11 +08:00
wenyann 1e5e19417e style(API): 接口测试报告页面在左侧请求列表中增加结果状态显示 2020-11-06 13:58:06 +08:00
Captain.B c3c79dd929 Merge remote-tracking branch 'origin/master' into master 2020-11-05 17:18:58 +08:00
Captain.B d8b0af015c refactor(系统设置): 显示设置当license无效的时候不显示菜单 2020-11-05 17:18:35 +08:00
chenjianxing 63e234b74b Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-05 17:16:48 +08:00
chenjianxing 33ebc1e065 refactor(接口测试): 选择mutipart/from-data后,清除其他content-type 2020-11-05 17:16:30 +08:00
Captain.B 0b08a3d06d Merge remote-tracking branch 'origin/master' into master 2020-11-05 16:53:53 +08:00
Captain.B 4f7768a8e0 feat(性能测试): 性能测试支持jar 2020-11-05 16:45:45 +08:00
chenjianxing ae83c6aecd Merge branch 'v1.4' 2020-11-05 15:42:54 +08:00
shiziyuan9527 6e287d6188 feat: 删除资源池时提示哪些测试正在使用 2020-11-05 15:30:38 +08:00
wenyann b0ac3e0219 fix(系统设置):手机号设置为必填 2020-11-05 15:02:34 +08:00
shiziyuan9527 1625bff625 fix: 删除项目时强制删除项目下的资源 2020-11-05 14:41:13 +08:00
Captain.B 3a311dba44 refactor(系统设置): 显示设置 2020-11-05 14:31:24 +08:00
Captain.B 9aeed6b027 refactor(系统设置): 显示设置i18n 2020-11-05 12:45:12 +08:00
Captain.B b3682de7a4 feat(系统设置): 显示设置 2020-11-05 12:32:24 +08:00
chenjianxing 16e3ceb8ad fix(接口测试): body kv参数请求异常 2020-11-05 10:35:16 +08:00
Captain.B da97ae04fd Merge remote-tracking branch 'origin/master' into master 2020-11-05 09:36:08 +08:00
Captain.B e0c0b05ace feat(系统设置): 显示设置 2020-11-05 09:35:36 +08:00
wenyann c1f4c8cba3 fix: 修复用例评审评论链接 2020-11-04 18:09:11 +08:00
wenyann 0d663a0579 fix(消息设置):修复点击取消记录在页面消失 2020-11-04 17:49:48 +08:00
chenjianxing 12f994a57f fix(接口测试): 请求头设置失效 2020-11-04 14:27:47 +08:00
chenjianxing c482bdc985 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-04 14:26:39 +08:00
chenjianxing 100625c8e0 fix(接口测试): 请求头设置失效 2020-11-04 14:26:27 +08:00
Captain.B 2183154d4d Merge remote-tracking branch 'origin/master' into master 2020-11-04 14:03:58 +08:00
Captain.B 24bae7736d refactor(性能测试): 性能测试生成错误之后转到日志详情 2020-11-04 14:03:28 +08:00
chenjianxing 26ba9a93ea Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-04 11:17:07 +08:00
chenjianxing b5fe5fad10 fix(接口测试): xpath断言保存不生效 2020-11-04 11:16:58 +08:00
shiziyuan9527 7e395a4209 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-11-04 10:49:00 +08:00
shiziyuan9527 12e86889f7 feat(测试跟踪): 测试计划列表增加进度列 2020-11-04 10:48:50 +08:00
chenjianxing db65773cb0 Merge branch 'v1.4' 2020-11-03 17:34:13 +08:00
chenjianxing bd577770a4 fix(测试跟踪): 切换测试计划时,关联用例列表不更新 2020-11-03 17:23:01 +08:00
chenjianxing 021fef4980 fix(接口测试): get请求无法追加url参数 2020-11-03 17:13:56 +08:00
Captain.B 8cb881fe42 Merge branch 'v1.4' into master 2020-11-03 14:42:12 +08:00
chenjianxing 7e9afdac38 fix(接口测试): 环境请求头和变量引用异常 2020-11-03 14:32:35 +08:00
chenjianxing 6c1721baef fix(接口测试): TCP 页面空白 2020-11-03 10:07:15 +08:00
chenjianxing b97cf5aeaf feat(接口测试): xpath断言 2020-11-03 09:36:11 +08:00
Captain.B b44e3d623e Merge branch 'v1.4' into master 2020-11-02 17:11:44 +08:00
fit2-zhao 519338e508 Merge branch 'master' into local-api-delimit
# Conflicts:
#	frontend/src/i18n/zh-TW.js
2020-11-02 16:24:55 +08:00
fit2-zhao 0c89fd3c14 feat(接口定义): 初步页面完成 2020-11-02 16:21:30 +08:00
chenjianxing 870f9f9388 Merge branch 'v1.4' 2020-11-02 14:37:36 +08:00
chenjianxing 917b3adc58 fix(接口测试): 禁用场景置灰请求 2020-11-02 14:36:06 +08:00
Captain.B fc27054a1f Merge remote-tracking branch 'origin/master' into master 2020-10-30 18:16:37 +08:00
shiziyuan9527 4e911ebb92 fix(测试跟踪): 修复测试用例模块未拖拽成功时也会发送请求的问题 2020-10-30 15:43:30 +08:00
Captain.B e09e04c9ec refactor: 点击报告行跳转报告页面 2020-10-30 15:37:55 +08:00
wenyann d1665940c7 fix: i18n 2020-10-30 14:39:55 +08:00
chenjianxing d1fc4b4cdd refactor(接口测试): 请求体选择的请求格式以请求头填写优先 2020-10-30 14:37:00 +08:00
chenjianxing a6b61959c2 fix(接口测试): 环境中变量填写样式问题 2020-10-30 11:43:17 +08:00
chenjianxing 6416f6c2fc fix(接口测试): 环境中变量填写样式问题 2020-10-30 11:42:37 +08:00
chenjianxing 36bcea6ca6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-29 20:54:42 +08:00
chenjianxing 3927da1d02 refactor(接口测试): 测试报告格式化优化 2020-10-29 20:52:16 +08:00
shiziyuan9527 25d62b6397 feat(测试跟踪): 测试用例同级模块排序 2020-10-29 18:16:35 +08:00
chenjianxing f5f5b35968 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 19:30:24 +08:00
chenjianxing d564296a97 fix(接口测试): 场景url拼接不正确 2020-10-28 19:30:15 +08:00
wenyann 753b9da5c1 Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-28 18:54:37 +08:00
wenyann 55d41d50a2 feat: 消息设置性能测试 2020-10-28 18:54:02 +08:00
chenjianxing 29cd976431 fix(接口测试): 文件上传自定义content-type 2020-10-28 18:02:36 +08:00
chenjianxing 0dbf3b943d Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 17:34:26 +08:00
chenjianxing 2bb75e753d fix(接口测试): 项目列表控制台报错 2020-10-28 17:33:54 +08:00
q4speed 53ba1ac3e1 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 17:32:18 +08:00
q4speed 9be3a0370c Merge remote-tracking branch 'origin/v1.4' into v1.4
# Conflicts:
#	frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
2020-10-28 17:30:19 +08:00
chenjianxing 370863834d Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 17:29:37 +08:00
chenjianxing ab1c90a47b refactor(接口测试): sql请求结果格式化 2020-10-28 17:29:29 +08:00
q4speed b7af640080 feat(接口测试): 增加脚本断言 2020-10-28 17:25:41 +08:00
Captain.B e97231657b Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-28 17:20:19 +08:00
Captain.B 9987bb9be4 feat(性能测试): 性能测试error统计 2020-10-28 17:20:04 +08:00
shiziyuan9527 5b305a288a fix(用例评审): 用例评审列表用户ID修改为用户名 2020-10-28 17:05:23 +08:00
shiziyuan9527 f3f496b484 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-28 16:42:45 +08:00
Captain.B baa5b09b0d feat(性能测试): 性能测试error统计 2020-10-28 16:42:19 +08:00
shiziyuan9527 b9e5bb3355 fix(测试跟踪): 修复测试方式为自动时通过按钮被禁用的问题 2020-10-28 16:42:13 +08:00
Captain.B 9a34a5f27f fix: 修复改了资源池之后资源池ID变了的问题 2020-10-28 12:19:19 +08:00
Captain.B d26c05a306 feat: 测试计划用例列表高级搜索中增加按执行人搜索 2020-10-28 10:37:01 +08:00
Captain.B 32f130c05e Merge branch 'v1.4' into master 2020-10-27 13:26:00 +08:00
shiziyuan9527 7add174a32 feat(测试跟踪): 用例评审评论支持编辑和删除 2020-10-27 11:26:34 +08:00
Captain.B c8d3456a61 Merge branch 'v1.4' into master 2020-10-27 09:52:23 +08:00
chenjianxing 32771d7c6e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-26 19:12:58 +08:00
chenjianxing 8efda5ef5e refactor(接口测试): 优化jsonpath推荐 2020-10-26 19:12:46 +08:00
Captain.B 3989c53eda refactor: 测试跟踪首页修改 2020-10-26 18:24:35 +08:00
Captain.B ad97428e1d feat: 测试用例前置条件换行显示 2020-10-26 18:11:30 +08:00
Captain.B 04d10717de Merge branch 'v1.4' into master 2020-10-26 17:49:42 +08:00
wenyann d9db503bb3 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-26 17:13:11 +08:00
wenyann 6b5361f8b2 fix(消息设置):性能测试通知 2020-10-26 17:12:50 +08:00
Captain.B e33e92c6d7 refactor(消息通知): 拆分组件 2020-10-26 16:13:54 +08:00
pencui 712de81915
新增http请求,jsonpath断言批量功能 (#599)
* 新增jsonpath断言批量推荐功能

* 修复xpack下错误的代码结构

* 补正改版后的jsonpath解析功能

Co-authored-by: root <root@localhost.localdomain>
2020-10-26 11:33:36 +08:00
chenjianxing a7a2f495d6 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-26 10:02:04 +08:00
chenjianxing a0b2dbb53e refactor(接口测试): 修改全局变量代码模版 2020-10-26 10:01:55 +08:00
chenjianxing 8a894503b2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-26 09:59:49 +08:00
chenjianxing 7969c38ef8 refactor(接口测试): 修改全局变量代码模版 2020-10-26 09:59:40 +08:00
Captain.B d85b0141d2 Merge remote-tracking branch 'origin/master' into master 2020-10-23 18:02:07 +08:00
Captain.B aed4f98b72 Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-23 18:01:11 +08:00
Captain.B b2877d0110 refactor: 简化代码 2020-10-23 18:00:59 +08:00
chenjianxing 3439bd95cf Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-23 18:00:32 +08:00
chenjianxing 45c2022424 fix(系统设置): 管理人员列表显示 2020-10-23 17:58:38 +08:00
Captain.B caaa082e54 refactor: 简化代码 2020-10-23 17:56:15 +08:00
wenyann c658df065e Merge remote-tracking branch 'origin/master' 2020-10-23 17:31:27 +08:00
wenyann d74ba542ed fix(消息设置):添加提示 2020-10-23 17:31:10 +08:00
Captain.B dc092b3d32 fix: 测试计划任务通知接收人列表会变成英文 2020-10-23 17:26:55 +08:00
Captain.B e095691cdb fix: 测试计划任务通知接收人列表会变成英文 2020-10-23 16:46:30 +08:00
shiziyuan9527 6beacb8b05 fix(测试跟踪): 修复批量更新用例后最近的用例列表未刷新的问题 2020-10-23 15:56:48 +08:00
shiziyuan9527 042f43d9da fix(测试跟踪): 修复功能测试的测试方式不能批量设置为自动的问题 2020-10-23 15:42:44 +08:00
wenyann ce3952bb3e fix(消息设置):添加提示 2020-10-23 15:34:33 +08:00
wenyann 611fc1202a fix(消息设置):消息设置修改 2020-10-23 15:26:39 +08:00
wenyann 10b258a9b0 fix(消息设置):消息设置修改 2020-10-23 14:52:53 +08:00
wenyann f64d7a21b0 Merge remote-tracking branch 'origin/master' 2020-10-23 14:00:03 +08:00
wenyann 056ea0aea1 fix(消息设置):消息设置人员范围 2020-10-23 13:48:24 +08:00
chenjianxing 4b7a42d2e8 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-23 12:47:24 +08:00
chenjianxing 196bcec3bf fix(接口测试): 引用复制场景保存测试报错 2020-10-23 12:47:06 +08:00
wenyann 00e7c7bed9 fix(消息设置): 非空提示 2020-10-23 10:51:41 +08:00
Captain.B d55354ab92 refactor: 消息通知的候选人列表隔离 2020-10-23 10:42:37 +08:00
wenyann 0a3e0574da fix(消息设置): 消息设置 2020-10-23 09:55:04 +08:00
chenjianxing 0da55f5ef0 fix: 系统设置页面权限缺失 2020-10-22 21:00:04 +08:00
chenjianxing b4fd4dc910 refactor(接口测试): 修改请求参数、请求内容名称 2020-10-22 18:19:23 +08:00
shiziyuan9527 318383afea Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-22 15:02:18 +08:00
shiziyuan9527 5bde8dfef4 fix: 修复创建测试计划失败的问题 2020-10-22 15:01:44 +08:00
wenyann 5d789ce222 fix(消息设置): 表格内容居中显示 2020-10-22 13:34:59 +08:00
wenyann ce3fdd366a feat: 消息设置 2020-10-22 10:37:02 +08:00
wenyann 6e5397489f Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-22 10:22:43 +08:00
wenyann dd5ee58e28 Merge remote-tracking branch 'origin/v1.4' into v1.4
# Conflicts:
#	backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
2020-10-22 10:21:46 +08:00
chenjianxing 133e1b2aea fix(系统设置): 管理员不能禁用自己 2020-10-22 10:16:09 +08:00
wenyann b5db4991e4 feat: 消息设置 2020-10-22 10:13:26 +08:00
Captain.B c51329433a Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-22 09:54:46 +08:00
Captain.B a9394eacb3 fix(性能测试): 修复压力配置-开启RPS上限按钮,执行测试后,按钮自动关闭 2020-10-22 09:54:34 +08:00
chenjianxing 935ad0f4f0 fix(接口测试): 修复误删代码 2020-10-22 09:43:39 +08:00
shiziyuan9527 040b10c2f5 fix(测试跟踪): 修复复制测试用例时附件未复制的问题 2020-10-21 21:36:25 +08:00
chenjianxing 063b821de7 Merge branch 'master' of https://github.com/metersphere/server 2020-10-21 19:10:46 +08:00
chenjianxing e98755d38e fix(接口测试): jar包描述长度限制 2020-10-21 19:09:20 +08:00