BaiJiangJie
|
5b53cfb4dd
|
[Update] 修改资产树节点(数量)总显示此节点下的资产总数
|
2018-05-29 11:50:09 +08:00 |
ibuler
|
b0710c42b0
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-05-29 11:27:56 +08:00 |
老广
|
d9d82cea5e
|
Merge pull request #1370 from jumpserver/fix_asset_count
[Update] 修改资产树和资产列表数量显示(游离资产)
|
2018-05-29 11:26:23 +08:00 |
BaiJiangJie
|
3a2973023c
|
[Update] 修改资产树和资产列表数量显示(游离资产)
|
2018-05-29 11:17:09 +08:00 |
ibuler
|
47397d2308
|
[Bugfix] 修复网关测试连接需要ssh信任key的问题
|
2018-05-28 16:44:00 +08:00 |
ibuler
|
7b57d24dc9
|
[Update] 优化代码
|
2018-05-28 15:00:06 +08:00 |
ibuler
|
ffabef0040
|
Merge branch 'large' into dev
|
2018-05-28 13:20:58 +08:00 |
ibuler
|
0b4df78393
|
[Update] 修改permistion utils优化返回的属性
|
2018-05-28 13:20:26 +08:00 |
BaiJiangJie
|
2fab69ca61
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
|
2018-05-28 11:15:48 +08:00 |
BaiJiangJie
|
f9ab0abc37
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
|
2018-05-28 10:58:47 +08:00 |
ibuler
|
0bc86543b5
|
[Update] 修改用户组详情显示授权资产的bug
|
2018-05-26 21:53:50 +08:00 |
ibuler
|
fc2a44621b
|
[Bugfix] 修复右击位置不对的bug
|
2018-05-25 19:17:57 +08:00 |
ibuler
|
9b4b9e6900
|
[Update] 发送邮件增加用户名显示
|
2018-05-25 18:13:48 +08:00 |
ibuler
|
22a84d57ca
|
[Update] 修改树形结构
|
2018-05-25 17:32:10 +08:00 |
ibuler
|
3f4b5ad465
|
[Update] Merge
|
2018-05-25 17:28:53 +08:00 |
ibuler
|
a96bda8ca9
|
[Update] 修改树形结构
|
2018-05-25 17:26:57 +08:00 |
ibuler
|
bff3868b8f
|
[Update] 统一requirements版本
|
2018-05-25 15:23:52 +08:00 |
ibuler
|
b9d0d89f66
|
[Update] 更改版本好
|
2018-05-24 13:32:20 +08:00 |
ibuler
|
5a7192e035
|
[Update] 修改心跳bug
|
2018-05-24 13:30:15 +08:00 |
BaiJiangJie
|
de2416b173
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
|
2018-05-24 12:42:06 +08:00 |
BaiJiangJie
|
486793ddcd
|
[Bugfix] 修复取消LDAP认证不成功bug
|
2018-05-24 12:41:48 +08:00 |
ibuler
|
c529061ee0
|
[Bugfix] 修复授权uitls的错误
|
2018-05-24 11:18:20 +08:00 |
ibuler
|
fe52c57a11
|
[Bugfix] 修复授权uitls的错误
|
2018-05-24 11:13:22 +08:00 |
ibuler
|
f8384973a1
|
[Update] 调整Luna的树形结构
|
2018-05-23 15:15:27 +08:00 |
ibuler
|
dc1d228e07
|
[Update] 更新requirements
|
2018-05-22 19:44:13 +08:00 |
ibuler
|
092b33d4d1
|
[Update] 更新requirements
|
2018-05-22 19:30:15 +08:00 |
ibuler
|
d615eb80b5
|
[Update] 优化使用storage sdk
|
2018-05-22 18:22:06 +08:00 |
ibuler
|
46520287d9
|
[Update] 添加清理重复用户组脚本
|
2018-05-17 15:26:22 +08:00 |
ibuler
|
4b7af1457d
|
[Update] 系统用户新增清除认证的操作
|
2018-05-17 11:39:04 +08:00 |
BaiJiangJie
|
c1db33713f
|
[Bugfix] 修复资产授权树root节点bug
|
2018-05-16 16:12:27 +08:00 |
老广
|
e66cfc2e13
|
Merge pull request #1333 from jumpserver/update_rdp
[Update] 去掉windows相关无用配置,修复资产树节点移动等问题
|
2018-05-16 12:42:01 +08:00 |
BaiJiangJie
|
ac67c231fc
|
[Update] 修改前端rdp相关配置的选择逻辑
|
2018-05-16 12:31:13 +08:00 |
BaiJiangJie
|
599431f402
|
[Update] 去掉添加windows相关配置时的一些无用功能,网域网关/会话列表
|
2018-05-15 17:32:20 +08:00 |
ibuler
|
ed18cb317f
|
[Bugfix] 修复创建node api的bug
|
2018-05-15 15:05:49 +08:00 |
ibuler
|
cb4afabc91
|
[Bugfix] 修复创建node节点的问题,修复windows session的问题
|
2018-05-15 14:44:02 +08:00 |
BaiJiangJie
|
718715cc6d
|
[Update] 创建系统用户选择rdp协议,去掉相关配置的一些无用功能
|
2018-05-15 12:52:53 +08:00 |
BaiJiangjie
|
38f8c5bb72
|
[Bugfix] 修复资产树节点移动,资产授权树节点下的资产显示问题
|
2018-05-14 14:21:32 +08:00 |
ibuler
|
ebc1b4975a
|
[Update] 自动生成秘钥去掉密码
|
2018-05-11 18:38:26 +08:00 |
ibuler
|
2da87151ed
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-05-11 12:01:54 +08:00 |
老广
|
ab9d457ce0
|
Merge pull request #1312 from jumpserver/bugfix_asset_tree_node
修复:资产树节点,取消model value unique,并添加唯一性校验,serializers/api中;修改新增节点计数器规则;
|
2018-05-11 12:01:13 +08:00 |
BaiJiangjie
|
cbc4a0a97b
|
[Bugfix] 资产树节点Node Value值校验修改异常抛出为400
|
2018-05-11 11:27:48 +08:00 |
ibuler
|
0031d025aa
|
[Bugfix] 修复上次提交引起的bug
|
2018-05-11 09:28:20 +08:00 |
BaiJiangjie
|
4c53eebdbe
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
|
2018-05-10 21:15:49 +08:00 |
BaiJiangjie
|
2583c0b26c
|
[Bugfix] 资产树节点,取消model value unique,并添加唯一性校验,修改新增节点计数器规则
|
2018-05-10 20:48:16 +08:00 |
ibuler
|
ebef4f254a
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-05-10 12:29:09 +08:00 |
老广
|
84d3fa6db0
|
Merge pull request #1303 from jumpserver/update_asset_tree
[Update] 添加功能:资产树显示全部/只显示当前节点下的资产;修复资产树节点主机数与列表显示不一致
|
2018-05-10 12:28:34 +08:00 |
ibuler
|
e2fa492987
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-05-10 12:25:10 +08:00 |
ibuler
|
116a04da68
|
Merge branch 'term_js' into dev
|
2018-05-10 12:24:09 +08:00 |
ibuler
|
7de6af89ad
|
[Update] 使用xterm.js替换原来的term.js
|
2018-05-10 12:19:37 +08:00 |
ibuler
|
8e74a04282
|
[Update] 修改一些bug
|
2018-05-09 17:35:46 +08:00 |