Commit Graph

1996 Commits

Author SHA1 Message Date
Captain.B 1215f15d00 refactor: 前端查询日志显示前5块数据 2020-07-23 10:54:19 +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
chenjianxing 55a2a96da3 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-23 10:12:53 +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
Captain.B c517952a20 fix: 修复日志查询时的排序 2020-07-23 10:05:14 +08:00
chenjianxing c20e4c4e8c Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-23 09:59:09 +08:00
chenjianxing 1637dd53cf fix: 删除测试时删除定时任务 2020-07-23 09:58:52 +08:00
Captain.B 50c6cfa4d2 style: 格式化代码,优化 import 2020-07-23 09:38:19 +08:00
chenjianxing 0b03cd128f fix: 切换语言后端国际化不生效 2020-07-23 00:05:34 +08:00
chenjianxing 9a5ce9c4c8 fix: 解决嵌套对话框显示问题 2020-07-22 22:46:45 +08:00
chenjianxing 2bc11e4f4e Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-22 21:33:04 +08:00
chenjianxing e32635ed30 fix: 最近用例跳转显示uuid 2020-07-22 21:32:48 +08:00
wenyann 0e54e56c20 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 21:26:28 +08:00
wenyann 8bb657c28e fix: 修改导出用例请求方法 2020-07-22 21:26:03 +08:00
chenjianxing 73a4ee5d12 fix: 测试用例页面浏览器回退问题 2020-07-22 20:42:59 +08:00
wangzhen-fit2cloud b0e02f2b50 refactor: 修改版本号为 1.1 2020-07-22 19:43:15 +08:00
Captain.B 2e05128188 Merge branch 'v1.1' of github.com:fit2cloudrd/metersphere-server into v1.1 2020-07-22 19:07:56 +08:00
Captain.B 59cd84efa2 fix: 修复下载性能测试日志的oom 2020-07-22 19:07:40 +08:00
chenjianxing af03676879 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-22 17:00:31 +08:00
chenjianxing 9846a364b6 fix: 导入插件文件 2020-07-22 17:00:08 +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