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 |
|
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 |