Commit Graph

2269 Commits

Author SHA1 Message Date
OrangeM21
a97e615a62 [fix]修复生产环境Bug 2020-05-23 01:53:41 +08:00
OrangeM21
13ddb769b1 [fix]修复生产环境Bug 2020-05-23 01:46:31 +08:00
Bai
7184f0c02b [Update] 添加改密计划详情页面翻译(1) 2020-05-22 19:07:02 +08:00
ibuler
d416179a3a Merge branch 'master' of github.com:jumpserver/lina 2020-05-22 19:01:16 +08:00
ibuler
42f1cf9031 [Update] 修改detail can delete 2020-05-22 19:00:48 +08:00
jym503558564
ae290181f8 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-22 18:43:21 +08:00
jym503558564
8977e8deff [Update] 修改详情组件中的任务输出放到quickActions中 2020-05-22 18:43:07 +08:00
ibuler
e7dc42fd07 Merge branch 'master' of github.com:jumpserver/lina 2020-05-22 18:38:28 +08:00
ibuler
a54b8b3c8e [Update] 去掉一些import export 2020-05-22 18:37:34 +08:00
BaiJiangJie
cbe8ad9ccb
Merge pull request #58 from jumpserver/cap
[Update] 修改改密计划翻译
2020-05-22 18:15:49 +08:00
Bai
e3d2394386 [Update] 修改改密计划翻译 2020-05-22 18:13:51 +08:00
BaiJiangJie
ec38734861
Merge pull request #57 from jumpserver/cap
Cap
2020-05-22 18:06:38 +08:00
Bai
c6c39477e9 [Update] Merge from master to cap 2020-05-22 18:05:58 +08:00
Bai
2eb6454313 [Update] 添加改密计划创建/更新页面翻译(4) 2020-05-22 17:58:56 +08:00
Bai
720c5414f4 [Update] 添加改密计划创建/更新页面(3) 2020-05-22 17:50:47 +08:00
xinwen
27eaaeb592 [Update] 修复 云管中心 三级菜单嵌套问题 2020-05-22 17:46:42 +08:00
jym503558564
1a631b25ea Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-22 17:42:52 +08:00
jym503558564
f6e0349e5c [Update] 修改任务模块中执行任务的跳转 2020-05-22 17:42:33 +08:00
ibuler
11ec13ab6f [Update] Merge 2020-05-22 17:23:02 +08:00
ibuler
1ada3fcaf9 [Update] 修改翻译 2020-05-22 17:14:15 +08:00
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