Commit Graph

3303 Commits (90c629c837da4e490335f1311ec23eec5705596e)
 

Author SHA1 Message Date
ibuler bbaa35c773 [Update] 修改Perms
7 years ago
ibuler 0fa8287811 Merge branch 'dev' into perms
7 years ago
ibuler 78f4e5a89a [Update] 修改用户Opt
7 years ago
ibuler 3193c5549d Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler ed71e7d2d9 [Update] 修改用户Opt
7 years ago
ibuler 33c299566a [Update] 修复bug
7 years ago
ibuler 84634eb8c0 [Update] 修改Permr认证
7 years ago
ibuler a4ff2181c5 [Update] 修改用户view的api
7 years ago
ibuler fffa0def9e [Update] 修改api和view
7 years ago
ibuler d0ede246e7 [Update] 修改授权
7 years ago
BaiJiangJie b8b78ffeb2
Merge pull request #1162 from BaiJiangJie/dev
7 years ago
老广 d2d10b59ac
Merge pull request #1175 from jumpserver/dev
7 years ago
ibuler cb8e59edf2 [Update] 修改文案
7 years ago
ibuler 1c0d783eec [update] 添加Migrations
7 years ago
ibuler 4fa72400be Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 37c0062fae [Update] 添加审计模块
7 years ago
BaiJiangjie 8504c3d2fd 修复资产列表导出问题
7 years ago
老广 2d10e13057
Merge pull request #1171 from jumpserver/dev
7 years ago
ibuler 1d7ba3e204 [Bugfix] 修复小bug
7 years ago
ibuler d966e22cf9 [Update] 修改小bug
7 years ago
ibuler 6a88fd2d60 [Update] 修改api权限
7 years ago
BaiJiangjie b63999f385 创建用户发送邮件
7 years ago
Nidhoggur1993 4fd83bd5be
Update make_migrations.sh
7 years ago
老广 82d06351e7
Merge pull request #1158 from jumpserver/dev
7 years ago
ibuler aa8bece724 Merge branch 'ansible' into dev
7 years ago
老广 241bdff7c8
Merge pull request #1156 from jumpserver/dev
7 years ago
ibuler 168335a381 [Update] 更新内容
7 years ago
ibuler 121726b731 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 0b812a03c6 [Bugfix] 修复 ApiUpdateAttr的bug
7 years ago
ibuler 79ae6efafb [Bugfix] 修复没有Log path引起的bug
7 years ago
老广 d2f108eeec
Merge pull request #1154 from BaiJiangJie/master
7 years ago
BaiJiangJie c48beb10af
Merge pull request #1 from BaiJiangJie/dev
7 years ago
老广 ea9264ec49
Merge pull request #1153 from BaiJiangJie/dev
7 years ago
BaiJiangjie 5b65ed8a19 修复导入资产列表IP字段前后有空格问题,导入资产列表时doamin保存为对象
7 years ago
ibuler 951ac252fe [Merge] 更新ansible功能
7 years ago
ibuler 24c4e1df50 [Update] 资产,系统用户,管理用户等支持查看日志
7 years ago
ibuler d247e49b70 [Update] 修改celery位置
7 years ago
ibuler a4c843ff13 [Update] 迁移celery到ops
7 years ago
BaiJiangjie ec6103448e 使终端管理的应用用户不显示在用户组里
7 years ago
老广 0ca14463cd
Merge pull request #1147 from jumpserver/dev
7 years ago
ibuler df80e8047a [Update] 修改日志
7 years ago
ibuler 09fc2776df [Update] Support history view
7 years ago
ibuler e4c2affb5f Merge branch 'rev' into dev
7 years ago
ibuler 6fae4d5dee [Bugfix] for some commit
7 years ago
ibuler 0c80e3e815 [rev] for api commit
7 years ago
ibuler d32f070b5c [Update] 修改Inverntoy,增加更多属性
7 years ago
ibuler b959f1f68b Merge branch 'bugfix_ip_lookup' into dev
7 years ago
ibuler e1cab35db0 [Bugfix] 修改获取城市
7 years ago
ibuler 8014cc48b6 [Update] 修改settings和缩进
7 years ago
ibuler 829f57e2d7 [Bugfix] 修复小bug
7 years ago