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

645 Commits (e08d542c87c288f8e396c5abf4c369ba61de9550)

Author SHA1 Message Date
ibuler 482d1bb27f [Update] 修改permisstion util
7 years ago
ibuler e7c7c3a7a8 Merge branch 'dev' into perm_tree
7 years ago
ibuler a9d1538135 [Update] 修改一些方法
7 years ago
ibuler f8ff223f90 [Update] 更新api和model方法
7 years ago
BaiJiangJie 526943a041 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie e9d0104a69 Merge branch 'dev' of github.com:jumpserver/jumpserver into fix_asset_count_dev
7 years ago
BaiJiangJie 7c694c6885 [Update] 合并Node的parent.setter方法，修改node_fake的parent逻辑
7 years ago
ibuler 757a31a52f [Update] 优化asset api, 获取时增加prefetch
7 years ago
BaiJiangJie 5b53cfb4dd [Update] 修改资产树节点(数量)总显示此节点下的资产总数
7 years ago
ibuler b0710c42b0 Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangJie 3a2973023c [Update] 修改资产树和资产列表数量显示(游离资产)
7 years ago
ibuler 47397d2308 [Bugfix] 修复网关测试连接需要ssh信任key的问题
7 years ago
ibuler 7b57d24dc9 [Update] 优化代码
7 years ago
ibuler 0b4df78393 [Update] 修改permistion utils优化返回的属性
7 years ago
BaiJiangJie 2fab69ca61 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie f9ab0abc37 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
ibuler fc2a44621b [Bugfix] 修复右击位置不对的bug
7 years ago
ibuler a96bda8ca9 [Update] 修改树形结构
7 years ago
BaiJiangJie de2416b173 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
ibuler f8384973a1 [Update] 调整Luna的树形结构
7 years ago
ibuler 4b7af1457d [Update] 系统用户新增清除认证的操作
7 years ago
BaiJiangJie c1db33713f [Bugfix] 修复资产授权树root节点bug
7 years ago
老广 e66cfc2e13
Merge pull request #1333 from jumpserver/update_rdp
7 years ago
BaiJiangJie ac67c231fc [Update] 修改前端rdp相关配置的选择逻辑
7 years ago
BaiJiangJie 599431f402 [Update] 去掉添加windows相关配置时的一些无用功能，网域网关/会话列表
7 years ago
ibuler ed18cb317f [Bugfix] 修复创建node api的bug
7 years ago
ibuler cb4afabc91 [Bugfix] 修复创建node节点的问题，修复windows session的问题
7 years ago
BaiJiangJie 718715cc6d [Update] 创建系统用户选择rdp协议，去掉相关配置的一些无用功能
7 years ago
BaiJiangjie 38f8c5bb72 [Bugfix] 修复资产树节点移动，资产授权树节点下的资产显示问题
7 years ago
ibuler ebc1b4975a [Update] 自动生成秘钥去掉密码
7 years ago
ibuler 2da87151ed Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangjie cbc4a0a97b [Bugfix] 资产树节点Node Value值校验修改异常抛出为400
7 years ago
BaiJiangjie 2583c0b26c [Bugfix] 资产树节点，取消model value unique，并添加唯一性校验，修改新增节点计数器规则
7 years ago
ibuler ebef4f254a Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 116a04da68 Merge branch 'term_js' into dev
7 years ago
ibuler 7de6af89ad [Update] 使用xterm.js替换原来的term.js
7 years ago
ibuler 8e74a04282 [Update] 修改一些bug
7 years ago
BaiJiangjie 3af01d6a31 [Update] 添加功能：资产树显示全部/只显示当前节点下的资产；修复资产树节点主机数与列表显示不一致
7 years ago
ibuler e291ca9057 [Update] 默认关闭定时任务
7 years ago
老广 55096f9ad5
Bugfix perm asset not active (#1273)
7 years ago
老广 6f494ef09c
校验用户名长度和特殊字符 (#1271)
7 years ago
ibuler 5103dab72e [Bugfix] 解决上次引入的bug
7 years ago
ibuler 16aa42a861 [Bugfix] 修复授权树列表和资产树列表不同的bug
7 years ago
ibuler 40a0c4597b Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangjie 102e1ca97c [Bugfix] 创建资产，资产系统置上，RDP:3389
7 years ago
BaiJiangjie 2823d02763 [Bugfix] 修复资产列表导入，资产id问题
7 years ago
ibuler 9a3d0732bc [Update] 更新授权代码
7 years ago
BaiJiangjie 7a219e1710 [Update] OTP文案修改为MFA
7 years ago
ibuler 947f7d206a [Bugfix] 修复生成system user的问题
7 years ago
ibuler b90d3306c5 [Bugfix] 去掉gateway name连接
7 years ago
ibuler 3ccd54680e [Bugfix] 修改授权详情快速Node更改失效的bug
7 years ago
ibuler 071d14c639 [Update] 修改资产获取select
7 years ago
ibuler 823e879432 [Update] 更新节点移动交互
7 years ago
ibuler 739932b005 [Update] 更新资产导入
7 years ago
ibuler 24f144fdc3 [Bugfix] 修复导入资产时url地址问题
7 years ago
ibuler ee4f5a8194 [Bugfix] 修复资产重复的bug
7 years ago
ibuler 8b3b517bab [Update] 修改授权规则详情列表页面
7 years ago
ibuler 7fc2ef00ee [Update] 修改资产api获取的bug
7 years ago
ibuler bbaa35c773 [Update] 修改Perms
7 years ago
ibuler 84634eb8c0 [Update] 修改Permr认证
7 years ago
ibuler fffa0def9e [Update] 修改api和view
7 years ago
ibuler d0ede246e7 [Update] 修改授权
7 years ago
ibuler 4fa72400be Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangjie 8504c3d2fd 修复资产列表导出问题
7 years ago
ibuler d966e22cf9 [Update] 修改小bug
7 years ago
ibuler 168335a381 [Update] 更新内容
7 years ago
ibuler 121726b731 Merge remote-tracking branch 'github/dev' into 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 a4c843ff13 [Update] 迁移celery到ops
7 years ago
ibuler d32f070b5c [Update] 修改Inverntoy，增加更多属性
7 years ago
ibuler 829f57e2d7 [Bugfix] 修复小bug
7 years ago
ibuler c5af4d47eb Merge branch 'some_auth_api' into dev
7 years ago
ibuler c37bfb682a [Update] 添加设置认证api和创建用户时可以不选择组
7 years ago
ibuler d598571dc1 [Update] 添加一个log
7 years ago
ibuler e873be95d5 [Update] 导入到当前node
7 years ago
ibuler dbaa4ab502 [Update] 修改资产导入的事务问题
7 years ago
ibuler 75319b99ae [Update] 更新ap请求
7 years ago
ibuler 7f4f67aa8d [Update] 支持网域
7 years ago
ibuler fe1862120f [Update] 删掉集群等等
7 years ago
ibuler 2fc9c04228 [Bugfix] 修复更新系统用户后关联节点丢失的问题
7 years ago
ibuler f195b309d4 [Bugfix] 全选后编辑checkbox问题
7 years ago
ibuler 93895b6b92 [Update] 修改一些文案说明和翻译
7 years ago
ibuler e9be4f51e5 [Update] 删除资产详情中的windows等测试连接
7 years ago
ibuler 42f297e6c4 [Update] 更新一些文案
7 years ago
ibuler 8b63961d4d [Update] 默认开启定时检测，运行失败默认log为warn
7 years ago
ibuler 2e8f5919a8 [Update] 默认关闭自动定时推送功能
7 years ago
ibuler 43b4b7c55e [Feature] 资产节点增加批量测试可连接性和更新硬件信息
7 years ago
ibuler f59f03adfd [Update] 支持使用环境变量关闭定时任务
7 years ago
ibuler 9ffb079c8f [Update] 增加修改system user auth 的api
7 years ago
ibuler 88c10e851b [Update] 修改推送任务
7 years ago
ibuler d852f0182b [Update] 修改bug
7 years ago
ibuler 40d2934de0 [Bugfix] 修复首页无法显示数据的bug
7 years ago
ibuler cd9000e7e9 [Update] 修改Node value唯一
7 years ago
ibuler d3e77b09ef [Merge] with doc
7 years ago
ibuler 86c0a2d28b [Update] 修改部分翻译和文档
7 years ago
ibuler e123599735 [Update] 修改一些bug和文案
7 years ago
ibuler bd4f96134f [Update] 修改一些文案
7 years ago
ibuler d284c2175d [Update] 修改一些小问题
7 years ago
ibuler f7ab13952e [Bugfix] 修复bug，修改celery beat版本依赖
7 years ago
ibuler 1018deda96 [Update] 支持拖拽更新
7 years ago
ibuler 31629fc975 [Bugfix] 修复资产禁用还可以登录
7 years ago
ibuler f886e7c2f5 [Update] 修改授权api, windows资产只有rdp协议，linux只有ssh协议
7 years ago
ibuler 91863107d7 [Bugfix] 修复管理用户无法查看的bug
7 years ago
ibuler 870b863136 [Update] 修改设置的一些require
7 years ago
ibuler 9292e48554 [Bugfix] 用户csv导入编码问题
7 years ago
ibuler e2cb128794 [Update] 修改翻译
7 years ago
q4speed 66b8e8bcf8 增加隐藏树功能
7 years ago
ibuler f1c386714d [Update]一些修改
7 years ago
ibuler f0dd7d54c8 [Update] 修改资产model
7 years ago
ibuler 08edda35e1 [Update] 完成资产书
7 years ago
ibuler c8728cace4 [Update] 完成树形改造
7 years ago
ibuler c7296c2498 [Update] 修改系统用户推送，拆分assets的部分模块
7 years ago
ibuler f82d939d15 [Update] 使用资产树，去掉集群和资产组
7 years ago
ibuler 3bb6e08985 [Feature] 更改perms api
7 years ago
ibuler 6104acae8f [Update] 资产列表选中和移除资产
7 years ago
ibuler bd4768c147 [Update] 拆分asset api module
7 years ago
ibuler d047ff3b3a Merge branch 'dev' into tree
7 years ago
liuzheng712 6edd3f6cf8
feat: rdp support
7 years ago
ibuler 114289edaf [Bugfix] 修改创建系统用户的bug
7 years ago
ibuler 2d3967872b [Feature] 完成资产授权和资产添加
7 years ago
ibuler 653c328e84 [Abandon] ...
7 years ago
ibuler 2bc5e882fd [Update] 更改授权规则前commit
7 years ago
ibuler 21a7202587 [Bugfix] 修复ldap认证bug
7 years ago
ibuler a10ff5930f [Update] 修改资产创建
7 years ago
ibuler 017c3ae36a [Update] 修改ztrr
7 years ago
ibuler c4b52cb2a3 [Update] 去掉资产组添加
7 years ago
ibuler 5f2ca58d62 [Bugfix] 修改label api bug
7 years ago
ibuler 1c7212014b [Bugfix] 修改创建label时报错的bug
7 years ago
ibuler 97dd411ab8 [Bugfix] 修复组详情bug
7 years ago
ibuler d2ad10af9a [Bugfix] 修复组详情bug
7 years ago
ibuler 2f06a2b1d3 [Feature] tree增删功能
7 years ago
ibuler 1ac30ed09c [Feature] 使用ztree
7 years ago
ibuler 3603b33a42 [Feature] 添加资产树
7 years ago
ibuler 460fa8e8a9 [Feature] tree
7 years ago
ibuler 9e09a962af [Feature] 支持popover
7 years ago
ibuler 3e62a7f5b7 [Update] 修改认证
7 years ago
ibuler b4f833740e [Bugfix] 资产批量便捷
7 years ago
ibuler 1fbf4ac08c [Update] 删除部分资产属性
7 years ago
ibuler da4c5f48a1 [Update] 修改获取资产信息产生的异常
7 years ago
ibuler 1192e8cdad [Bugfix] 修复系统用户上传秘钥的bug
7 years ago
ibuler bad397e2e6 [Update] 修复获取资产信息异常bug
7 years ago
ibuler 58d22b72ec [Feature] Label 删除修改
7 years ago
ibuler 6d4e9c7d30 [Bugfix] 资产model 太长
7 years ago
ibuler 723805d395 [Bugfix] 修复bsd获取cpu数量bug
7 years ago
ibuler 41756b06e1 [Bugfix] 修复获取kvmcpu的bug
7 years ago
ibuler 9e36a2cbb1 [Update] ansible disk bug
7 years ago
ibuler f0b9a11482 [Update] ansible disk bug
7 years ago
ibuler f6d21585ab [Bugfix] 修复资产搜索bug
7 years ago
ibuler b0fab2453a [Merge] 合并标签功能
7 years ago
ibuler b2d6645f46 [Feature] 添加资产详情标签
7 years ago
ibuler cb902362b5 [Feature] 资产列表标签搜索
7 years ago
ibuler 070c3d73cc [Bugfix] git status
7 years ago
ibuler 7433327d75 [Feature] 标签管理功能
7 years ago
ibuler f37b331630 Merge with dev
7 years ago
ibuler 9dbf498322 [Update] 修改copyright
7 years ago
ibuler 8e6efac6db [Update] 修改copyrite
7 years ago
ibuler 579e74dd5d [Bugfix] 修复一些bug
7 years ago
ibuler b936d54a48 [Feature] 添加es支持
7 years ago
ibuler ce9ff67b24 [Bugfix] 读取不到prefix
7 years ago
ibuler 5bbad01909 [Feature] 增加标签
7 years ago
ibuler f1ec53d1bc [Remove] labels
7 years ago
ibuler d3109a03b2 [Bugfix] 修复资产列表显示bug
7 years ago
ibuler 7e2d627d3f [Bugfix] 资产列表选择别的页会报错
7 years ago
ibuler b2f97a263d [Feature] 添加后端paging
7 years ago
ibuler 39fff235d1 [Bugfix] 修复cluster创建的bug
7 years ago
ibuler abb1a40a4f [Feature] 添加basic settings
7 years ago
ibuler 121f56f44b [Feature] 添加setting页面
7 years ago
ibuler b49e3b8f84 [Update] api 返回platform, 并增加web terminal nav
7 years ago
ibuler 3223d3b74d [Bugfix] 修复了一些显示上的bug
7 years ago
ibuler b2b123b41e [Bugfix] 用户添加报错
7 years ago
ibuler 99cd685194 [Bugfix] 默认default cluster
7 years ago
ibuler b4080be5be [Update] 修改一些翻译
7 years ago
ibuler 22af44211d [Update] set default cluster
7 years ago
ibuler a4d02adb22 [Update] system user form add label
7 years ago
ibuler 72a82c41ee [Update] 修改 success message, 添加资产组时可以添加资产
7 years ago
ibuler 450a9495ec [Bug&Update] 以下bug和功能
7 years ago
ibuler c0829194dc [Update] 修改一些bug, 增加执行task的按钮
7 years ago
ibuler dfaf029a68 [Bugfix] 资产导入bugfix
7 years ago
ibuler 3f1863151a [Bugfix] 修复session搜索bug
7 years ago
ibuler 676d640e70 [Bugfix] 修复导出csv和更新资产环境变量冲突
7 years ago
ibuler 07a70311df [Bugfix] 修复以下bug
7 years ago
ibuler c16471d54f [Bugfix] 资产导入中下载模板异常
7 years ago
ibuler 1888c698f1 [Bugfix] 修复一些bug
7 years ago
ibuler 28223421b1 [Bugfix] 修复一下bug
7 years ago
ibuler 56fd18241d [Update] 修改一些翻译
7 years ago
ibuler 239a829c20 [Bugfix] support xvdx disk
7 years ago
ibuler 3b6403b2f2 [Update] 修改一些翻译
7 years ago
ibuler c48531c586 [Update] 添加和修改部分翻译
7 years ago
ibuler 0916757eb8 [Bugfix] 修复一些bug
7 years ago
ibuler 0b299344a7 [Update] 修改database 表现
7 years ago
ibuler a755882100 [Bugfix] 修复打印中文报错异常
7 years ago
ibuler 6586bef84c [Modify] Add access log
7 years ago
ibuler e0a3fafbd5 [Bugfix] 详见trello
7 years ago
ibuler 3804ab532d [Update] 修改信号
7 years ago
ibuler 158678c2db [Bugfix] 修改bug，显示cluster
7 years ago
ibuler 69f723c8f5 [Bugfix] requirements 添加openssh-cleints
7 years ago
ibuler f992347fc5 [Update] 修改become信息
7 years ago
ibuler e20444983d [Bugfix] 修改html bug
7 years ago
ibuler 0848893f1e [Bugfix] 修复时间日期搜索的bug，select2模块自适应长度
7 years ago
ibuler 3d705dbeaa [Bugfix] 修复一些bug
7 years ago
ibuler 22b7b84a45 [Update] 修改创建默认集群，组等名称为Default
7 years ago
ibuler a39e0a1db9 [Docker] For docker update
7 years ago
ibuler d0ef1e715e [Add] Add initial migrations
7 years ago
ibuler bf9bb1b973 [Update] 修改ops task运行
7 years ago
ibuler 30efec1b09 [Update] 修改 task 运行机制
7 years ago
ibuler 4893c4664d [Update] 修改task定时运行机制
7 years ago
ibuler 76df1de634 [Bugfix] 修复一些明显的bug
7 years ago
ibuler 5a92972120 [Bugfix] 修复ops一些功能的bug
7 years ago
ibuler 3f89701b84 [Bugfix] 修复授权和资产的一部分bug
7 years ago
ibuler b0eace6ad8 [Bugfix] 基本完成assets模块
7 years ago
ibuler b4e1ac1953 [Bugfix] 修复资产模块中一些bug
7 years ago
ibuler a308000d2e [Bugfix] 修改users模块一些bug
7 years ago
ibuler e1163895e2 [Update] 系统用户api允许app user获取
7 years ago
ibuler 1b6fd4d13a [Bugfix] 修改普通用户获取资产详情的bug
7 years ago
ibuler 2d0be8f996 [git status
7 years ago
ibuler b97d5b0960 [Feature] assets task 修改
7 years ago
ibuler 08e1788426 [Feature] 打算拆分下载和上传为独立模块，时间有限暂时放弃
7 years ago
ibuler 17ddb3bbbd [Feture] 使用信号解耦
7 years ago
ibuler 18fbfb449d [Feature] 修改url pattern 精确匹配uuid
7 years ago
ibuler cb57002682 [Change] 去掉前端html中的hardcode 99991937
7 years ago
ibuler 722863428d [Feature] 添加context_processor
7 years ago
ibuler 99b4c66b5e [Feature] 添加signals 解耦代码
7 years ago
ibuler cbc000696e [Feature] 修改adminuser systemuser cluster及他们的关系
7 years ago
ibuler 0c9e24dc59 [Feture] 添加ops 页面
7 years ago
ibuler 18fd04d63c [Stash] Test case 通不过，import error
7 years ago
ibuler 27a1849b1d [Change] 修改idc => cluster
7 years ago
ibuler 2b3551f1fc [Feature] 修改ansible和ops
7 years ago
ibuler e57121a780 [Feature] 优化Ops ansible api
7 years ago
ibuler 19051d36dc [Update] 修改一些bug
7 years ago
ibuler 7910292e0f [Feature] 修改命令上传api
7 years ago
ibuler e7f38ec894 [Change] 全部使用uuid作为主键
7 years ago
ibuler d80cbe270a [Update] 修改用户获取自己授权资产的api，和查询用户授权资产组等api的Url和结构
7 years ago
ibuler 7f9ce57318 修改 terminal上报接口和api
7 years ago
ibuler 3639b190e3 Update perm api
7 years ago
ibuler da5b9be5ca [Bugfix] Update some translation and set warning, partial fix #646
7 years ago
ibuler 5446196471 [Bugfix] #695 Asset detail add or delete system user or group mixed
7 years ago
ibuler 0f9ae9efbb Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
7 years ago
ibuler 4aef5b8229 [Bugfix] export asset pof error when none of assets
7 years ago
Caijun 43a0c4fe51 Fix importing csv bugs (#717)
7 years ago
ibuler e6537699fd [Bugfix] Update asset create template bug
7 years ago
ibuler d73d6e943b update user model charfield max length more than 767 bug
7 years ago
ibuler cd1d690fd3 [Bugfix] 修复一些bug
7 years ago
ibuler 5ffd1f99fd [Bugfix] 修复更新bug
7 years ago
ibuler cc1a339142 [bugfix] system user update bug
7 years ago
ibuler 477d23ea37 fix some bug
7 years ago
Eli 7c154abf70 fix bug: variable i should be the host name (#538)
7 years ago
Eli 370cdc275a 添加一个资产，然后推送系统用户时出现（Asset实例无法序列化） (#477)
7 years ago
ibuler 4e67749eef [Docs] 添加api dockers
7 years ago