Commit Graph

3426 Commits

Author SHA1 Message Date
chenjianxing 42ef1bcc89 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-26 11:34:46 +08:00
chenjianxing 71eda1637d Merge branch 'master' into v1.4 2020-10-26 11:34:12 +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 76455e54a5 refactor(接口测试): swagger 导入请求名称使用Summary 2020-10-26 10:57:04 +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
wenyann 578cd10143 Merge remote-tracking branch 'origin/master' 2020-10-23 18:30:59 +08:00
wenyann bc07ab7a98 feat: 消息设置测试计划时间处理 2020-10-23 18:30:37 +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 ed6ca388cc Merge remote-tracking branch 'origin/master' into master 2020-10-23 16:47:09 +08:00
Captain.B e095691cdb fix: 测试计划任务通知接收人列表会变成英文 2020-10-23 16:46:30 +08:00
BugKing e54c69b100
docs: 更新 readme 2020-10-23 16:39:38 +08:00
BugKing eab9bcc6c5
docs: 更新 readme 2020-10-23 16:03:02 +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 3a01ee79b7 Merge remote-tracking branch 'origin/master' 2020-10-23 15:26:53 +08:00
wenyann 611fc1202a fix(消息设置):消息设置修改 2020-10-23 15:26:39 +08:00
Captain.B 9b3b8739eb Merge branch 'v1.4' into master 2020-10-23 15:24:11 +08:00
Captain.B 868ab546ef refactor: 禁用用户之后剔除用户 2020-10-23 15:23:41 +08:00
wenyann 10b258a9b0 fix(消息设置):消息设置修改 2020-10-23 14:52:53 +08:00
Captain.B 54c198ab8e Merge branch 'master' into v1.4 2020-10-23 14:26:46 +08:00
Captain.B fb2c45f1e4 refactor: 本地开发控制台打印sql日志
修改 /opt/metersphere/conf/metershpere.properties 添加
logging.sql.level=debug
2020-10-23 14:00:32 +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
Captain.B 1485bb069d Merge branch 'v1.4' into master 2020-10-23 13:35:38 +08:00
Captain.B 70602c9d95 fix: 去掉sql上的分号 2020-10-23 13:35:00 +08:00
chenjianxing c2afe58014 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-23 12:49:47 +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 2c839b0d61 feat: 消息设置 2020-10-23 11:25:18 +08:00
wenyann e59926abee Merge branch 'v1.4' 2020-10-23 11:23:01 +08:00
wenyann 25e9bff303 feat: 消息设置 2020-10-23 11:20:51 +08:00
fit2-zhao 6f1f3c8901 fix(XPack): 恢复误提交内容 2020-10-23 11:13:45 +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 e367075c58 fix(消息设置): 消息设置 2020-10-23 09:55:22 +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 709a18697d Merge branch 'master' of https://github.com/metersphere/server 2020-10-22 18:19:33 +08:00