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 |
|
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 |
|
Captain.B
|
39121f0f99
|
shiro config 配置
|
2020-07-09 14:09:59 +08:00 |
|
chenjianxing
|
458583ce1f
|
Swagger导入相关
|
2020-07-09 11:39:05 +08:00 |
|
wenyann
|
c52f7abeb0
|
Merge remote-tracking branch 'origin/master'
|
2020-07-09 11:24:22 +08:00 |
|
wenyann
|
e089e967c0
|
.
|
2020-07-09 11:23:58 +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 |
|
wenyann
|
ec3f54de0f
|
Merge remote-tracking branch 'origin/master'
|
2020-07-08 14:57:14 +08:00 |
|
wenyann
|
16c7044b25
|
jenkins
|
2020-07-08 14:56:46 +08:00 |