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

1108 Commits (0f87f05b3f7e8c07d5a9d2d6679b6e67bb46c88f)

Author SHA1 Message Date
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
ibuler 29095a869c [Demo] update demo mode code
8 years ago
Caijun b502b06e82 Support i18n for asset `platform` field (#494)
8 years ago
njqaaa dd6c82b168 fix left's users logout (#446)
8 years ago
ibuler 1719eee264 [Bugfix] 修复py3 bytes bug
8 years ago
ibuler 41633be1aa [Bugfix] 修复无法删除资产组
8 years ago
ibuler d2620a655c [Bugfix] 修复模板bug, 修复getattr bug
8 years ago
GuangHongwei 458989328e [Bugfix] 修改bug，使用py3编程
8 years ago
ibuler 2ec0ab871a Fix form bug
8 years ago
ibuler 695e4da85e [Fixture] 完成批量更新
8 years ago
ibuler 2aa9aafdf6 [Change] Bulk update asset
8 years ago
ibuler 071d1922d0 stash it
8 years ago
ibuler 95e64d7809 [Change] 修改导出和更新逻辑
8 years ago
ibuler 5418d0b44c [Change] Using csv replace xlsx
8 years ago
ibuler bcc065eb8f [Compat] compat py3 change bootstrap form to bootstrap3
8 years ago
ibuler a320b9e05e [Bugfix] 兼容py3
8 years ago
ibuler c11374ae39 [Bugfix] 修改翻译
8 years ago
ibuler 92ebe85a3f [Fixture] 详情页添加system user 推送
8 years ago
ibuler be09db059d Update some bug
8 years ago
ibuler 5a5d5bdd51 [Fixture] 添加更新硬件信息api
8 years ago
ibuler 992af0f1cb [Fixture] 拆分asset view
8 years ago
ibuler ac3553babb [Fixture] 修改asset detail
8 years ago
ibuler 97fb2a4fe6 [Fixture] 修改index页面
8 years ago
ibuler 709552f14c [Fixture] 添加首页
8 years ago
ibuler 135899608e Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
8 years ago
ibuler 61a481f427 [Fixture] 添加用户连接终端
8 years ago
ibuler 4e7b665ea8 [Change] 添加翻译，并添加用户登陆页面
8 years ago
右书僮 b34c5dde40 Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
8 years ago
右书僮 9de2ff2052 修复idc_list删除时重新加载table
8 years ago
ibuler 49f6ed524d Merge with master
8 years ago
ibuler 10eb13920b [Delete] 删除资产tag
8 years ago
右书僮 e0179ea332 删除资产HTML页面中SystemUser相关内容(视图中的相关API暂时未动)
8 years ago
右书僮 c931d3179b 修复资产组更新中 用户己选择的资产项不全问题
8 years ago
右书僮 c5666f1357 fix some files
8 years ago
ibuler b60e5a7ee3 [Change] 修改一些view
8 years ago
ibuler c940a4c0fb [Fixture] 增加 task list 删除按钮
8 years ago
ibuler 3f72ce4b1f [Update] 更新生成fake数据脚本
8 years ago
ibuler 2ae57a7970 [Delete] 删除 system user一些属性
8 years ago
ibuler 610c9c5149 Pull it
8 years ago
ibuler caec9709ef [Fixture] 添加task list 搜索，重试
8 years ago
ibuler 0fbd9843bd [Change] 修改runner, inventory位置
8 years ago
ibuler 915873135e [Fixture] 添加runner run record
8 years ago
ibuler a822f667af [Fixture] 完成用户推送task
8 years ago
xiaokong1937@gmail.com 694899799b trivial changes
8 years ago
ibuler 01e50d592e 完成AdHoc JMSHost JMSInventory
8 years ago
ibuler ab62bfca7e [Bugfix] 修改一些bug
8 years ago
ibuler b055144908 Merge with audits
8 years ago
右书僮 dd5dd9d7e1 fixed html files
8 years ago
Webb 63fd3cfff2 fixed asset_group delete html
8 years ago
Webb a6825ac91e fixed asset_list html and asset_update
8 years ago
Webb 8ee9d02ffc fixed html
8 years ago
ibuler a79c3dd156 [Fixture] 添加command log backends, 未来支持es
8 years ago
xiaokong1937@gmail.com 8a5d0b2d92 remove unused templatetags: users_tags and common_tags
8 years ago
ibuler 0869931e67 [Bugfix] 修改了一些issue上的bug
8 years ago
ibuler 25cb47d2f5 [Change] 拆分user view为多个view
8 years ago
ibuler 87bbb6afde [Bugfix] 修改添加系统用户view
8 years ago
ibuler 8916221bba [Bugfix] 紧急修复url解析失败错误
8 years ago
ibuler 17657deb0e [Bugfix] 和Master分支合并后，修复冲突，DRF 新版本要求 fields和exclude
8 years ago
ibuler 49861b6a84 Merge with master
8 years ago
ibuler 3da33a57e2 [Bugfix] 修改tab -> space, 删除system user的 as default
8 years ago
右书僮 dbdb8a58fe 资产相关API及Web
8 years ago
ibuler 70da177ed7 Update api
8 years ago
ibuler d80fec6e60 Update some api
8 years ago
ibuler 775cd523eb Update app terminal name to applications
8 years ago
ibuler 2707012325 Finish access key auth
8 years ago
ibuler 5b4ce709af Add private token and change user group
8 years ago
ibuler 589b6d7cfe update
8 years ago
ibuler 649509dec1 Change models dir
8 years ago
ibuler a448fd02e2 merged
8 years ago
ibuler 4d71c2d1ff 修改token获取，拆分认证文件和权限文件
8 years ago
ibuler 2ab8e92bf4 Add black line
8 years ago
wangjun5 87eed2e59b add asset tool
8 years ago
ibuler a7476222a9 Update import
8 years ago
ibuler 3aea994101 asset import
8 years ago
ibuler c1c9c7b68a update asset
8 years ago
ibuler 6e843533cb Base finish user
8 years ago
ibuler d8a229c09b to Commpany
8 years ago
ibuler 205c11dfba Finish list paganation
8 years ago
ibuler e89d3b3807 Update asset
8 years ago
ibuler aff37092bf Rename urls
8 years ago
ibuler 5745c8cc4a Finish url namespace change
8 years ago
ibuler a5e487441f prepare change api name
8 years ago
ibuler db8b0022fc Update usergroup detail
8 years ago
ibuler f70abec5ef Finish user detail
8 years ago
ibuler 69f2bf664b Finish user permission revoke
8 years ago
ibuler dde9ffb2ae Update perm api
8 years ago
ibuler 8d7759d22f change user api
8 years ago
ibuler a75e1db970 Add form validate
8 years ago
ibuler 072da114db Finish system user list
8 years ago
ibuler 968b1b4cb6 Stash
8 years ago
ibuler afb923737c Merge with audits
8 years ago
ibuler 2a65e81316 detail page add update
8 years ago
ibuler f437d3f883 update
8 years ago
ibuler 61eadf6891 Modify asset detail
8 years ago
ibuler 05a5e9cc69 Finish some bug
8 years ago
ibuler 34a0a37b63 Add token
8 years ago
ibuler 1159d9494c Update signer
8 years ago
ibuler f1dfba6a93 Update some asset issues
8 years ago
江世峰 6b6fdcd5fd asset:add assets_bulk_update
8 years ago
江世峰 3d4f79ca59 asset:add assets_bulk_update
8 years ago
ibuler 92251f2a45 Merge with master
8 years ago
ibuler 374dfbdac2 Force merge
8 years ago
ibuler 534321d1aa Merge with master
8 years ago
ibuler 688bfa556c Merge with audits
8 years ago
ibuler 5d3f9b4a03 Add command list
8 years ago
江世峰 f88c149076 asset:add assets_bulk
8 years ago
ibuler 6a510dad6c Update some bug
8 years ago
江世峰 cdb1602e06 asset:add assets_bulk
8 years ago
江世峰 80baecc8be Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
8 years ago
江世峰 73f0199dc0 asset:add assets_bulk
8 years ago
ibuler 6b161d5971 Update import
8 years ago
ibuler 45dcb26123 Merge branch 'audits'
8 years ago
江世峰 4e1f9c97a5 asset:update assets_list by tag
8 years ago
ibuler 4531157c72 may be some wrong
8 years ago
ibuler 26a8bce2c3 Change auto_now to auto_now_add
8 years ago
江世峰 abe09e2a85 asset:update assets_list by tag
8 years ago
江世峰 73f5891f87 asset:update assets_list by tag
8 years ago
江世峰 b99b88a30f asset:update tag
8 years ago
江世峰 2829445f4f assets:add tag
8 years ago
江世峰 fd52a85dbb fix #25
8 years ago
江世峰 e83ecb1254 assets_group_forbug
8 years ago
ibuler 7ab47916f2 add __init__.py
8 years ago
ibuler 283c53fddf Update gitignore
8 years ago
ibuler da56310db9 update .gitignore
8 years ago
ibuler 4925f3227a update .gitignore
8 years ago
ibuler 88bb620af2 Modify ignore
8 years ago
ibuler 1f3d763490 Add requirement
8 years ago
江世峰 5bf414ffb5 update add_assets-group
8 years ago
江世峰 d2e989403f update assets-group
8 years ago
ibuler 220892824c Finish some bug
8 years ago
ibuler ce5950ca73 Merge with asset
8 years ago
ibuler 24e31a69cb finish asset
8 years ago
江世峰 98757aa428 update assets_group
8 years ago
ibuler d323c9df88 Modify asset create
8 years ago
ibuler acfe8950b8 MOdify asset create
8 years ago
ibuler 502c7e756b Modify asset
8 years ago
ibuler 7fd224e690 Merge with user-perm
8 years ago
wangyong 343f139904 alter asset add and detail
8 years ago
wangyong b95c1deee1 alter asset add and detail
8 years ago
ibuler ab2eeb0da3 Finish user asset form
8 years ago
ibuler e232962649 Update some template
8 years ago
wangyong 42012d7bfe merge master
8 years ago
wangyong 792908eb35 asset add
8 years ago
ibuler a091036744 Add user permission select
8 years ago
ibuler bb8852d57e Modify some style
8 years ago
ibuler 037d9323a4 Modify and code review
8 years ago
ibuler f253d2ea69 Merge with master
8 years ago
unknown 1005fbabbd add assets manage
8 years ago
unknown 8490583d73 add assets manage
8 years ago
ibuler 5bca783e12 permission user search
8 years ago
ibuler 6d736d7309 Finish permission create and list
8 years ago
ibuler 70cae93a4b Add user perm model and form
8 years ago
ibuler 6069b8946b Start asset extend
8 years ago
ibuler c58725dbc0 Finish system user view
8 years ago
ibuler 292179d41d system-user
8 years ago
ibuler a89ae94d85 Update system user create template script
8 years ago
ibuler 4fc9274e00 Add asset system user
8 years ago
ibuler 5259dd8054 Asset form: Add some comment
8 years ago
ibuler 239dd0567f Finish admin user view
8 years ago
ibuler ff30435eb4 Finish adin user add
8 years ago
ibuler 5a0b119410 Stash it
8 years ago
ibuler 6f4a832389 Add admin user list view
8 years ago
ibuler dfc628a397 modify idc
8 years ago
ibuler 4db352f55b Add idc
8 years ago
ibuler d0ba17374e Finish asset group create
8 years ago
ibuler 30fd51c268 Asset group detail
8 years ago
wangyong bc232c4f77 merge cmdb
8 years ago
wangyong 342e4bdee8 change some html
8 years ago
ibuler 170b49428c change date_added -> date_created
8 years ago
ibuler 25d9dbe93c Merge with cmdb
8 years ago
ibuler 02b5483d81 Update add->create edit->update and assetgrou->asset-grou etc format
8 years ago
ibuler b8c10a0350 Add assetgroup form save action
8 years ago
ibuler 126d7fd62c Add asset group add Form m2m
8 years ago
ibuler 2f5b7ad654 Modify asset model
8 years ago
ibuler 8827fd2d74 Modify translation
8 years ago
ibuler 0604f76f56 Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb
8 years ago
ibuler 4855e86a3f Add asset group view
8 years ago
wangyong 69349368bf cmdb merge model and url
8 years ago
wangyong b531d9eeb2 asset add html
8 years ago
ibuler 3972bd3ff3 Add asset traslation
8 years ago
ibuler d1c96cd4b2 Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb
8 years ago
ibuler 154783a974 Modify some and pull from server
8 years ago
wangyong fa07f4ee8a fix null
8 years ago
wangyong 0e8e88fac0 add admin|sys user model
8 years ago
wangyong 426c3c4062 add asset amdin|sys user model
8 years ago
ibuler 0ab015abfd Asset add traslation
8 years ago
ibuler 11d06b5e2b Add asset group view and url
8 years ago
wangyong d96ac56460 merge master
8 years ago
wangyong 77f3a1f146 add asset add
8 years ago
lijiejie cec5a7f2c6 create the restframework url
8 years ago
lijiejie 829df26b0f create the api
8 years ago
ibuler ffed46175d update .gitignore
8 years ago
wangyong d0d433db1a add asset_list
8 years ago
wangyong 3771b2ff70 add asset detail and list
8 years ago
wangyong fcd39370ed add asset some cbv
8 years ago
ibuler 234684c875 Rename dir name dashboard to apps
8 years ago