Commit Graph

1362 Commits

Author SHA1 Message Date
shiziyuan9527 7bd9f429c2 fix: 系统菜单用户列表能修改LDAP来源用户的密码 2020-07-21 13:52:12 +08:00
shiziyuan9527 459c15db23 fix: 测试计划关联测试用例弹框的按钮可以触发多次 2020-07-21 11:43:05 +08:00
q4speed 382087086f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
2020-07-21 11:37:21 +08:00
q4speed 390384c6a4 feat(接口测试): 增加Dubbo支持 2020-07-21 11:34:30 +08:00
wangzhen-fit2cloud 6c93ed6b27 Merge branch 'v1.1' of github.com:metersphere/metersphere into v1.1 2020-07-21 10:47:24 +08:00
wangzhen-fit2cloud 09dd4a0064 refactor: 修改接口测试导入页面文字描述 2020-07-21 10:47:11 +08:00
Captain.B a2022f8cf0 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-21 10:22:34 +08:00
Captain.B cfac8dfe6c fix: 修复登录页面浏览器标签页上的图标在firefox上不显示的问题 2020-07-21 10:22:19 +08:00
wenyann 9ca7fdf576 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-21 10:16:35 +08:00
wenyann e4cb8647d5 fix: 1.导入用例维护人信息错误 2关联用例后更新用例优先级
3系统参数默认显示错误
2020-07-21 10:15:47 +08:00
chenjianxing e88983ecb3 fix: cron表达式输入提示优化 2020-07-21 01:50:44 +08:00
chenjianxing b7c0acb837 fix: 关闭定时任务,不显示下次执行时间 2020-07-21 01:42:25 +08:00
chenjianxing 4fffe246ed fix: 导入用例页面项目实时更新 2020-07-21 01:38:12 +08:00
chenjianxing 466ce4e790 fix: 导入用例文件上传提示 2020-07-21 01:30:42 +08:00
chenjianxing a52e45cc20 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-21 00:48:24 +08:00
chenjianxing c052d1ea95 fix: 保存环境 2020-07-21 00:47:58 +08:00
shiziyuan9527 29b1aabe0b fix: 执行测试用例关联的测试生成的报告触发方式为空 2020-07-20 22:37:45 +08:00
shiziyuan9527 777027da3b fix: 接口测试转性能测试时测试名称无法编辑的问题 2020-07-20 21:29:22 +08:00
chenjianxing 6ed20d81d6 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-20 18:38:02 +08:00
chenjianxing 98a04271cb fix: 导入文件上传样式与提示 2020-07-20 18:37:53 +08:00
Captain.B fadc24275a Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-20 17:58:48 +08:00
Captain.B 77fd705ace refactor: 修改性能测试默认超时时间 2020-07-20 17:58:25 +08:00
wenyann 193f807f94 fix: 测试用例去掉实际结果非空判断 2020-07-20 17:57:28 +08:00
Captain.B 7845317ff6 fix: 修复没有选择执行结果通过按钮可以点击的bug 2020-07-20 17:36:56 +08:00
Captain.B feb6aeeb8b fix: 修复浏览器标签页上的图标在firefox上不显示的问题 2020-07-20 16:31:24 +08:00
AgAngle 2860b91508 refactor: 接口测试保存提示 2020-07-19 22:35:53 +08:00
AgAngle e24ab7a2ad refactor: 优化定时任务页面 2020-07-19 16:17:16 +08:00
chenjianxing f9723d6da7 refactor: 合并 v1.0 2020-07-17 18:38:05 +08:00
chenjianxing f20c9ca591 Merge branch 'master' of https://github.com/metersphere/server 2020-07-17 18:26:00 +08:00
chenjianxing 985385aba2 refactor: 优化接口测试导入 2020-07-17 18:25:09 +08:00
wenyann 5f8d2a7374 fix: 测试用例保存判断 2020-07-17 15:41:14 +08:00
wenyann 0c5404b0e4 fix: 测试用例保存判断 2020-07-17 15:33:54 +08:00
wenyann 9e0653947c Merge branch 'v1.0' 2020-07-17 14:42:02 +08:00
wenyann cf216d1d84 Merge remote-tracking branch 'origin/master' 2020-07-17 14:05:56 +08:00
wenyann b5dc9ff8ff fix: 导入导出图标交换,jenkins按计划查询,模块全部查询 2020-07-17 14:05:19 +08:00
shiziyuan9527 8312f13a66 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-17 13:57:05 +08:00
shiziyuan9527 95abc82d44 fix: 测试计划编辑用例时因为用例关联的测试不存在而产生的bug 2020-07-17 13:54:28 +08:00
q4speed 55c0a4be65 Merge remote-tracking branch 'origin/master' 2020-07-17 10:59:51 +08:00
q4speed ff42d6c96e fix: 修复高级搜索输入框无法输入的bug 2020-07-17 10:59:26 +08:00
chenjianxing b29a4f9109 fix: 导入用户不校验名称 2020-07-16 18:50:45 +08:00
chenjianxing c16f60e87d fix: 保存环境设置 2020-07-16 18:04:11 +08:00
chenjianxing dc25e0fe63 fix: 接口测试保存 2020-07-16 17:26:23 +08:00
chenjianxing 04e27d27c8 fix: 优化环境编辑 2020-07-16 16:57:33 +08:00
chenjianxing cb3fa9dfa1 fix: 环境编辑请求头添加提示 2020-07-16 14:19:18 +08:00
chenjianxing 042b97b838 refactor: 环境编辑添加取消按钮 2020-07-16 13:20:37 +08:00
chenjianxing 82cc66dbcd feat: 接口测试支持导入插件录制json格式 2020-07-16 13:10:52 +08:00
q4speed b9586a2b5d refactor: 优化 2020-07-16 13:09:40 +08:00
chenjianxing 97cb512ea9 Merge branch 'master' of https://github.com/metersphere/server 2020-07-16 11:41:10 +08:00
chenjianxing 438715a0a5 feat: 常见请求头提示 2020-07-16 11:41:01 +08:00
shiziyuan9527 9641021797 refactor: 删除无用代码 2020-07-16 11:25:50 +08:00
wenyann 4a22ef3224 Merge remote-tracking branch 'origin/master' 2020-07-16 11:20:04 +08:00
wenyann 8fd6cfba4f fix: 修改校验提示 2020-07-16 11:19:19 +08:00
shiziyuan9527 10344e477e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-15 23:23:20 +08:00
shiziyuan9527 0461766d85 fix: 测试用例排序bug 2020-07-15 23:13:51 +08:00
shiziyuan9527 f4e3fccf5b feat: 测试用例按照ID排序 2020-07-15 21:56:13 +08:00
chenjianxing 942707ab64 Merge branch 'master' of https://github.com/metersphere/server 2020-07-15 20:45:46 +08:00
chenjianxing bfa01c09e9 fix: 修复接口测试落干bug 2020-07-15 20:45:33 +08:00
shiziyuan9527 b5f471c67d feat: 测试用例列表添加ID展示列 2020-07-15 18:52:46 +08:00
q4speed cbdefab47b Merge remote-tracking branch 'origin/master' 2020-07-15 16:00:48 +08:00
q4speed 73161105f5 refactor: 去掉无用代码 2020-07-15 16:00:37 +08:00
chenjianxing ddf4d7f938 Merge branch 'master' of https://github.com/metersphere/server 2020-07-15 15:35:49 +08:00
chenjianxing 685da4ccef feat: Swagger2 导入接口测试 2020-07-15 15:35:36 +08:00
q4speed 323b341113 fix: 修复高级搜索时间控件不能正确重置的bug 2020-07-15 13:40:36 +08:00
q4speed dfde0171dd fix: 修复"reset"其他语种内容 2020-07-15 11:57:28 +08:00
q4speed cac4d74f56 feat: 2020-07-15 11:54:52 +08:00
wenyann b15d35558f Merge remote-tracking branch 'origin/master' 2020-07-15 10:41:12 +08:00
wenyann 1d5fb3f3ff style: 调整代码格式 2020-07-15 10:40:43 +08:00
shiziyuan9527 0c9badda9c fix: LDAP用户登录问题 2020-07-14 17:28:53 +08:00
q4speed 60423f43a6 fix: 修复繁体中文部分创建人没有翻译的bug 2020-07-14 14:04:40 +08:00
wenyann aeeed5a37d Merge remote-tracking branch 'origin/v1.0' into v1.0 2020-07-14 13:33:23 +08:00
wenyann 73ca13550b fix: 修改校验提示 2020-07-14 13:33:02 +08:00
q4speed 99bfca41b4 fix: 修复无效翻译bug 2020-07-14 11:51:03 +08:00
q4speed f19eb2e3dd style: 修复高级搜多个尺寸的样式 2020-07-14 11:42:48 +08:00
q4speed e052927cda chore: 合并代码 2020-07-14 11:24:50 +08:00
q4speed bc74a0a95e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue
2020-07-14 11:19:02 +08:00
q4speed 4b83f68b6a fix: 修复高级搜索国际化bug 2020-07-14 11:17:42 +08:00
q4speed 97bdb3f5e1 style: 修复小屏幕样式 2020-07-14 10:45:24 +08:00
wenyann 686baea129 Merge remote-tracking branch 'origin/master' 2020-07-14 10:15:47 +08:00
wenyann cd60ef9be8 测试用例导出 2020-07-14 10:15:11 +08:00
shiziyuan9527 b9c369ec5c feat: 关联测试用例页面添加高级搜索 2020-07-13 21:25:45 +08:00
shiziyuan9527 b2d036a81b 测试用例查询关联测试添加loading 2020-07-13 16:23:07 +08:00
q4speed c715a96cb7 高级查询 2020-07-13 16:05:01 +08:00
q4speed c98c8bd340 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/i18n/en-US.js
	frontend/src/i18n/zh-CN.js
	frontend/src/i18n/zh-TW.js
2020-07-13 10:27:06 +08:00
q4speed 8df025f84c Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/i18n/en-US.js
	frontend/src/i18n/zh-CN.js
	frontend/src/i18n/zh-TW.js
2020-07-13 10:25:17 +08:00
q4speed a975a85d56 i18n 2020-07-13 10:18:05 +08:00
q4speed 79f8ecee6c i18n 2020-07-10 18:14:54 +08:00
shiziyuan9527 d9ab83afa0 i18n 2020-07-10 17:34:33 +08:00
q4speed 8cb07f6ab6 高级查询控件i18n 2020-07-10 16:49:23 +08:00
q4speed 7e40811443 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-10 16:44:03 +08:00
q4speed 37577b76b0 高级查询控件 2020-07-10 16:43:43 +08:00
shiziyuan9527 aca19f6dfa 通过ldap登录的用户不能修改密码和邮箱 2020-07-10 16:27:41 +08:00
Captain.B 96e2d4f98d 登录页面loading 2020-07-10 14:41:35 +08:00
q4speed 5a377843d9 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/i18n/en-US.js
	frontend/src/i18n/zh-CN.js
	frontend/src/i18n/zh-TW.js
2020-07-10 10:47:56 +08:00
q4speed ec5d1fa513 高级查询,未完。。。 2020-07-10 10:43:14 +08:00
Captain.B b2e4a94a35 前端端口指定 2020-07-09 17:04:34 +08:00
shiziyuan9527 019933d4d2 i18n 2020-07-09 16:35:29 +08:00
wenyann 1a66b69da0 2020-07-09 16:26:27 +08:00
wenyann fc39278cae 在提交Case结论时增加防呆处理 2020-07-09 16:22:51 +08:00
shiziyuan9527 6cf137f777 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-09 15:09:32 +08:00
shiziyuan9527 e71e866827 测试计划关联用例页增加按用例名称搜索 2020-07-09 15:09:05 +08:00