Commit Graph

7199 Commits

Author SHA1 Message Date
jym503558564
d9495682a8 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-09 11:21:53 +08:00
jym503558564
28a8eac1bd [Update] 资产授权详情添加资产 2020-05-09 11:21:22 +08:00
Eric
ad9a656267 fix ldap button i18n 2020-05-09 10:36:17 +08:00
Eric_Lee
228f478848
ldap settings (#47) 2020-05-09 10:31:04 +08:00
ibuler
5ebda711e6 Merge branch 'master' of github.com:jumpserver/lina 2020-05-08 21:06:12 +08:00
ibuler
d8ec817c51 [Update] 修改封装授权的资产comp 2020-05-08 21:04:45 +08:00
xinwen
09c2f2e349 [Add] DateFormatter 2020-05-08 21:03:40 +08:00
ibuler
f1cf66fd12 [Update] 修改一些翻译 2020-05-08 20:28:15 +08:00
OrangeM21
b44f15faaf [update]修改i18n格式为Json 2020-05-08 20:05:35 +08:00
ibuler
e30811a656 [Update] 修改i18n 2020-05-08 20:03:23 +08:00
ibuler
311e6676f2 Merge branch 'master' of github.com:jumpserver/lina 2020-05-08 19:54:52 +08:00
ibuler
9d0bdd5f69 [Update] 修改i18n风格 2020-05-08 19:54:32 +08:00
jym503558564
fcd319d1ea [Update] 去掉一些console.log 2020-05-08 19:38:34 +08:00
jym503558564
b19eda1f53 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-08 19:37:44 +08:00
jym503558564
9791b8a68f [Update] 授权详情添加关系时,触发该授权关系的ListTable更新 2020-05-08 19:37:22 +08:00
ibuler
4eaab38493 Merge branch 'master' of github.com:jumpserver/lina 2020-05-08 18:29:44 +08:00
ibuler
084f2f6f95 [Update] 修改翻译通用的函数 2020-05-08 18:29:26 +08:00
xinwen
e157a5c218 [Add] audits pages 2020-05-08 18:03:28 +08:00
ibuler
846f9476f8 Merge branch 'master' of github.com:jumpserver/lina 2020-05-08 17:31:02 +08:00
ibuler
dbe750de19 [Update] 级别完成用户基本信息详情 2020-05-08 17:30:32 +08:00
jym503558564
90fc31aa99 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-08 16:22:06 +08:00
jym503558564
c71ebdadc2 [Update] 修改详情组件控制RelationCard数据是否显示在下方 2020-05-08 16:21:31 +08:00
OrangeM21
3d0eb5bff5 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-08 15:32:08 +08:00
OrangeM21
a05e62ebcb [update]完成命令过滤器详情页面 2020-05-08 15:31:28 +08:00
jym503558564
c2cdd1eee2 [Update] 更改一些card图标 2020-05-08 11:11:12 +08:00
jym503558564
7480db45bd [Update] 修改一些数据问题 2020-05-07 20:14:07 +08:00
jym503558564
4c76c519ba Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-07 19:11:43 +08:00
jym503558564
5927de03f3 [Update] 授权创建组件数据转化 2020-05-07 19:11:29 +08:00
ibuler
8ee0e46a3a [Update] 修改 detailcard 支持jsx 2020-05-07 18:58:44 +08:00
ibuler
5cd549d5f1 [Update] Merge 2020-05-07 18:15:07 +08:00
ibuler
69bdae83cf [Update] 修改通用的ListPage 2020-05-07 18:10:35 +08:00
ibuler
3ad2d11f1c [Update] 修改LICENSE 2020-05-07 18:09:27 +08:00
jym503558564
b8a3655888 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-07 17:33:12 +08:00
jym503558564
29c3894816 [Update] 修改一些翻译,Card使用IBox 2020-05-07 17:32:46 +08:00
Eric_Lee
9e5c547ea5
[Update] Add email test button (#46) 2020-05-07 17:10:50 +08:00
ibuler
55db5e926e [Update] 修改quick actions组件 2020-05-07 16:43:41 +08:00
xinwen
3c2f14fa20 [Update] 调整 login-logs 页面 2020-05-07 16:30:56 +08:00
ibuler
7bbcd03928 Merge branch 'master' of github.com:jumpserver/lina 2020-05-07 16:28:36 +08:00
ibuler
fd35ad201f [Update] 修改login log 2020-05-07 16:28:00 +08:00
jym503558564
87c62bdcf2 [Update] 更新logo,以及一些授权详情组件修改 2020-05-07 15:33:30 +08:00
jym503558564
412947d51b [Merge] 合并冲突 2020-05-07 11:42:50 +08:00
jym503558564
7a675e4f7a [Update] 修改一些小问题 2020-05-07 11:39:17 +08:00
OrangeM21
c7fd346b19 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-07 11:28:54 +08:00
OrangeM21
ffbfeb3709 [update]添加CodeMirror插件和xterm插件,完善命令执行页面。 2020-05-07 11:28:19 +08:00
jym503558564
d4e5db9df2 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-07 11:10:38 +08:00
jym503558564
4d911ad7e6 [Update] 修改任务详情 2020-05-07 11:08:56 +08:00
ibuler
9f81d6fcbd Merge branch 'master' of github.com:jumpserver/lina 2020-05-06 21:21:42 +08:00
ibuler
91ce920159 [Update] Data form callback 提供参数values 2020-05-06 21:21:03 +08:00
八千流
87d999e546
Merge pull request #44 from jumpserver/jym
[Update] 修改授权详情组件
2020-05-06 21:10:16 +08:00
jym503558564
44db4e6963 [Update] 修改授权详情组件 2020-05-06 21:08:21 +08:00