Commit Graph

8212 Commits

Author SHA1 Message Date
shiziyuan9527 8f80544a6c 添加成员时检查是否是重复添加 2020-03-03 15:09:31 +08:00
Captain.B c23f5bd795 替换jmx值 2020-03-03 14:22:09 +08:00
Captain.B 07f286322d 异常处理 2020-03-03 14:18:20 +08:00
Captain.B f12614199b Merge remote-tracking branch 'origin/dev' into dev 2020-03-03 14:02:04 +08:00
Captain.B 33bd1c55be 异常处理 2020-03-03 14:01:50 +08:00
shiziyuan9527 569c2538e3 系统工作空间增加成员列 2020-03-03 13:28:35 +08:00
Captain.B f0d3c01f8b Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-03 11:11:57 +08:00
Captain.B 1ecd7f7c53 icon 2020-03-03 11:11:50 +08:00
shiziyuan9527 f5e102d9f1 系统菜单下组织页国际化 2020-03-03 10:48:15 +08:00
Captain.B 2a1ac00ac8 压力配置 2020-03-02 19:23:28 +08:00
Captain.B 25426b299e 去掉模版引擎直接使用html 2020-03-02 18:59:26 +08:00
Captain.B 104b02e242 Merge remote-tracking branch 'origin/dev' into dev 2020-03-02 18:42:01 +08:00
Captain.B 80f3e74a61 简化后端 2020-03-02 18:41:47 +08:00
shiziyuan9527 369b0399cc 修改编辑成员角色时出现的问题 2020-03-02 18:20:14 +08:00
shiziyuan9527 4a27a0aeb6 系统菜单下组织增加成员列 2020-03-02 17:55:27 +08:00
Captain.B 04a804f065 压力图 2020-03-02 17:45:05 +08:00
Captain.B 4dbefc9404 菜单权限 2020-03-02 15:29:00 +08:00
Captain.B 0714200b5f 报告菜单 0.1 2020-03-02 15:11:05 +08:00
Captain.B 761dea73aa check roles 2020-03-02 13:27:46 +08:00
Captain.B 1adbca1582 删除没有用到的配置 2020-03-02 13:17:19 +08:00
Captain.B 605aa9c782 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-02 13:13:49 +08:00
Captain.B f43a4b9678 AdvancedConfig 2020-03-02 13:11:15 +08:00
q4speed f1c58d6bd8 Merge remote-tracking branch 'origin/dev' into dev 2020-03-02 10:51:24 +08:00
q4speed 9bedb960fb 修复样式bug,修改菜单触发方式 2020-03-02 10:51:07 +08:00
shiziyuan9527 9e11452ebd 系统菜单下工作空间的创建和修改 2020-03-02 10:49:09 +08:00
Captain.B cecebc6fb9 菜单样式 2020-02-29 22:37:07 +08:00
Captain.B 04fef5bec1 col span 2020-02-29 11:06:40 +08:00
Captain.B 24c12d2d0e current user 2020-02-28 23:26:09 +08:00
Captain.B e40f0a0a0d save success redirect list 2020-02-28 19:02:32 +08:00
Captain.B 68d4a44f09 bug fix 2020-02-28 18:57:20 +08:00
Captain.B be926e29bd switch 2020-02-28 18:00:24 +08:00
Captain.B 2e8055f7f3 use localStorage 2020-02-28 17:50:05 +08:00
Captain.B 85e3556a86 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-28 17:28:58 +08:00
Captain.B a7d27e8668 高级设置 +1 2020-02-28 17:27:31 +08:00
shiziyuan9527 586bf457da 邀请组织成员进入工作空间 2020-02-28 17:17:39 +08:00
shiziyuan9527 db8cd75665 工作空间下成员信息可修改 2020-02-28 16:51:08 +08:00
shiziyuan9527 f5a315ffcd 工作空间成员列表添加角色列 2020-02-28 15:57:58 +08:00
shiziyuan9527 44743620d4 编辑组织成员角色 2020-02-28 15:34:02 +08:00
Captain.B 17679bb9f7 高级设置 i18n 2020-02-28 15:17:58 +08:00
Captain.B 52337f63a2 高级设置 2020-02-28 15:06:59 +08:00
Captain.B f3c620511c Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-28 10:16:51 +08:00
shiziyuan9527 bb23e9b246 修改组织菜单新建成员中的问题 2020-02-27 18:45:58 +08:00
Captain.B 963c17b5b9 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-27 18:26:11 +08:00
shiziyuan9527 8383b67948 组织增加成员时添加角色信息 2020-02-27 18:09:39 +08:00
Captain.B d3f57b0b25 style 2020-02-27 18:07:16 +08:00
Captain.B 2cf834ff20 style 2020-02-27 18:06:04 +08:00
Captain.B 5038933cc3 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-27 17:59:07 +08:00
Captain.B 4d0efc25ac i18n load_test 2020-02-27 17:59:00 +08:00
q4speed fb215cd2e6 代码规范 2020-02-27 17:47:44 +08:00
Captain.B aa44f7973f bug fix 2020-02-27 17:30:02 +08:00