Commit Graph

15149 Commits

Author SHA1 Message Date
shiziyuan9527 6ff15af985 Merge remote-tracking branch 'origin/dev' into dev 2020-03-06 17:10:49 +08:00
shiziyuan9527 1bd8bcd562 修改用户相关api 2020-03-06 17:10:23 +08:00
Captain.B ea2c192d15 i18n 2020-03-06 16:24:27 +08:00
Captain.B 10346366cd i18n 2020-03-06 16:19:12 +08:00
Captain.B 4274e8d81c 菜单上的权限 2020-03-06 15:26:03 +08:00
Captain.B d9ee8e4085 hasRoles 2020-03-06 13:56:17 +08:00
Captain.B 0fd99a4dda 删除没有用到的代码 2020-03-06 11:19:41 +08:00
Captain.B 987e3be922 样式 2020-03-05 21:34:12 +08:00
Captain.B e7fa92bdde bug fix 2020-03-05 19:21:04 +08:00
Captain.B a6ee8d4fc0 Merge remote-tracking branch 'origin/dev' into dev 2020-03-05 19:13:23 +08:00
Captain.B df12289175 图细节 2020-03-05 19:11:08 +08:00
shiziyuan9527 90109ade6a 测试报告页面 2020-03-05 17:55:21 +08:00
Captain.B f7dc764e7b 图细节 2020-03-05 16:27:43 +08:00
Captain.B b409de7f36 图类型 demo 2020-03-05 16:08:11 +08:00
Captain.B 7cd29c9187 图类型 2020-03-05 15:53:12 +08:00
Captain.B 0fed287cdb 部分国际化 2020-03-05 15:27:47 +08:00
Captain.B 8025d1102c Merge remote-tracking branch 'origin/dev' into dev 2020-03-05 14:55:58 +08:00
Captain.B cc922865ea flyway 2020-03-05 14:55:02 +08:00
shiziyuan9527 70ccc8f0b4 新建和编辑项目时去掉所属工作空间选项 2020-03-05 13:53:54 +08:00
shiziyuan9527 42b4dfac7f 系统菜单下用户搜索 2020-03-05 13:26:54 +08:00
Captain.B c703a2f7f3 预估图细节 2020-03-05 12:56:50 +08:00
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