shiziyuan9527
|
0c9badda9c
|
fix: LDAP用户登录问题
|
2020-07-14 17:28:53 +08:00 |
Captain.B
|
a483732635
|
Merge remote-tracking branch 'origin/master'
|
2020-07-14 17:27:04 +08:00 |
|
Captain.B
|
46586e7da6
|
fix: 修复jmx只有线程组没有采样器导致无法收到消息的bug
|
2020-07-14 17:23:32 +08:00 |
BugKing
|
f6e30833de
|
Merge pull request #75 from metersphere/dependabot/maven/backend/mysql-mysql-connector-java-8.0.16
chore: Bump mysql-connector-java from 5.1.41 to 8.0.16 in /backend
|
2020-07-14 15:53:14 +08:00 |
|
shiziyuan9527
|
b0064b51f4
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-07-14 15:36:40 +08:00 |
|
shiziyuan9527
|
327e06f0b7
|
style: 修改用户来源标识
|
2020-07-14 15:36:17 +08:00 |
|
wangzhen-fit2cloud
|
d56b65becb
|
Merge branch 'master' of github.com:metersphere/metersphere
|
2020-07-14 14:48:10 +08:00 |
|
shiziyuan9527
|
9045102e21
|
feat: 新建用户时设置用户来源
|
2020-07-14 14:46:40 +08:00 |
|
wangzhen-fit2cloud
|
70d2a03e71
|
docs: 增加 readme 中产品定位图片
|
2020-07-14 14:45:29 +08:00 |
q4speed
|
158bac4be8
|
Merge remote-tracking branch 'origin/master'
|
2020-07-14 14:04:51 +08:00 |
|
q4speed
|
60423f43a6
|
fix: 修复繁体中文部分创建人没有翻译的bug
|
2020-07-14 14:04:40 +08:00 |
|
Captain.B
|
3f41704583
|
refactor: 去掉DEBUG中的SQL日志
|
2020-07-14 13:42:09 +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
|
8d22140f32
|
Merge remote-tracking branch 'origin/master'
|
2020-07-14 11:42:59 +08:00 |
|
q4speed
|
f19eb2e3dd
|
style: 修复高级搜多个尺寸的样式
|
2020-07-14 11:42:48 +08:00 |
|
wenyann
|
339e1e243b
|
Merge remote-tracking branch 'origin/master'
|
2020-07-14 11:28:48 +08:00 |
|
wenyann
|
567f217566
|
fix: 修改用例步骤拼接，格式
|
2020-07-14 11:27:06 +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 |
|
wenyann
|
bac151be1e
|
用例步骤换行
|
2020-07-14 11:10:36 +08:00 |
|
shiziyuan9527
|
f9b2cdc20d
|
feat: LDAP设置中支持多个OU
|
2020-07-14 11:05:01 +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
|
faad7895e9
|
Merge remote-tracking branch 'origin/master'
|
2020-07-13 16:05:14 +08:00 |
|
q4speed
|
c715a96cb7
|
高级查询
|
2020-07-13 16:05:01 +08:00 |
|
shiziyuan9527
|
71085aa54c
|
sql
|
2020-07-13 10:43:51 +08:00 |
|
shiziyuan9527
|
98eeb7bc2e
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-07-13 10:31:52 +08:00 |
|
shiziyuan9527
|
2bd46f80b4
|
新建用户时设置用户来源
|
2020-07-13 10:31:14 +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 |
|
shiziyuan9527
|
8199fbbf5f
|
ldap设置中支持多个OU
|
2020-07-10 17:32:01 +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
|
506ad9f5f0
|
统一状态
|
2020-07-10 10:43:33 +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 |