Commit Graph

1975 Commits

Author SHA1 Message Date
Captain.B 59cd84efa2 fix: 修复下载性能测试日志的oom 2020-07-22 19:07:40 +08:00
Captain.B 90489ae2a3 fix: 修复下载性能测试日志的排序问题 2020-07-22 16:16:59 +08:00
shiziyuan9527 2660ebb975 Merge branch 'v1.1'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/APITestService.java
2020-07-22 15:56:40 +08:00
wenyann 2c9fd0ddc1 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 15:23:48 +08:00
wenyann d5562998e8 fix: 国际化 2020-07-22 15:23:25 +08:00
chenjianxing 159428b4a4 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-22 14:54:31 +08:00
chenjianxing b208847cc9 fix: 断言描述修改后不生效 2020-07-22 14:54:16 +08:00
Captain.B 4bd14608a3 fix: 修复性能测试日志查看时的 duplicate key 的问题 2020-07-22 14:50:35 +08:00
Captain.B c3176d1a6e Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 13:58:12 +08:00
Captain.B 1f09dbb24a refactor: 调整session过期时间为可配置,默认1800s 2020-07-22 13:57:53 +08:00
shiziyuan9527 e9f7e532c4 Merge branch 'v1.1' of https://github.com/metersphere/metersphere into v1.1 2020-07-22 13:55:12 +08:00
shiziyuan9527 4b11a3ff85 fix: 添加用户来源列 2020-07-22 13:54:39 +08:00
q4speed 0fa304a409 style(接口测试): 避免测试报告message内容溢出 2020-07-22 13:45:54 +08:00
chenjianxing 451f7311bf fix: 解决冲突 2020-07-22 13:38:31 +08:00
chenjianxing d1f2251536 refactor: swagger 增加url导入 2020-07-22 13:36:49 +08:00
Captain.B fcffefadf2 refactor: 修改没有角色的用户的视图 2020-07-22 13:35:38 +08:00
Captain.B 933a7b3608 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 13:23:09 +08:00
Captain.B 23351a71e2 feat: 增加测试用例和测试计划的高级搜索 2020-07-22 13:22:54 +08:00
q4speed c247110668 fix(接口测试): 修复get provider成功后的提示,i18n 2020-07-22 13:20:37 +08:00
q4speed 20e912a28e Merge remote-tracking branch 'origin/master' 2020-07-22 13:20:03 +08:00
q4speed f4100f43e6 fix(接口测试): 修复get provider成功后的提示 2020-07-22 13:19:39 +08:00
BugKing 81788cec28
docs: 增加英文版 readme
Add README_EN.md
2020-07-22 12:59:17 +08:00
shiziyuan9527 d8383748fd fix: 测试计划执行接口测试产生的测试报告触发方式为空的问题 2020-07-22 12:57:42 +08:00
shiziyuan9527 8312c4f090 fix: ldap i18n 2020-07-22 12:47:03 +08:00
q4speed fc278e6bf7 fix(接口测试): 使用Dubbo常量 2020-07-22 12:26:49 +08:00
noonkho 621b1380c3 Add README_EN.md 2020-07-22 12:26:06 +08:00
q4speed 7365355d8e fix(接口测试): 修复interface重复bug 2020-07-22 12:22:29 +08:00
shiziyuan9527 0b1a0964d1 Merge branch 'v1.1' of https://github.com/metersphere/metersphere into v1.1 2020-07-22 11:35:30 +08:00
shiziyuan9527 ffd4ae427d fix: LDAP支持邮箱登录 2020-07-22 11:35:19 +08:00
q4speed be21158f60 fix(接口测试): 修复场景的Dubbo配置有默认值 2020-07-22 11:02:26 +08:00
BugKing 67503e6d37
docs: 更新 readme 2020-07-22 09:31:13 +08:00
chenjianxing a4cad32132 Merge branch 'v1.1' 2020-07-22 00:06:56 +08:00
chenjianxing c075308efc fix: 解决Github仓库冲突 2020-07-22 00:06:21 +08:00
chenjianxing bac8f3215e refactor: merge v1.1 2020-07-22 00:04:16 +08:00
chenjianxing f62c6bdb4e refactor: 修改报告图表顺序 2020-07-21 23:54:03 +08:00
chenjianxing dabfb990c3 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-21 22:21:08 +08:00
chenjianxing 751df79f2d refactor: 修改定时任务间隔校验 2020-07-21 22:20:46 +08:00
shiziyuan9527 5d2844c4d3 fix: 接口测试保存之后跳转到接口测试列表 2020-07-21 22:13:01 +08:00
chenjianxing 73774dae50 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-21 22:08:46 +08:00
chenjianxing feeebf7205 fix: 模块重名校验 2020-07-21 22:08:30 +08:00
shiziyuan9527 df2a6af6a4 fix: 测试报告模版名称特殊字符检查 2020-07-21 21:37:29 +08:00
shiziyuan9527 c9b312600a fix: 性能测试测试名称没有标注限制字符 2020-07-21 20:52:36 +08:00
shiziyuan9527 1e08429b21 Merge branch 'v1.1' of https://github.com/metersphere/metersphere into v1.1 2020-07-21 20:48:34 +08:00
shiziyuan9527 91bf921f12 fix: Viewer权限用户名称变为只读用户 2020-07-21 20:47:57 +08:00
chenjianxing 1f94c6181c fix: 环境配置变量名过长显示问题 2020-07-21 20:29:42 +08:00
chenjianxing 4eeede9322 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-21 20:09:29 +08:00
chenjianxing 2e62d31a66 fix: 测试报告开始结束时间校验 2020-07-21 20:09:19 +08:00
chenjianxing 43f9f190f7 fix: postman 导入GET请求报错 2020-07-21 19:16:52 +08:00
chenjianxing cc7c5b9e23 fix: swagger 导入后无法保存 2020-07-21 19:09:05 +08:00
Captain.B d60dc04648 refactor: 修改容器停止失败的提示 2020-07-21 18:41:44 +08:00