Commit Graph

7199 Commits

Author SHA1 Message Date
xinwen
76b73952b4 [Update] 修复同步实例列表一些问题 2020-05-22 17:06:18 +08:00
xinwen
f0b9611d4b [Feature] 添加云管中心-> 同步实例 2020-05-22 17:06:18 +08:00
xinwen
7fa3bc0dfb [Feature] 添加 云管中心-> 账户列表 2020-05-22 17:06:18 +08:00
Eric
d56e7f54fb i18n msg 2020-05-22 16:17:25 +08:00
Eric
bf3241687d [Update] i18n msg 2020-05-22 16:15:24 +08:00
ibuler
a59ccf5979 Merge branch 'master' of github.com:jumpserver/lina 2020-05-22 15:59:52 +08:00
ibuler
b32bb59c70 [Update] 继续优化select2组件 2020-05-22 15:59:23 +08:00
jym503558564
107b5b52c6 [Update] Merge it 2020-05-22 15:49:16 +08:00
jym503558564
73d3f835aa [Update] add i18n en 2020-05-22 15:48:03 +08:00
ibuler
ae00c1c71c [Update] merge it 2020-05-22 15:40:28 +08:00
ibuler
5d5680e9b6 [Update] 修改select2 watch 2020-05-22 15:38:51 +08:00
jym503558564
ef0b20bacd [Update] add i18n en 2020-05-22 15:30:31 +08:00
jym503558564
c17476a199 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-22 15:12:39 +08:00
jym503558564
a0e2b42107 [Update] 添加英文翻译 2020-05-22 15:12:06 +08:00
ibuler
d4b9ec7d02 [Update] 修改一部分翻译 2020-05-22 14:57:36 +08:00
Eric
b787637fb0 add i18n en 2020-05-22 14:47:06 +08:00
OrangeM21
36af259df5 [fix]修复搜索栏位置 2020-05-22 14:38:31 +08:00
ibuler
bb40861308 Merge branch 'master' of github.com:jumpserver/lina 2020-05-22 14:33:35 +08:00
ibuler
fb7a0d63f2 [Update] 去掉管理用户资产列表中的其他选项 2020-05-22 14:33:08 +08:00
Eric
3f90f79161 add i18n en 2020-05-22 14:13:08 +08:00
Eric
eb903f68a3 update session detail view 2020-05-22 14:01:35 +08:00
ibuler
2cf0af422d [Update] Merge 2020-05-22 11:36:06 +08:00
ibuler
f6d8a1479f [Update] 整理i18n 2020-05-22 11:34:28 +08:00
Eric
b5ad85ba38 update session list 2020-05-22 11:17:26 +08:00
ibuler
ded73774f2 [Update] 去掉没有i18n key 2020-05-22 11:13:11 +08:00
Eric
5bc01678a9 [Update] session detail QuickActionsD 2020-05-22 11:10:43 +08:00
Eric
8676be7e59 [update] i18n en 2020-05-22 10:49:28 +08:00
Bai
d2ef038e37 [Update] 添加改密计划列表(3) 2020-05-21 20:49:31 +08:00
OrangeM21
e5681993f3 Merge remote-tracking branch 'origin/master' 2020-05-21 20:44:05 +08:00
OrangeM21
e90a9aea30 [fix]修复平台Bug 2020-05-21 20:43:50 +08:00
Bai
3304f82a6b [Update] 添加改密计划列表(2) 2020-05-21 20:36:11 +08:00
Bai
ca0aac5eab [Update] 修改ActionFormatter超过2个即显示更多操作 2020-05-21 20:35:56 +08:00
ibuler
84fcc34a59 [Update] 修改permission.js的拼写错误 2020-05-21 20:28:33 +08:00
jym503558564
b3d4b4a89f [Update] 修改授权管理详情 2020-05-21 20:14:37 +08:00
ibuler
baa61337ff Merge branch 'master' of github.com:jumpserver/lina 2020-05-21 20:08:40 +08:00
Bai
a4c39a6d92 [Update] 添加改密计划列表(1) 2020-05-21 19:56:07 +08:00
OrangeM21
b969abe8b9 [fix]资产Bug 2020-05-21 19:49:57 +08:00
jym503558564
a64cb4e1f8 [Update]修改任务版本执行历史的一些字段数据 2020-05-21 19:39:16 +08:00
ibuler
32084c328b Merge branch 'master' of github.com:jumpserver/lina 2020-05-21 19:09:51 +08:00
ibuler
5ea4ba4867 [Update] 小调整一些内容 2020-05-21 19:05:58 +08:00
OrangeM21
70e162c599 Merge remote-tracking branch 'origin/master' 2020-05-21 19:01:38 +08:00
OrangeM21
412ef272bf [fix]修复系统用户Bug 2020-05-21 19:00:33 +08:00
jym503558564
2df8077a58 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-21 18:55:01 +08:00
jym503558564
52da322254 [Update] 修改任务详情组件 2020-05-21 18:54:44 +08:00
Eric
0a24debd32 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-21 18:41:05 +08:00
Eric
2ad3dda895 [Update] xpack i18n en 2020-05-21 18:40:39 +08:00
BaiJiangJie
516eb86151
Merge pull request #56 from jumpserver/cap
[Update] 添加改密计划模块路由和目录结构
2020-05-21 18:37:43 +08:00
Eric
dc9dcd766b [Update] i18n msg 2020-05-21 18:30:58 +08:00
OrangeM21
063863b5f5 Merge remote-tracking branch 'origin/master' 2020-05-21 18:17:35 +08:00
OrangeM21
9cfce136d1 [fix]添加上传私钥组件,修复翻译bug 2020-05-21 18:17:19 +08:00