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

737 Commits (cad07434ffbb0e92c6b9e9d91475cd1ac4312c4a)

Author SHA1 Message Date
ibuler f3a50610af [Update] update docker-compose
8 years ago
ibuler 4141ae517f update docker-compose
8 years ago
ibuler 29095a869c [Demo] update demo mode code
8 years ago
ibuler cda22a6f0d add demo mode middleware
8 years ago
Caijun 8f4d8b1c02 Compile messages (#495)
8 years ago
Caijun b502b06e82 Support i18n for asset `platform` field (#494)
8 years ago
njqaaa 9b14244363 fix id_dsa check error (#458)
8 years ago
bdlzhx b680a42425 change sign_t return from bytes to str. (#480)
8 years ago
Caijun cf07a6ebb7 Fix judging request.user valid on UserToken API (#476)
8 years ago
njqaaa dd6c82b168 fix left's users logout (#446)
8 years ago
crisewng 18169251fa [Bugfix] 修复管理用户上传私钥兼容问题 (#451)
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
ibuler 31025b8c52 [bugfix] 修复重置密码bug
8 years ago
ibuler 25f3d5bf02 [Bugfix] 修复翻译一处bug
8 years ago
ibuler edc631ad60 [Docker] 添加Docker compose
8 years ago
GuangHongwei ff374b7141 [Docker] Build a docker
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 b913bce398 [Bugfix] 修改翻译bug
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 66a2262ee9 [Fixture] 增加 asset groups assets api
8 years ago
ibuler 067426d5e0 [Fixture] 完成用户向导页
8 years ago
ibuler 135899608e Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
8 years ago
ibuler 7720e9f3fd [Change] 修改图片
8 years ago
ibuler 61a481f427 [Fixture] 添加用户连接终端
8 years ago
ibuler 3fa5ce5404 [Fixture] 添加用户信息更改
8 years ago
ibuler 0983f294b7 [Fixture] 添加用户profile
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 a4ad9b49b9 Merge branch 'audits'
8 years ago
ibuler 90055f7680 [Bugfix] 添加翻译
8 years ago
ibuler 49f6ed524d Merge with master
8 years ago
ibuler 1f9dbb6bdc [Change] 修复验证码模糊度
8 years ago
ibuler 10eb13920b [Delete] 删除资产tag
8 years ago
ibuler a57dac0706 [Fixture] 拆分proxy log 为在线和离线
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 a4504dc0c7 [Change] 拆分tasks
8 years ago
ibuler 0fbd9843bd [Change] 修改runner, inventory位置
8 years ago
ibuler 240c7db416 [Fixture] 添加 rerun function
8 years ago
ibuler 915873135e [Fixture] 添加runner run record
8 years ago
ibuler a822f667af [Fixture] 完成用户推送task
8 years ago
ibuler c234b5b2d5 Update AdHocRunner
8 years ago
xiaokong1937@gmail.com 694899799b trivial changes
8 years ago
ibuler eb5a9dd20f Remote ansible_api file
8 years ago
ibuler 6015f2423b [Fixture] 添加PlaybookRunner
8 years ago
ibuler 01e50d592e 完成AdHoc JMSHost JMSInventory
8 years ago
ibuler ab62bfca7e [Bugfix] 修改一些bug
8 years ago
ibuler 9c2c38c74a [Bugfix] 修复导入自定义过滤器问题
8 years ago
ibuler 695dc96ce8 Merge branch 'audits'
8 years ago
ibuler 9518672ad2 Add
8 years ago
ibuler b055144908 Merge with audits
8 years ago
ibuler 7825c107ab [Bugfix] model FieldError
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 008be6a8e3 [Fixtrue] 完成terminal detail 和批量结束会话
8 years ago
ibuler 1f544b98ab [Stash] 删除结束会话之前
8 years ago
ibuler 42e4c64d06 [Bugfix] 修复一些bug
8 years ago
xiaokong1937@gmail.com 548d7ef99a fix #13;fix `user` context conflict problem in user-detail page
8 years ago
ibuler 9c7bd7d285 [Fixture] 添加record log
8 years ago
ibuler a79c3dd156 [Fixture] 添加command log backends, 未来支持es
8 years ago
xiaokong1937@gmail.com fe01f92545 user profile: update ssh pk
8 years ago
xiaokong1937@gmail.com 8a5d0b2d92 remove unused templatetags: users_tags and common_tags
8 years ago
xiaokong1937@gmail.com f3647ea46d user-profile page
8 years ago
xiaokong1937@gmail.com 31bded8953 CAPTCHA_TEST_MODE settings and small fix
8 years ago
ibuler 0869931e67 [Bugfix] 修改了一些issue上的bug
8 years ago
ibuler df94d11f53 [Fix] 修改一些api bug
8 years ago
ibuler ffed28c9c7 [Change] 修改perm的代码， 强制79个字符内
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 8658675f67 [Bugfix] 重命名applications导致api请求content_type不对
8 years ago
ibuler be3f94d86c [BugFix] 修改requirements添加新的库
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
ibuler 9c6c6d6b4c [Feature] 添加Dockerfile
8 years ago
右书僮 dbdb8a58fe 资产相关API及Web
8 years ago
ibuler b670259ab6 Modify terminal reqject templatte
8 years ago
ibuler 0907f5021e Finish form ajax submmit
8 years ago
ibuler 301e02bcd8 Update some api
8 years ago
ibuler 70da177ed7 Update api
8 years ago
ibuler 92d854b971 Update api
8 years ago
ibuler d80fec6e60 Update some api
8 years ago
ibuler d56f030dc4 Finish terminal accept
8 years ago
ibuler 775cd523eb Update app terminal name to applications
8 years ago
ibuler a8fa4d2f0c update terminal regist
8 years ago
ibuler 2707012325 Finish access key auth
8 years ago
ibuler c5ab49c515 Finish access key auth
8 years ago
ibuler fe17bec752 Add access key auth
8 years ago
ibuler 5b4ce709af Add private token and change user group
8 years ago
ibuler 875aaa0029 update user model for create application user
8 years ago
ibuler 589b6d7cfe update
8 years ago
ibuler 649509dec1 Change models dir
8 years ago
ibuler 4d96978b4f Merge branch 'master' into audits
8 years ago
ibuler 81ec121918 Merge branch 'master' of code.jumpserver.org:jumpserver/jumpserver
8 years ago
ibuler a448fd02e2 merged
8 years ago
ibuler 96d32f2e3e prepare merge ops
8 years ago
ibuler 4d71c2d1ff 修改token获取，拆分认证文件和权限文件
8 years ago
yumaojun03 046c7e21e9 Merge remote-tracking branch 'origin/master' into ops_dev
8 years ago
yumaojun03 47d87e38a6 补充task需要的一些接口
8 years ago
ibuler 2ab8e92bf4 Add black line
8 years ago
yumaojun03 150e1030c3 ansible Task接口更上层抽象的基本实现
8 years ago
yumaojun03 86c5f0d3d3 完成cron和sudo的list和detail基础，ansible Task接口更上层抽象中
8 years ago
ibuler d964221689 Update api
8 years ago
wangjun5 87eed2e59b add asset tool
8 years ago
yumaojun03 b348f7f1ce 添加了部分cron的list页面
8 years ago
yumaojun03 a0c9e3d117 添加了部分sudo的页面
8 years ago
yumaojun03 3eb8a702c8 为模型生成fake数据
8 years ago
yumaojun03 806d38bbb2 模拟数据测试
8 years ago
yumaojun03 84613e51d8 为了防止循环导入，采用__all__导出模块变量
8 years ago
ibuler 69767e978d Add fake
8 years ago
yumaojun03 baba65ad43 修改url模块, 匹配整体架构风格.
8 years ago
yumaojun03 d0460d8691 修改url模块, 匹配整体架构风格.
8 years ago
ibuler a7476222a9 Update import
8 years ago
Administrator 61ac9129b0 url少加了下划线
8 years ago
ibuler 3aea994101 asset import
8 years ago
Administrator 8e0afb2cc4 调整模型
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
Administrator 2494fa5846 修改url
8 years ago
Administrator 984391e2b2 同步Master分支上的代码, 解决部分冲突问题
8 years ago
ibuler 72ad4b44ce update bug
8 years ago
Administrator 1bc88e5b11 Merge branch 'ansible_api' into ops_dev
8 years ago
Administrator c289d6a4c5 Merge branch 'ansible_api' into ops_dev
8 years ago
Administrator 7c4aefd959 兼容py3测试
8 years ago
ibuler c1a74aebc5 [BugFix] update some user import bug
8 years ago
ibuler eae580e51f Update user import and export
8 years ago
ibuler e28f7a3bec Add export and import
8 years ago
ibuler be99eb82e8 udpate some bug
8 years ago
ibuler 5af97c969b export csv
8 years ago
ibuler 7dfde3a3c5 Update
8 years ago
Administrator cd22c39078 [future] 将Task移到一个包内管理
8 years ago
Administrator 32a5aec34e [future] 调整app架构
8 years ago
Administrator fea76178ee 添加作业中心i18n
8 years ago
Administrator 3abe2196dd [future] 添加作业中心 i18n相关
8 years ago
Administrator 18e0fee1a7 [future] 添加作业中心基础框架
8 years ago
Administrator 954814da65 [future] 添加Cron相关的基础API框架
8 years ago
ibuler 180af7e0bd Update csv
8 years ago
Administrator 79971d677d [future] 使用mixin去掉重复多余代码
8 years ago
Administrator 1e835d2fa9 [future] 增加503和501的自定义异常
8 years ago
Administrator 76f72dfb58 [future] 添加路由, 增加api认证, 测试所有添加的api
8 years ago
Administrator 5ae2711c6e sudo privilege删除走api
8 years ago
Administrator 39ae4a3a10 [future] url 调整
8 years ago
Administrator 961ecb3ee8 [future] 添加sudo相关的api方法
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
Administrator c588436d55 初始化模板和api模块
8 years ago
Administrator 82412831d5 initial sudo views
8 years ago
ibuler aa08f0aa48 Merge branch 'audits' of code.jumpserver.org:Jumpserver/jumpserver into audits
8 years ago
ibuler 32d12b7f78 Update user group asset permission
8 years ago
ibuler 3b30eb3278 Weiteng
8 years ago
ibuler 99c36f2a2c Fix bug
8 years ago
ibuler db8b0022fc Update usergroup detail
8 years ago
ibuler bd882c8bef User group detail
8 years ago
ibuler 8d358a7a68 UPdate some
8 years ago
ibuler 419876b575 Update heatbeat
8 years ago
ibuler 2635217421 Update celery
8 years ago
ibuler c6fc3dfe91 Update terminal interval
8 years ago
ibuler 10aa8c40a7 Add login log
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 47090eb0f7 update some user api
8 years ago
ibuler c5d625e261 Merge branch 'audits' of code.jumpserver.org:Jumpserver/jumpserver into audits
8 years ago
ibuler 8d7759d22f change user api
8 years ago
ibuler 0d4d64c274 Update api
8 years ago
ibuler ea3f8af161 Fix pubkey auth bug
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 79c8f2275c Update perm api
8 years ago
Administrator d9278c2c24 [future] 添加sudo相关的表，以及实现生成sudo内容的方法
8 years ago
ibuler 5b0f897118 Update proxy log and command log view
8 years ago
ibuler 41337d28c3 add proxy log search
8 years ago
ibuler 1d29c52a43 Update datatable
8 years ago
ibuler 53e97dac40 stash it
8 years ago
Administrator 8716d9c725 [future] 添加用于记录sudo相关的表
8 years ago
ibuler 2a65e81316 detail page add update
8 years ago
ibuler f437d3f883 update
8 years ago
Administrator 1fd0f8fdde [future] 添加sudo的配置模板
8 years ago
ibuler 61eadf6891 Modify asset detail
8 years ago
ibuler 3448f3eb0a Modify init data
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
Administrator 92f396761c [future] 完成获取硬件和链接测试的第一版v1
8 years ago
ibuler f1dfba6a93 Update some asset issues
8 years ago
ibuler 315af35296 Finish token access api
8 years ago
Administrator 97b8bcd5ca [future]
8 years ago
江世峰 6b6fdcd5fd asset:add assets_bulk_update
8 years ago
江世峰 3d4f79ca59 asset:add assets_bulk_update
8 years ago
Administrator ccf3851d81 [future] 初步添加测试链接的接口
8 years ago
Administrator 97d7e6cb9b [future] 修改celery 使用eventlet 作为concurrent pool, 添加获取资产硬件信息的 初步接口
8 years ago
Administrator fd945513ac [fix] 修改模型的显示, 因为字段默认会加上Class的Name
8 years ago
ibuler 92251f2a45 Merge with master
8 years ago
Administrator 51c530c123 [future] ansible运行结果存入数据库
8 years ago
Administrator 96bc1cd8f1 [future]ansible运行结果存入数据库中...
8 years ago
ibuler 374dfbdac2 Force merge
8 years ago
ibuler 534321d1aa Merge with master
8 years ago
ibuler 69c6f81c31 Add fake to
8 years ago
ibuler 9e3d740b43 Add fake to
8 years ago
ibuler 5cdc80ec11 Add init data
8 years ago
ibuler 217586b536 Add fake
8 years ago
ibuler 2abec15691 Rm ws4redis
8 years ago
ibuler 688bfa556c Merge with audits
8 years ago
ibuler 589d0d0fac Finish command log list
8 years ago
ibuler 3c00c578c3 Update some vie
8 years ago
Administrator eb5f0fcf68 [future] 在主机层面支持多种sudo, 以及回调结果的分类
8 years ago
ibuler c0de35a683 Add layer and layer open command log
8 years ago
ibuler d19b47a427 add command log modal
8 years ago
ibuler 573b3a8743 Update log_command modal
8 years ago
ibuler 5d3f9b4a03 Add command list
8 years ago
ibuler c2aab50c7b Add proxy log list
8 years ago
Administrator 13f34a8bdd ops: [future]完成ansible2.0 API 的基本封装.
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