Commit Graph

3728 Commits

Author SHA1 Message Date
Captain.B
695d1a9932 i18n 2020-03-05 11:23:32 +08:00
Captain.B
2f003a1d74 菜单权限 2020-03-05 10:52:14 +08:00
Captain.B
acab2ab535 save and run throw message 2020-03-04 22:15:14 +08:00
Captain.B
caa3d87bc0 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-04 20:22:40 +08:00
Captain.B
586ef458ab xml parse 2020-03-04 20:22:14 +08:00
shiziyuan9527
20ed80bf3f 项目编辑时可选择所属工作空间 2020-03-04 18:10:43 +08:00
shiziyuan9527
088bf06f0d 添加@RequiresRoles注解 2020-03-04 15:22:57 +08:00
mokun
bba185a6ae server i18n 2020-03-04 14:57:26 +08:00
mokun
cb6291bcb0 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-04 11:32:39 +08:00
mokun
4423a44c55 server i18n 2020-03-04 11:32:17 +08:00
Captain.B
6a5c6a2d38 全局错误处理 2020-03-04 11:30:22 +08:00
shiziyuan9527
a1ba010375 菜单国际化 2020-03-03 17:05:22 +08:00
shiziyuan9527
5a9d52a1b0 组织菜单下工作空间添加成员列 2020-03-03 15:41:40 +08:00
Captain.B
715f654a6f Merge remote-tracking branch 'origin/dev' into dev 2020-03-03 15:36:32 +08:00
Captain.B
1feb471780 jmeter 插件jar 2020-03-03 15:36:11 +08:00
shiziyuan9527
6fe10c04c9 整理结构 2020-03-03 15:10:07 +08:00
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