Commit Graph

1247 Commits

Author SHA1 Message Date
wenyann 8fd6cfba4f fix: 修改校验提示 2020-07-16 11:19:19 +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
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
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
chenjianxing cf9cffb114 Merge branch 'master' of https://github.com/metersphere/server 2020-07-09 15:09:01 +08:00
chenjianxing 23c8f9a8ea merge v1.0 2020-07-09 15:08:37 +08:00
shiziyuan9527 0228043184 测试计划关联用例增加优先级和类型并支持筛选 2020-07-09 14:17:05 +08:00
chenjianxing beba2650eb Merge branch 'v1.0' of https://github.com/metersphere/server into v1.0 2020-07-09 14:13:03 +08:00
chenjianxing 3c797c645e fix post请求url参数问题 2020-07-09 14:12:42 +08:00
chenjianxing 93b011a4ac Merge branch 'master' of https://github.com/metersphere/server 2020-07-08 17:56:17 +08:00
chenjianxing 5318537e12 支持 postman 导入 2020-07-08 17:56:05 +08:00
shiziyuan9527 5c4ce18486 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-08 15:47:57 +08:00
shiziyuan9527 e45810701d ldap 2020-07-08 15:47:44 +08:00
chenjianxing 901cbfdaf4 Merge branch 'master' of https://github.com/metersphere/server 2020-07-08 11:57:55 +08:00
chenjianxing 3dcf2f0f2a 接口测试导入- Metersphere(json) 2020-07-08 11:57:45 +08:00
shiziyuan9527 fbb6fc0277 ldap 2020-07-08 01:02:16 +08:00
Captain.B 712154dd8a ws or wss 2020-07-07 18:23:37 +08:00
wenyann 024304d018 密码框刷新修改 2020-07-07 17:52:37 +08:00
wenyann b852fe7457 Merge remote-tracking branch 'origin/v1.0' into v1.0 2020-07-07 16:31:56 +08:00