Commit Graph

1707 Commits

Author SHA1 Message Date
xinwen
6a3127c52c [Update] i18n cn applications 2020-05-12 16:33:42 +08:00
xinwen
df4538f782 [Add] 创建 applications RemoteApp 2020-05-12 16:30:32 +08:00
ibuler
743ed34b54 [Update] 完成用户模块 2020-05-12 14:28:56 +08:00
ibuler
fd3b19a277 [Update] 修改翻译 2020-05-12 13:24:10 +08:00
Eric
cc56486845 ticket list 2020-05-12 13:00:11 +08:00
ibuler
aafffd1f56 [Update] 拆分i18n 2020-05-12 11:43:01 +08:00
ibuler
bd9f22d921 Merge branch 'master' of github.com:jumpserver/lina 2020-05-12 11:28:21 +08:00
ibuler
4da8085c03 [Update] 修改i18n 2020-05-12 11:26:21 +08:00
OrangeM21
da19464b36 [fix]添加Tree Loading 2020-05-12 02:32:12 +08:00
OrangeM21
b20f837714 [fix]修复高度问题 2020-05-12 01:53:53 +08:00
OrangeM21
31e653d0fc [fix]完成网关列表 2020-05-12 01:42:28 +08:00
OrangeM21
02885e3df4 [fix]完成网关列表 2020-05-12 01:30:16 +08:00
OrangeM21
f4f8cdff74 Merge remote-tracking branch 'origin/master' 2020-05-12 00:23:56 +08:00
OrangeM21
c1734090c5 [fix]完成网关列表 2020-05-12 00:23:35 +08:00
ibuler
01db6e2a3d Merge branch 'master' of github.com:jumpserver/lina 2020-05-11 21:07:18 +08:00
ibuler
18b201bc7b [Update] 修改i18n 2020-05-11 21:06:47 +08:00
jym503558564
67e534aafd Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-11 20:13:53 +08:00
jym503558564
d07d91c67c [Update] 增加远程应用详情组件 2020-05-11 20:13:17 +08:00
OrangeM21
594102d03c Merge remote-tracking branch 'origin/master' 2020-05-11 20:11:55 +08:00
OrangeM21
5d160c4e6d [fix]完成命令过滤列表 2020-05-11 20:11:21 +08:00
jym503558564
e7ee350b0c [Update] 修改application的activeMenu 2020-05-11 19:36:39 +08:00
OrangeM21
d925c07d9e [fix]完成命令过滤 2020-05-11 19:22:08 +08:00
jym503558564
2453772902 [Update] 完成数据库应用组件 2020-05-11 18:51:45 +08:00
xinwen
276f5ffc92 [Add] 添加 applications DatabaseApp 2020-05-11 16:08:29 +08:00
ibuler
6de50f1e00 [Update] 去掉i18n的过度包装 2020-05-11 15:58:13 +08:00
ibuler
ea2929b965 [Update] Remove i18n/index.js 2020-05-11 15:38:36 +08:00
ibuler
bb5585bd0c [Bugfix] 修复relation card的bug 2020-05-11 15:37:03 +08:00
OrangeM21
eda1801f8b [fix]资产模块添加ActiveMenu 2020-05-11 14:33:50 +08:00
ibuler
60f174fe0e [Update] 修改时间日期i18n 2020-05-11 14:20:15 +08:00
ibuler
1dafaf12aa Merge branch 'master' of github.com:jumpserver/lina 2020-05-11 12:06:50 +08:00
OrangeM21
86c1d7a7a0 [fix]修改i18n,更新语言环境至localstorage 2020-05-11 12:06:23 +08:00
ibuler
a9efa7a3ca Merge branch 'master' of github.com:jumpserver/lina 2020-05-11 12:00:17 +08:00
ibuler
ebc92b4f9c [Update] 修改i18n 2020-05-11 11:51:36 +08:00
OrangeM21
be33034f6a Revert "[update]修改路由引用"
This reverts commit db47db40eb.
2020-05-11 11:06:19 +08:00
ibuler
2bc56d89d8 Merge branch 'master' of github.com:jumpserver/lina 2020-05-11 10:39:52 +08:00
ibuler
e4c2cd1f5a [Update] Merge 2020-05-11 10:38:18 +08:00
jym503558564
549a9b681c [Update] 删除ActiveCard,使用QuickActions 2020-05-11 10:37:27 +08:00
Orange
db47db40eb [update]修改路由引用 2020-05-10 16:31:48 +08:00
ibuler
db71e44167 Merge branch 'master' of github.com:jumpserver/lina 2020-05-09 19:44:52 +08:00
ibuler
824f96e479 [Update] 修改tab page逻辑,避免刷新回到第一个tab 2020-05-09 19:44:39 +08:00
Orange
64808e45b4
Merge pull request #48 from jumpserver/orange_dev
[update]完成详情页设置,修改tree结构
2020-05-09 19:29:01 +08:00
Orange
58e384d1b8
Merge branch 'master' into orange_dev 2020-05-09 19:23:07 +08:00
OrangeM21
fe7c3bb1f9 Revert "[update]完成详情页设置,修改tree结构"
This reverts commit 1ba5fae9
2020-05-09 19:01:05 +08:00
OrangeM21
1ba5fae985 [update]完成详情页设置,修改tree结构 2020-05-09 18:59:01 +08:00
jym503558564
be48d53d20 [Update] 修改资产授权的显示字段 2020-05-09 18:46:26 +08:00
OrangeM21
b49340b6d0 [update]完成详情页设置,修改tree结构 2020-05-09 18:05:12 +08:00
ibuler
6c2f50c6d2 [Update] 修改激活禁用 2020-05-09 17:04:32 +08:00
ibuler
c21e761d1a [Update] 修改detail formatter引起的bug 2020-05-09 15:11:59 +08:00
ibuler
a9db2a0b7e [Update] merge it 2020-05-09 14:59:12 +08:00
jym503558564
4f9c60dc5f Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-09 14:35:19 +08:00