github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3508 Commits
68 Branches
246 Tags
102 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '060248d1ca'
${ noResults }
Commit Graph

3508 Commits (060248d1ca7d42f7fd0bae05b67ae58492b12f18)
 

Author SHA1 Message Date
ibuler 37d89b4ea2 Merge branch 'tmp_org' into org
6 years ago
ibuler 87e0e1f2c4 [Update] Asset返回org name
6 years ago
ibuler 183ff09530 [Update] 修改token返回
6 years ago
BaiJiangJie 485a178c0a [Update] 创建/更新用户的role选项；密码强度提示信息中英文； (#1623)
6 years ago
BaiJiangJie 227cc4e965 [Update] 更新org下普通用户的资产详情 (#1619)
6 years ago
ibuler 01bef95e6e Merge remote-tracking branch 'github/org' into org
6 years ago
ibuler 672dd66023 [Bugfix] 修复一些bug
6 years ago
ibuler c032294b14 [Bugfix] 修复一些bug
6 years ago
BaiJiangJie 6ce813faf8 [Bugfix] 修复coco启动失败(load_config_from_server)、硬件刷新，测试连接，str 没有 decode(… (#1613)
6 years ago
ibuler aefc18d73b Merge branch 'org' into tmp_org
6 years ago
ibuler 23815f87c5 [Update] 升级url
6 years ago
ibuler 206e037cf2 [Update] 优化datatable 和显示组织优化
6 years ago
ibuler 492fd98882 [Update] 修改url 为django 2.0 path
6 years ago
ibuler d92d462dab [Update] 暂时修改一些url
6 years ago
ibuler 8afd5ef90a [Merge] 修改一下bug
6 years ago
ibuler d3dca5d077 [Update] Merge with org
6 years ago
ibuler 9166a26f80 Merge branch 'org' into tmp_org
6 years ago
ibuler 3039284666 [Bugfix] 修复校验失败api
6 years ago
老广 2f395794ef
Merge pull request #1602 from jumpserver/bai_org
6 years ago
ibuler c6d50802db [Bugfix] Fix perm name unique
6 years ago
BaiJiangJie a10e47f72c Merge branch 'org' into michael_org
6 years ago
BaiJiangJie 3dc214d1fa [Bugfix] 修复org下用户查看我的资产不显示已授权节点/资产的bug
6 years ago
ibuler f7fb36a176 [Update] 修改api
6 years ago
ibuler 0d7295b60e [Update] 恢复原来的api地址
6 years ago
BaiJiangJie 8f654c37a9 [Update] Node get_all_assets 过滤游离资产，条件nodes_key=None -> nodes=None
6 years ago
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
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
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)
6 years ago
BaiJiangJie 04e7f54c69 [Update] org admin显示资产详情右侧选项卡；修复资产授权添加用户，会显示其他org用户的bug (#1594)
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)
6 years ago
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