ibuler
|
b29a541aa6
|
[Update] Add init
|
6 years ago |
ibuler
|
9fd52f6665
|
[Bugfix] 修复merge引起的bug
|
6 years ago |
ibuler
|
f4c86718dc
|
[Update] Merge dev
|
6 years ago |
老广
|
4ff7a1f066
|
Merge pull request #1600 from jumpserver/bai_org
[Bugfix] 修复org下普通用户打开web终端看不到已被授权的资产和节点bug
|
6 years ago |
ibuler
|
eca245fdd5
|
[Bugfix] 修复节点前面有个空目录
|
6 years ago |
ibuler
|
7e3cf908a1
|
[Update] 修改get_all_assets
|
6 years ago |
老广
|
dded4e10fb
|
Merge pull request #1599 from jumpserver/dev
Dev
|
6 years ago |
BaiJiangJie
|
45a354f848
|
[Bugfix] 修复org下普通用户打开web终端看不到已被授权的资产和节点bug
|
6 years ago |
ibuler
|
8386f107c6
|
Merge remote-tracking branch 'github/dev' into dev
|
6 years ago |
ibuler
|
5ce3dd4079
|
[Update] 添加unblock user脚本
|
6 years ago |
老广
|
a48fb9de8d
|
Tmp org (#1596)
* [Update] 修改index view
* [Update] 修改nav
* [Update] 修改profile
|
6 years ago |
BaiJiangJie
|
04e7f54c69
|
[Update] org admin显示资产详情右侧选项卡;修复资产授权添加用户,会显示其他org用户的bug (#1594)
* [Bugfix] 修复资产授权添加用户,显示其他org的用户bug
* [Update] org admin 显示资产详情右侧选项卡
|
6 years ago |
BaiJiangJie
|
d649aacfd6
|
[Update] asset platform 取消*required (#1595)
|
6 years ago |
ibuler
|
7e65e44a3c
|
[Update] 兼容guacamole手动模式上传system user是uuid
|
6 years ago |
ibuler
|
74c3f12275
|
[Update] 添加脚本,将windows协议改为rdp
|
6 years ago |
ibuler
|
8c12c382a5
|
[Bugfix] 修复merge带来的问题
|
6 years ago |
ibuler
|
2ecfecb06f
|
[Update] Merge with dev
|
6 years ago |
BaiJiangJie
|
ac238aa36e
|
[Update] 修改用户登录失败限制次数,3->7 (#1586)
* [Update] 修改用户登录失败限制次数,3->7
* [Update] 修改用户登录失败限制次数,3->7 - 续
|
6 years ago |
ibuler
|
2abb9efe96
|
[Update] Org功能修改
|
6 years ago |
BaiJiangJie
|
f17727deb9
|
[Update] 在线/历史/命令model添加org;修复命令记录保存org失败bug (#1584)
* [Update] 修复创建授权规则,显示org_name不是有效UUID的bug
* [Update] 更新org之间隔离授权规则,解决QuerySet与Manager问题;修复创建用户,显示org_name不是有效UUID之bug;
* [Update] 在线/历史/命令model添加org
* [Bugfix] 修复命令记录,保存org不成功bug
|
6 years ago |
老广
|
36f1165d1b
|
Tmp org (#1583)
* [Update] 修改一些内容
* [Update] 修改datatable 支持process
* [Bugfix] 修复asset queryset 没有valid方法的bug
|
6 years ago |
BaiJiangJie
|
e7c530d8e6
|
[Update] 添加授权规则org (#1580)
* [Update] 修复创建授权规则,显示org_name不是有效UUID的bug
* [Update] 更新org之间隔离授权规则,解决QuerySet与Manager问题;修复创建用户,显示org_name不是有效UUID之bug;
|
6 years ago |
老广
|
b156f4ad16
|
Tmp org (#1579)
* [Update] 添加org api, 升级到django 2.0
* [Update] fix some bug
* [Update] 修改一些bug
|
6 years ago |
老广
|
16b23a37fe
|
增加命令导出 (#1566)
* [Update] gunicorn不使用eventlet
* [Update] 添加eventlet
* 替换淘宝IP查询接口
* [Feature] 添加命令记录下载功能 (#1559)
* [Feature] 添加命令记录下载功能
* [Update] 文案修改,导出记录、提交,取消全部命令导出
* [Update] 命令导出,修复时间问题
* [Update] paramiko => 2.4.1
* [Update] 修改settings
* [Update] 修改权限判断
|
6 years ago |
ibuler
|
e41add6126
|
Merge remote-tracking branch 'github/dev' into dev
|
6 years ago |
ibuler
|
f4c31d8e86
|
[Update] 修改权限判断
|
6 years ago |
ibuler
|
28e8f204ec
|
Merge remote-tracking branch 'github/dev' into dev
|
6 years ago |
ibuler
|
80f147cf13
|
[Update] 修改settings
|
6 years ago |
老广
|
c816875f28
|
[Update] 修改permission (#1574)
|
6 years ago |
ibuler
|
1c56ba5a11
|
[Update] paramiko => 2.4.1
|
6 years ago |
老广
|
2208d6d51e
|
[Bugfix] 解决Node.root() 死循环,移动AdminRequired到permission中 (#1571)
|
6 years ago |
ibuler
|
e3aa18ff2d
|
[Update] 修改get_current_org 为 proxy对象 current_org
|
6 years ago |
ibuler
|
b5f6f80ae6
|
[Update] 修改Node
|
6 years ago |
ibuler
|
bbe4080008
|
[Update] 删掉Premiddleware
|
6 years ago |
ibuler
|
cd797b18fb
|
Merge remote-tracking branch 'github/dev' into dev
|
6 years ago |
ibuler
|
b6523da603
|
[Update] 修改外键为org_id
|
6 years ago |
ibuler
|
c24f1a0517
|
[Update] 修改约束
|
6 years ago |
BaiJiangJie
|
83f220d7de
|
[Feature] 添加命令记录下载功能 (#1559)
* [Feature] 添加命令记录下载功能
* [Update] 文案修改,导出记录、提交,取消全部命令导出
* [Update] 命令导出,修复时间问题
|
6 years ago |
老广
|
8e42a65736
|
Merge pull request #1560 from wojiushixiaobai/dev
[Update]替换淘宝IP查询接口
|
6 years ago |
wojiushixiaobai
|
e1fff18ce3
|
替换淘宝IP查询接口
|
6 years ago |
ibuler
|
3052744203
|
[Update] 添加eventlet
|
6 years ago |
ibuler
|
7924b094f8
|
[Update] gunicorn不使用eventlet
|
6 years ago |
老广
|
3d34b06203
|
Merge pull request #1551 from jumpserver/dev
[Bugfix] 修复转义引起的中文乱码问题
|
6 years ago |
ibuler
|
c94d018d7e
|
[Bugfix] 修复转义引起的中文乱码问题
|
6 years ago |
老广
|
53086a8977
|
Merge pull request #1550 from jumpserver/dev
Dev
|
6 years ago |
ibuler
|
ce1fc0f3e2
|
[Bugfix] 修复授权列表引起的分页bug
|
6 years ago |
ibuler
|
c215278978
|
[Bugfix] 修复授权列表引起的分页bug
|
6 years ago |
老广
|
061963a316
|
Merge pull request #1549 from jumpserver/revert-1515-master
Revert "授权页面分页问题"
|
6 years ago |
老广
|
97b240cfdd
|
Revert "授权页面分页问题"
|
6 years ago |
ibuler
|
fd5f562cbf
|
[Update] stash it
|
6 years ago |