Commit Graph

2978 Commits

Author SHA1 Message Date
chenjianxing 3ff42c7da8 Merge branch 'master' of https://github.com/metersphere/server 2020-09-18 13:37:16 +08:00
chenjianxing db4bb31568 refactor: merge master 2020-09-18 13:36:55 +08:00
BugKing 66302a42b8
docs: 更新 readme 2020-09-18 13:07:49 +08:00
BugKing 238cbe2e4e
docs: 更新 readme 2020-09-18 13:07:18 +08:00
BugKing ebf668a5b0
docs: 更新 readme 2020-09-18 13:06:33 +08:00
BugKing af731989e7
docs: 更新 readme 2020-09-18 13:06:00 +08:00
chenjianxing 6383750485 fix(接口测试): 场景折叠问题 2020-09-18 13:05:22 +08:00
BugKing 5d0a6f0873
docs: 更新 readme 2020-09-18 13:03:42 +08:00
chenjianxing 5badcc3a21 Merge branch 'master' of https://github.com/metersphere/server 2020-09-18 11:50:16 +08:00
chenjianxing e3b437827b refactor(接口测试): 支持提取接口到变量 2020-09-18 11:48:46 +08:00
fit2-zhao c5d52a6906 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-18 11:41:25 +08:00
fit2-zhao 56db0e077b refactor(XPack): license增强校验,并对过期时间进行展示 2020-09-18 11:14:44 +08:00
shiziyuan9527 7a6151ab79 feat(测试计划): 测试计划可以修改所属项目 2020-09-18 11:09:37 +08:00
Captain.B afcbe9bcdc Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-09-18 10:56:45 +08:00
Captain.B 316617d04a refactor(性能测试): 修改Kafka acks配置 2020-09-18 10:55:36 +08:00
q4speed 0952b270a1 fix(接口测试): 修复浏览器插件录制的脚本导入到测试平台后,接口顺序发生变化的bug
Closes #396
2020-09-18 10:40:15 +08:00
chenjianxing 18c300f85e Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 21:45:50 +08:00
chenjianxing fbbd943990 feat(接口测试): GET 请求支持 body 2020-09-17 21:45:31 +08:00
shiziyuan9527 89e5c55add fix(测试计划): 提缺陷时同步实际结果 2020-09-17 21:41:52 +08:00
shiziyuan9527 2bad9f925d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 21:27:36 +08:00
shiziyuan9527 5c9c645016 fix(系统设置): 修复创建用户时ID含中文可以创建的问题 2020-09-17 21:27:02 +08:00
chenjianxing 98a46cc5f4 fix: shiro 升级至 1.6.0 2020-09-17 21:19:29 +08:00
chenjianxing d78cdd45e6 fix: AutoCloseable 优化 2020-09-17 21:10:54 +08:00
chenjianxing 1e808df7ba Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 19:37:52 +08:00
chenjianxing cd42469860 fix(接口测试): swagger 导入报错 2020-09-17 19:37:28 +08:00
fit2-zhao 7b8aaaebb6 refactor(测试跟踪): 删除多余模版文件 2020-09-17 18:58:33 +08:00
fit2-zhao 5374525783 fix(测试跟踪): 修改文件流关闭 2020-09-17 18:43:29 +08:00
fit2-zhao a13c3b2de3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 18:41:48 +08:00
fit2-zhao c575a94e7f fix(测试跟踪): 导入缺陷修复 2020-09-17 18:38:49 +08:00
chenjianxing 7b0045d1a7 refactor: 解决冲突 2020-09-17 18:37:38 +08:00
chenjianxing e40ce93182 refactor(测试跟踪): 功能测试支持选择自动方式 2020-09-17 18:36:13 +08:00
wenyann bd42309f73 Merge remote-tracking branch 'origin/master' 2020-09-17 18:24:54 +08:00
wenyann a537892de2 fix:接口测试不执行 2020-09-17 18:24:26 +08:00
q4speed 92d9db0d52 feat(接口测试): 修复搜索条件缺少Success的bug 2020-09-17 18:21:11 +08:00
chenjianxing 6e72c03e2e fix: ScenarioModel.js 报错 2020-09-17 18:16:53 +08:00
q4speed 2e2fdebe1e fix: 去掉console.log 2020-09-17 18:15:51 +08:00
q4speed 7ab46caa36 Merge remote-tracking branch 'origin/master' 2020-09-17 18:13:39 +08:00
q4speed 8cee5b816d fix: 删除重复代码 2020-09-17 18:13:26 +08:00
chenjianxing 94a549cf8e Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 18:12:10 +08:00
chenjianxing 1488109f23 feat(测试跟踪): 执行步骤复制 2020-09-17 18:11:39 +08:00
q4speed d4199e85b4 Merge remote-tracking branch 'origin/master' 2020-09-17 18:09:28 +08:00
q4speed 3994e346b5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/api/test/model/ScenarioModel.js
2020-09-17 18:08:37 +08:00
shiziyuan9527 4766813ae4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 18:07:36 +08:00
q4speed 4e9a2f084f feat(接口测试): 增加逻辑控制器 2020-09-17 18:04:51 +08:00
shiziyuan9527 ed43ef4dc4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 18:03:32 +08:00
shiziyuan9527 92f91fcb48 feat(测试跟踪): 用例评审CURD 2020-09-17 18:03:05 +08:00
chenjianxing 78b0b348a0 feat(接口测试): 场景点图标才折叠 2020-09-17 18:02:46 +08:00
chenjianxing 02ee3a2f40 Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 17:52:34 +08:00
chenjianxing 884ae86d91 fix(接口测试): http请求页面报错 2020-09-17 17:51:16 +08:00
fit2-zhao f4b85d60c6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 17:31:09 +08:00