Commit Graph

1707 Commits

Author SHA1 Message Date
ibuler
4d573100cb [Update] 修改submodule大小写 2020-05-14 11:21:26 +08:00
jym503558564
1683e2a963 [Update] 授权管理详情添加或删除关系时reload页面 2020-05-14 11:21:00 +08:00
ibuler
cf2c6000c2 Merge branch 'master' of github.com:jumpserver/lina 2020-05-14 11:19:36 +08:00
ibuler
540062fb09 [Update] 去掉默认使用tr的方式,避免i18n extract无法检测 2020-05-14 11:19:01 +08:00
Orange
d9b0d0f656
Update .gitmodules 2020-05-14 11:09:04 +08:00
ibuler
85c615b4b4 [Update] 修改提交的xpack 2020-05-14 11:04:16 +08:00
ibuler
2acea9c828 [Update] 移动router位置 2020-05-14 10:32:09 +08:00
ibuler
5f1a6741aa [Update] 移动router位置 2020-05-14 10:29:05 +08:00
ibuler
472608c6f4 Merge branch 'master' of github.com:jumpserver/lina 2020-05-13 20:55:19 +08:00
ibuler
e8d5a3c09f [Update] merge 2020-05-13 20:54:57 +08:00
OrangeM21
08610eb6ce [fix] 2020-05-13 20:54:28 +08:00
ibuler
acfedb050e [Update] 修改submodule 2020-05-13 20:54:09 +08:00
OrangeM21
efd109c7bf Merge remote-tracking branch 'origin/master' 2020-05-13 20:53:56 +08:00
OrangeM21
c77105fa5e [fix] 2020-05-13 20:53:17 +08:00
ibuler
dfe6baa06f Merge branch 'master' of github.com:jumpserver/lina 2020-05-13 20:51:13 +08:00
xinwen
a737906365 [Update] 修复 RemoteApp 提交丢失 type 字段 bug 2020-05-13 20:49:58 +08:00
OrangeM21
c7bbb5ea75 [fix] 2020-05-13 20:49:07 +08:00
OrangeM21
3cecfcac79 [fix] 2020-05-13 20:46:36 +08:00
ibuler
5fc40a97d1 [Update] remove routers 2020-05-13 20:44:56 +08:00
ibuler
a3d2835f3d Merge branch 'master' of github.com:jumpserver/lina 2020-05-13 20:38:32 +08:00
ibuler
5dde2457d1 [Update] 统一更改了翻译 2020-05-13 20:38:03 +08:00
OrangeM21
a9ffb87e69 [fix]添加Xpack案例 2020-05-13 19:18:42 +08:00
xinwen
a64a367610 [Add] applications RemoteApp 更新 2020-05-13 18:36:24 +08:00
ibuler
a68ed8e6e4 Merge branch 'master' of github.com:jumpserver/lina 2020-05-13 17:47:46 +08:00
ibuler
f6e85771ec [Update] 去掉i18n检查 2020-05-13 17:47:23 +08:00
jym503558564
321ebfd924 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-13 17:22:06 +08:00
jym503558564
a12c0db837 [Update] 修改翻译 2020-05-13 17:21:44 +08:00
OrangeM21
1286277a3a Merge remote-tracking branch 'origin/master' 2020-05-13 17:15:30 +08:00
jym503558564
2e59f40023 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-13 17:10:12 +08:00
jym503558564
4f2c5638e7 [Update] 资产授权列表使用GenericTreeListPage 2020-05-13 17:08:37 +08:00
ibuler
d83684b1f1 [Update] Merge 2020-05-13 17:02:54 +08:00
ibuler
4a64ba5b3c [Update] Merge 2020-05-13 16:47:11 +08:00
ibuler
19ef8febd5 [Update] 暂时注释 2020-05-13 16:45:51 +08:00
jym503558564
45b4c69eb5 [Update] 修改翻译 2020-05-13 16:42:48 +08:00
ibuler
643cc1a355 [Update] 修改i18n 2020-05-13 16:04:39 +08:00
ibuler
cad1fa72a5 [Update] 修改i18n, 支持工具检查 2020-05-13 15:53:14 +08:00
OrangeM21
8b9cf6bbe5 Merge remote-tracking branch 'origin/master' 2020-05-13 15:03:36 +08:00
jym503558564
1349338116 [Update] 修改小问题 2020-05-13 15:03:12 +08:00
jym503558564
1b0b67b2b5 [Merge] 合并冲突 2020-05-13 14:53:59 +08:00
jym503558564
6d476230e2 [Update] 修改工单详情组件 2020-05-13 14:51:09 +08:00
ibuler
8fd8edf845 [Update] 修改了翻译 2020-05-13 14:41:28 +08:00
OrangeM21
b94ce8b63b [fix]完善Assets 2020-05-13 14:32:34 +08:00
ibuler
12cd5d863c [Update] 整理代码 2020-05-13 11:04:53 +08:00
ibuler
a120438584 Merge branch 'master' of github.com:jumpserver/lina 2020-05-13 11:03:03 +08:00
ibuler
5000bb6d24 [Update] 修改routes 和 i18n 2020-05-13 11:02:36 +08:00
OrangeM21
e65da0e1cf Merge remote-tracking branch 'origin/master' 2020-05-12 20:41:32 +08:00
OrangeM21
08f84a73a0 [fix]完善Assets 2020-05-12 20:41:07 +08:00
jym503558564
6699082f9a Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-12 19:42:32 +08:00
jym503558564
d7feb3dac4 [Update] 初步实现工单管理详情组件 2020-05-12 19:42:14 +08:00
xinwen
712118281b [Add] applications remoteapp 添加应用新增功能 2020-05-12 18:47:30 +08:00