Commit Graph

13323 Commits

Author SHA1 Message Date
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
Captain.B
08d669fe78 Merge remote-tracking branch 'origin/dev' into dev 2020-02-27 17:23:27 +08:00
Captain.B
a24d15f6ae i18n 2020-02-27 17:23:06 +08:00
shiziyuan9527
84c779ce05 组织菜单成员列表角色列更改查询方式 2020-02-27 17:02:26 +08:00
Captain.B
4fb03996c2 alltest->loadtest 2020-02-27 16:49:45 +08:00
Captain.B
35a55259d0 class 修改 2020-02-27 16:46:34 +08:00
Captain.B
3ecdad488c bug fix 2020-02-27 16:25:37 +08:00
Captain.B
54963b2fa0 project 2020-02-27 16:18:35 +08:00
Captain.B
ce4c1b0af8 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-27 15:56:48 +08:00
Captain.B
e756e5aedc project 2020-02-27 15:53:16 +08:00
shiziyuan9527
27b57dcb9a 组织菜单成员列表添加角色列 2020-02-27 15:27:51 +08:00
Captain.B
cf828f87b2 密码校验 2020-02-27 15:09:01 +08:00
Captain.B
da2513e038 login i18n 2020-02-27 14:10:38 +08:00
Captain.B
9c2b728d27 编辑测试修改 2020-02-27 13:53:14 +08:00
Captain.B
de3a748357 去掉console log 2020-02-27 13:49:35 +08:00
Captain.B
9bdf4bcec2 编辑测试修改 2020-02-27 13:42:31 +08:00
Captain.B
d4f69fa4ca 编辑测试修改 2020-02-27 13:34:28 +08:00
Captain.B
cde78be5cb i18n 2020-02-27 11:00:18 +08:00
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