Commit Graph

931 Commits

Author SHA1 Message Date
shiziyuan9527 5a703e080e 无法删除当前登录用户 2020-05-12 15:34:48 +08:00
q4speed 80a50999a7 Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 15:27:10 +08:00
q4speed eddc19fa75 增加提取功能的JMX内容 2020-05-12 15:26:55 +08:00
shiziyuan9527 17be7deb21 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/business/components/settings/system/User.vue
2020-05-12 15:23:42 +08:00
shiziyuan9527 a05782e6c1 设置系统管理员入口 2020-05-12 15:19:40 +08:00
Captain.B d9f6e6147e i18n 2020-05-12 14:56:02 +08:00
Captain.B 34ef1be442 i18n 2020-05-12 14:44:56 +08:00
Captain.B ea97ba0023 更新密码单独执行 2020-05-12 11:34:26 +08:00
王振 158f4b2d71 fix typo 2020-05-12 11:32:49 +08:00
q4speed bc294c354c Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/i18n/zh-CN.js
2020-05-12 11:27:36 +08:00
q4speed 796f00f403 增加提取功能的页面 2020-05-12 11:25:04 +08:00
Captain.B 101401d6fc 样式 2020-05-12 11:24:38 +08:00
q4speed 3c10555c9e 修复按钮显示及禁用bug 2020-05-12 11:22:19 +08:00
q4speed 82b4d1ac6f 默认按更新时间排序 2020-05-12 11:21:43 +08:00
shiziyuan9527 5ad9d37bda 删除无用代码 2020-05-12 11:01:56 +08:00
Captain.B 290df82611 样式 2020-05-12 10:56:41 +08:00
Captain.B f3766f3ef2 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
 Conflicts:
	frontend/src/business/components/settings/personal/PersonSetting.vue
2020-05-12 10:55:24 +08:00
Captain.B a89052bc6e 样式 2020-05-12 10:53:51 +08:00
wenyann d7ccef6ee5 Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 10:46:45 +08:00
wenyann 433bd0f8c1 密码 2020-05-12 10:46:21 +08:00
王振 833050a9ef 修改样式 2020-05-11 23:40:19 +08:00
王振 96b8c89071 修改关联测试用例弹框样式 2020-05-11 22:12:23 +08:00
BugKing 5719f67c04
Update zh-CN.js 2020-05-11 18:25:22 +08:00
Captain.B 9b8c86f6f7 Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 18:10:47 +08:00
Captain.B 6555e73510 去掉引号 2020-05-11 18:10:27 +08:00
shiziyuan9527 d183914eff i18n 2020-05-11 18:08:00 +08:00
Captain.B 2cf70f9484 Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 17:29:40 +08:00
Captain.B 2903d6d593 日志详情和日志下载 2020-05-11 17:29:25 +08:00
王振 cba0cc99af fix 测试计划通过模块筛选测试用例报错问题 2020-05-11 16:40:59 +08:00
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