Commit Graph

2245 Commits

Author SHA1 Message Date
chenjianxing 3841ff55d8 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-24 18:22:46 +08:00
chenjianxing 8d389f0298 fix: post 参数encoding 2020-07-24 18:22:31 +08:00
wenyann 08192eb605 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-24 18:20:56 +08:00
wenyann dd39904c5d refactor: 修改方法名;调整条件筛选sql 2020-07-24 18:20:15 +08:00
shiziyuan9527 de984bbebb fix: 修改性能测试报告请求统计Label 2020-07-24 18:16:52 +08:00
shiziyuan9527 430e1a3a2c refactor: 简化代码 2020-07-24 17:57:45 +08:00
wenyann 9bd0b71662 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-24 17:49:25 +08:00
wenyann 404bcff3b7 refactor(deps): 调整条件筛选sql 2020-07-24 17:48:55 +08:00
shiziyuan9527 0ca3455122 refactor: 修改变量命名 2020-07-24 17:47:18 +08:00
Captain.B 4ba5a57bde Merge remote-tracking branch 'origin/master' 2020-07-24 16:10:37 +08:00
Captain.B 265232b5e6 refactor: 添加构建jmeter镜像的dockerfile 2020-07-24 16:10:22 +08:00
Captain.B 1369ea3abb refactor: 添加构建jmeter镜像的dockerfile 2020-07-24 16:03:48 +08:00
shiziyuan9527 56e0415ddb refactor: 简化代码 2020-07-24 15:04:38 +08:00
shiziyuan9527 fd8b9b3a1c refactor: 修改判断测试用例是否存在的方法 2020-07-24 14:42:16 +08:00
chenjianxing 2bdc7b6e29 refactor: 接口测试报告完成状态新增成功失败 2020-07-24 14:24:10 +08:00
chenjianxing be96428a13 refactor: 接口测试报告完成状态新增成功失败 2020-07-24 14:23:41 +08:00
chenjianxing 7ab96f2998 feat: 表格拖拽表头调整宽度 2020-07-24 12:02:16 +08:00
chenjianxing cfef5f1999 Merge branch 'master' of https://github.com/metersphere/server 2020-07-24 12:01:36 +08:00
chenjianxing f33246db90 feat: 表格拖拽表头调整宽度 2020-07-24 12:01:17 +08:00
chenjianxing e9ebc1407e Merge branch 'v1.1' 2020-07-23 19:46:46 +08:00
chenjianxing bb8571da2d fix: 接口测试保存校验URL正确性 2020-07-23 19:46:17 +08:00
q4speed f7f8258371 refactor: 简化代码 2020-07-23 17:39:26 +08:00
chenjianxing e6479365a5 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-23 16:46:45 +08:00
chenjianxing 61d81a46ee refactor: 取消项目名称特殊字符校验 2020-07-23 16:46:28 +08:00
Captain.B ebefc9df76 Merge branch 'v1.1' 2020-07-23 13:24:11 +08:00
Captain.B a95d4465f5 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-23 12:32:56 +08:00
Captain.B b863e78469 refactor: 修改性能测试日志下载flush 2020-07-23 12:32:41 +08:00
chenjianxing c3e54df8bb Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-23 11:56:04 +08:00
chenjianxing fb0653c0f0 fix: 插件导入请求头等信息缺失 2020-07-23 11:55:42 +08:00
chenjianxing 3d17cd6460 Merge branch 'master' of https://github.com/metersphere/server 2020-07-23 11:54:52 +08:00
chenjianxing 0e53f0bdd2 fix: 插件导入请求头等信息缺失 2020-07-23 11:54:35 +08:00
Captain.B 5eed1e2af8 fix: 修复前端显示日志在切换报告后不生效的问题 2020-07-23 11:36:59 +08:00
Captain.B d107be2985 refactor: 修改性能测试日志查询的pagesize 2020-07-23 11:22:44 +08:00
wangzhen-fit2cloud ab2020873a refactor: Merge branch 'v1.1' 2020-07-23 10:57:44 +08:00
Captain.B 7880c09b53 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-23 10:57:17 +08:00
Captain.B 1215f15d00 refactor: 前端查询日志显示前5块数据 2020-07-23 10:54:19 +08:00
chenjianxing fffea1a1da Merge branch 'master' of https://github.com/metersphere/server 2020-07-23 10:42:52 +08:00
chenjianxing 896594e9d9 Merge branch 'v1.1' 2020-07-23 10:42:22 +08:00
chenjianxing aca349e590 erge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-23 10:41:45 +08:00
chenjianxing 354c6afca4 fix: URL导入失败 2020-07-23 10:41:31 +08:00
wangzhen-fit2cloud 57c02609b8 refactor: Merge branch 'v1.1' 2020-07-23 10:31:27 +08:00
Captain.B b5f2afc4f8 Merge branch 'v1.1' of github.com:fit2cloudrd/metersphere-server into v1.1 2020-07-23 10:26:46 +08:00
Captain.B bd3ea709b2 fix: 修复下载性能测试日志的oom 2020-07-23 10:26:39 +08:00
q4speed db0d49eb9d refactor: 去掉警告,简化代码 2020-07-23 10:25:08 +08:00
q4speed 344b9f6f77 Merge remote-tracking branch 'origin/master' 2020-07-23 10:20:56 +08:00
q4speed b316344788 fix(高级查询): 修复部分高级查询报错的bug 2020-07-23 10:20:40 +08:00
chenjianxing 55a2a96da3 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-23 10:12:53 +08:00
chenjianxing 28a58b7ecf fix: 解决冲突 2020-07-23 10:12:15 +08:00
chenjianxing 9d5164ed9f fix: 删除测试时停止任务 2020-07-23 10:11:06 +08:00
Captain.B 6107789244 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-23 10:05:33 +08:00