shiziyuan9527
|
9bd15aa8b7
|
管理员只能修改成员角色信息 backend
|
2020-05-11 16:29:24 +08:00 |
wenyann
|
31102c3b82
|
id唯一性校验
|
2020-05-11 16:26:42 +08:00 |
|
wenyann
|
c6b4dd0948
|
修改用户密码
|
2020-05-11 16:20:03 +08:00 |
|
wenyann
|
bd7841ddcc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-05-11 16:12:26 +08:00 |
|
wenyann
|
54a3155461
|
id唯一性校验
|
2020-05-11 16:11:55 +08:00 |
|
shiziyuan9527
|
261f4087b7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-05-11 15:49:34 +08:00 |
|
shiziyuan9527
|
0db3832e08
|
管理员只能修改成员角色信息 frontend
|
2020-05-11 15:49:17 +08:00 |
|
wenyann
|
9fb6f094ad
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-05-11 15:48:03 +08:00 |
|
wenyann
|
92704173dd
|
修改密码
|
2020-05-11 15:47:37 +08:00 |
|
shiziyuan9527
|
dff0c8a008
|
修改util.js
|
2020-05-11 15:33:40 +08:00 |
|
wenyann
|
867225673b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-05-11 15:31:53 +08:00 |
|
wenyann
|
2bc01c9128
|
修改密码
|
2020-05-11 15:29:43 +08:00 |
|
shiziyuan9527
|
12da2509d2
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# backend/src/main/java/io/metersphere/service/UserService.java
|
2020-05-11 14:48:17 +08:00 |
|
shiziyuan9527
|
5abece2d37
|
优化工作空间和组织相关部分
|
2020-05-11 14:44:53 +08:00 |
王振
|
fac529140e
|
fix 测试计划用例搜索问题
|
2020-05-11 14:26:24 +08:00 |
q4speed
|
599774ef0a
|
修复断言背景色
|
2020-05-11 14:25:48 +08:00 |
|
q4speed
|
c80344813b
|
修复加载问题
|
2020-05-11 14:25:28 +08:00 |
|
wenyann
|
c76a0ba941
|
修改密码
|
2020-05-11 14:22:56 +08:00 |
|
wenyann
|
4a958d6f44
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-05-11 14:13:16 +08:00 |
|
wenyann
|
8880599f29
|
修改密码
|
2020-05-11 14:12:29 +08:00 |
|
q4speed
|
1d628911a4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-05-11 14:09:31 +08:00 |
|
q4speed
|
f07078fdf6
|
修复element ui国际化文件加载失败的bug
|
2020-05-11 11:48:52 +08:00 |
Captain.B
|
c1e6062645
|
dto lombok
|
2020-05-11 10:54:10 +08:00 |
|
Captain.B
|
eaa2d35b37
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-05-11 10:46:38 +08:00 |
|
Captain.B
|
8857a41e5e
|
dto lombok
|
2020-05-11 10:46:18 +08:00 |
|
q4speed
|
6de53a5997
|
修改路径
|
2020-05-11 10:41:15 +08:00 |
|
q4speed
|
942db55472
|
NaN
|
2020-05-11 10:38:10 +08:00 |
|
q4speed
|
84716a42ef
|
调整JMeter Home设置方式
|
2020-05-11 10:23:07 +08:00 |
|
wenyann
|
68efed66fe
|
Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev
|
2020-05-10 21:32:10 +08:00 |
|
q4speed
|
a1b7d214b0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-05-10 11:54:48 +08:00 |
|
q4speed
|
81b888b2a2
|
调整JMeter Home目录
|
2020-05-10 11:54:35 +08:00 |
chenjianxing
|
4c10f521fa
|
Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev
|
2020-05-09 20:06:57 +08:00 |
|
chenjianxing
|
7883b6ff43
|
用例导入时显示导入中
|
2020-05-09 20:06:32 +08:00 |
|
chenjianxing
|
b941ffebf5
|
测试用例执行人显示名称
|
2020-05-09 19:26:42 +08:00 |
|
王振
|
c316b279c1
|
Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev
|
2020-05-09 19:05:02 +08:00 |
|
王振
|
870595b6a2
|
fix 导入用例模块树层级问题
|
2020-05-09 19:04:35 +08:00 |
|
chenjianxing
|
e50241158f
|
Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev
|
2020-05-09 19:03:35 +08:00 |
|
chenjianxing
|
08d3ec19ef
|
测试详筛选排序
|
2020-05-09 18:39:47 +08:00 |
|
chenjianxing
|
f014d5267d
|
fix 测试用例查询
|
2020-05-09 18:07:23 +08:00 |
|
chenjianxing
|
4df45d190c
|
测试用例筛选排序
|
2020-05-09 17:55:13 +08:00 |
|
wenyann
|
a690ffecde
|
Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev
Conflicts:
frontend/src/i18n/en-US.js
|
2020-05-09 17:40:17 +08:00 |
|
wenyann
|
6924832fee
|
demo
|
2020-05-09 17:38:30 +08:00 |
|
Captain.B
|
c62bf4c960
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-05-09 16:51:56 +08:00 |
|
Captain.B
|
2a686f5133
|
lombok
|
2020-05-09 16:49:43 +08:00 |
|
q4speed
|
4131aac4a1
|
删除jmeter
|
2020-05-09 16:48:53 +08:00 |
|
q4speed
|
615ecbed49
|
简化
|
2020-05-09 16:10:57 +08:00 |
|
q4speed
|
7854c999c9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-05-09 16:03:44 +08:00 |
|
q4speed
|
29a78a42c7
|
API翻译同步
|
2020-05-09 16:03:30 +08:00 |
|
Captain.B
|
02b1f1f80b
|
使用operator button
|
2020-05-09 16:03:07 +08:00 |
|
Captain.B
|
3cfc37a2f7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2020-05-09 15:58:36 +08:00 |