Commit Graph

14345 Commits

Author SHA1 Message Date
Captain.B
c78abb1508 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-27 10:56:42 +08:00
Captain.B
320e941df5 create project 2020-02-27 10:55:39 +08:00
q4speed
25044d1e35 格式化翻译示例 2020-02-27 10:54:50 +08:00
Captain.B
6209a5f9b1 create project 2020-02-27 10:00:25 +08:00
Captain.B
14e5c8f08c create project 2020-02-26 18:58:22 +08:00
Captain.B
be37974388 Merge remote-tracking branch 'origin/dev' into dev 2020-02-26 18:48:18 +08:00
Captain.B
2576b9c035 ms project 2020-02-26 18:47:51 +08:00
shiziyuan9527
e1d8323604 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	frontend/src/i18n/en_US.js
#	frontend/src/i18n/zh_CN.js
2020-02-26 18:43:13 +08:00
shiziyuan9527
a7ea334005 组织菜单国际化 2020-02-26 18:38:57 +08:00
Captain.B
9c7b776a37 ms project 2020-02-26 18:31:07 +08:00
Captain.B
758165157a Merge remote-tracking branch 'origin/dev' into dev 2020-02-26 17:34:43 +08:00
shiziyuan9527
f8a357a3d0 修改组件名称 2020-02-26 17:34:08 +08:00
Captain.B
3fac641990 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-26 17:34:05 +08:00
Captain.B
1ab4b75e79 项目的点击事件 2020-02-26 17:33:59 +08:00
shiziyuan9527
31389167bc 新建工作空间时选择组织 2020-02-26 17:22:32 +08:00
Captain.B
a77ba70aa7 ms- 2020-02-26 16:40:13 +08:00
Captain.B
07010dea55 Merge remote-tracking branch 'origin/dev' into dev 2020-02-26 16:37:04 +08:00
Captain.B
0f4fab3092 bug fix 2020-02-26 16:36:51 +08:00
shiziyuan9527
0132219336 系统管理员工作空间管理增加组织列 2020-02-26 16:18:12 +08:00
q4speed
947a5db82e add zh_TW 2020-02-26 16:02:46 +08:00
Captain.B
2b5ce5a44e Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-26 15:20:02 +08:00
Captain.B
c4b9b9987c 默认跳转 2020-02-26 15:19:52 +08:00
shiziyuan9527
e554c951f4 组织菜单工作空间查询限制 2020-02-26 15:13:51 +08:00
Captain.B
b226f43b8d Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-26 14:58:17 +08:00
Captain.B
2d0d1c5279 最近的测试 2020-02-26 14:58:04 +08:00
q4speed
ff0e26f1c1 fix warn 2020-02-26 14:54:10 +08:00
shiziyuan9527
bbd28d0ef9 新增系统设置中工作空间选项 2020-02-26 13:48:41 +08:00
Captain.B
ca9d2cfd22 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-26 13:31:03 +08:00
Captain.B
32df172547 最近的项目 2020-02-26 13:30:50 +08:00
shiziyuan9527
f228d1792d 个人信息设置页面 2020-02-26 13:28:08 +08:00
Captain.B
3923aca94f 工作空间国际化 0.2 2020-02-26 11:24:52 +08:00
Captain.B
194f8fa372 工作空间国际化 0.1 2020-02-26 10:35:46 +08:00
shiziyuan9527
5371e09c23 菜单按照组织工作空间隔离 2020-02-25 18:34:46 +08:00
Captain.B
167c8cd675 Merge remote-tracking branch 'origin/dev' into dev 2020-02-25 17:37:48 +08:00
Captain.B
36fd6b904a shiro version 2020-02-25 17:37:34 +08:00
shiziyuan9527
99daa187ae 组织和工作空间切换0.6 2020-02-25 16:35:24 +08:00
shiziyuan9527
8ff3d8f072 组织和工作空间切换0.5 2020-02-25 15:50:38 +08:00
shiziyuan9527
9e9951adcb 组织和工作空间切换0.1 2020-02-25 14:53:22 +08:00
Captain.B
fe12305ec2 简化配置 2020-02-25 14:29:01 +08:00
Captain.B
7aca1d5163 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-25 11:49:00 +08:00
Captain.B
bfa3ef70cf table use changed 2020-02-25 11:48:39 +08:00
q4speed
62c778741d 异步加载语言文件 2020-02-25 11:36:15 +08:00
Captain.B
2afa1bca4c roles indexOf bug fix 2020-02-24 18:55:44 +08:00
shiziyuan9527
eeadaa2c78 菜单整理 2020-02-24 18:13:39 +08:00
shiziyuan9527
8c121c39de 组织成员管理 2020-02-24 17:41:09 +08:00
Captain.B
807135e7da user add column language 2020-02-24 17:01:09 +08:00
shiziyuan9527
814c573010 组织成员管理 2020-02-24 14:06:07 +08:00
shiziyuan9527
7ec03015dd 组织成员管理 2020-02-21 15:22:19 +08:00
Captain.B
62873e656e dockerfile 2020-02-21 14:48:30 +08:00
haifeng414
d8408e9c7e Merge remote-tracking branch 'origin/dev' into dev 2020-02-21 11:46:23 +08:00