Commit Graph

3365 Commits (41e7f45c20180c2659339a0d628a118a5a3a821a)
 

Author SHA1 Message Date
ibuler 2abb9efe96 [Update] Org功能修改
6 years ago
BaiJiangJie f17727deb9 [Update] 在线/历史/命令model添加org;修复命令记录保存org失败bug (#1584)
6 years ago
老广 36f1165d1b
Tmp org (#1583)
6 years ago
BaiJiangJie e7c530d8e6 [Update] 添加授权规则org (#1580)
6 years ago
老广 b156f4ad16
Tmp org (#1579)
6 years ago
老广 16b23a37fe
增加命令导出 (#1566)
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)
6 years ago
老广 8e42a65736
Merge pull request #1560 from wojiushixiaobai/dev
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
6 years ago
ibuler c94d018d7e [Bugfix] 修复转义引起的中文乱码问题
6 years ago
老广 53086a8977
Merge pull request #1550 from jumpserver/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
6 years ago
老广 97b240cfdd
Revert "授权页面分页问题"
6 years ago
ibuler fd5f562cbf [Update] stash it
6 years ago
老广 722bf786f1
Merge pull request #1542 from jumpserver/dev
6 years ago
老广 2cb5876d1a
Merge branch 'master' into dev
6 years ago
ibuler 8883e0090f [Update] 更改版本号
6 years ago
ibuler 790652ff4d [Update] 修改协议小问题
6 years ago
ibuler ff3f74abe6 [Update] 修改api
6 years ago
老广 1a49cf4d9c
Merge pull request #1532 from wojiushixiaobai/dev
6 years ago
ibuler 4d1da56872 [Update] 修改asset api
6 years ago
老广 ff9e109a2c
Merge pull request #1533 from jumpserver/update_unblockuser
6 years ago
BaiJiangJie 09e636495e [Update] 模版删除unblock的id属性
6 years ago
BaiJiangJie 14076d8fe1 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
6 years ago
BaiJiangJie 812078331e [Update] 添加解除用户登录限制功能
6 years ago
wojiushixiaobai 696589a3cf 修改url
6 years ago
wojiushixiaobai 7eba46b303 Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev
6 years ago
wojiushixiaobai 5d63d2369f 合并冲突解决
6 years ago
ibuler 3e17e94245 [Update] 修改资产
6 years ago
ibuler 5648dcd7e7 [Update] 修改用户view
6 years ago
ibuler 28e47f33c1 [Update] 修改一些逻辑
6 years ago
老广 91b3b7ce69
Merge pull request #1515 from wstart/master
6 years ago