Commit Graph

4851 Commits (4591b03e170a2393bb607dff448dd3f1afe7e341)

Author SHA1 Message Date
Aaron3S da911651aa feat: celery task api
2 years ago
feng 4ab14b4a59 perf: migrat
2 years ago
feng 2355d1af83 perf: gather accounts
2 years ago
ibuler 097ebc2362 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler c0540e6787 pref: 修改 celery
2 years ago
Jiangjie.Bai bb01a60fc1 refactor: 修改 authentication models 目录
2 years ago
Jiangjie.Bai e4d372be32 fix: 修改默认组织 builtin 字段处理问题
2 years ago
ibuler 28f4905a81 pref: 修改 applet host
2 years ago
Jiangjie.Bai 5d37d1b7b1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Jiangjie.Bai a260da6cec refactor: 修改 ConnectionToken 关联的逻辑(1)
2 years ago
ibuler 1239247b5a pref: 修改删掉 connection token type
2 years ago
ibuler 8f88b898d0 pref: 修改 migrations
2 years ago
ibuler 651228795e pref: 修改 migrations
2 years ago
ibuler c55f068258 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 99e4836311 pref: 添加 deploy playbook
2 years ago
Aaron3S 3977b81ea1 Merge remote-tracking branch 'origin/v3' into v3
2 years ago
Jiangjie.Bai bd001bb262 refactor: 修改 ConnectionToken 表结构
2 years ago
Jiangjie.Bai fb6f51b9cb merge: dev
2 years ago
Jiangjie.Bai 13279c9d2a refactor: 修改 ConnectionToken 表结构
2 years ago
Aaron3S 77436724b4 Merge remote-tracking branch 'origin/v3' into v3
2 years ago
ibuler e327c97170 pref: 修改迁移文件
2 years ago
Aaron3S c10d7f554e Merge remote-tracking branch 'origin/v3' into v3
2 years ago
Aaron3S e7a114a31d feat: celery 任务api
2 years ago
ibuler c018055d5f pref: 修改migrations
2 years ago
ibuler 350c9e4a80 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 82aca6b843 pref: 修改 applet
2 years ago
Jiangjie.Bai 11eb505c78 refactor: 修改 ConnectionToken 表结构
2 years ago
Jiangjie.Bai 901270e6ad Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Jiangjie.Bai 6ed946541d merge: local
2 years ago
feng 4dd4c29e12 perf: gather facts
2 years ago
Aaron3S 2509b801c6 Merge remote-tracking branch 'origin/v3' into v3
2 years ago
feng a445e47f3d perf: account add platform_id
2 years ago
feng d95ced5109 fix: 修复change account perm 问题
2 years ago
ibuler 8fd6cabcab Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 5606082ca3 pref: 添加 applet 创建 api
2 years ago
feng f743dea1fd perf: mysql postgresql
2 years ago
Aaron3S 64e03a4412 feat: 增加异步任务api
2 years ago
ibuler 1372d6322d perf: 合并代码
2 years ago
ibuler 943b130035 feat: 添加远程应用
2 years ago
feng 64daacce63 fix: 修复自动化修改密码bug
2 years ago
feng 091bffa626 perf: automation change secret linux
2 years ago
ibuler 3e7004d784 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler c6dfc06003 perf: 修改翻译
2 years ago
feng 7255cf68a9 perf: automation change secret linux
2 years ago
ibuler 168de45da5 pref: 优化 device api
2 years ago
ibuler a450ceee91 pref: 修改 migrations 名称
2 years ago
ibuler ef04e6ffcc Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler c55d3c0b6c perf: 添加 histories
2 years ago
feng 26278cc9e0 perf: change secret automation
2 years ago
ibuler 1a2193d091 perf: 资产 api 返回特有属性
2 years ago
ibuler eb16e3c7cb perf: 修改翻译
2 years ago
ibuler 076afb2b8b pref: 修改 automations
2 years ago
ibuler d6e36c873d pref: 修改 filter
2 years ago
ibuler 8c92a9934b Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 9b44ed55c2 pref: 修改 secret encrypt
2 years ago
Jiangjie.Bai 152749c872 refactor: 重构资产授权工具、资产授权账号工具类;删除Model中的处理逻辑;增加用户组、资产授权账号的获取方式
2 years ago
Jiangjie.Bai 2c04ad6465 refactor: 重构资产授权工具、资产授权账号工具类
2 years ago
Jiangjie.Bai c41e0148d9 refactor: 重构资产授权工具、资产授权账号工具类
2 years ago
feng 1b795791de fix: swagger 500
2 years ago
feng 4f16c1f92c fix: account init 500
2 years ago
ibuler 6a33129349 pref: 完成收集资产信息任务
2 years ago
ibuler 4e8e4e4bb7 pref: 修改添加 gather facts
2 years ago
ibuler 10c0cc7abf Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 75ec9d4173 perf: 添加 gather facts automation
2 years ago
Jiangjie.Bai 6a32ac4699 refactor: 继续授权添加授权账号工具
2 years ago
Jiangjie.Bai c79c3f8aec Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Jiangjie.Bai 0e67739173 refactor: 授权添加授权账号工具,实现获取授权用户某个资产账号的功能
2 years ago
ibuler 37d845390b Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 4e2aebde6c perf: 修改改密
2 years ago
Jiangjie.Bai 2d893c4a6a refactor: 获取授权规则授权的所有账号对象
2 years ago
ibuler f2f75add8e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 0a65b9de8e perf: 重构 playbook base runner
2 years ago
Jiangjie.Bai 0f8668fee9 refactor: 删除资产授权Model中不使用的方法
2 years ago
Jiangjie.Bai d52baf0af5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Jiangjie.Bai b74ec48393 refacotr: 拆分授权模块的目录结构
2 years ago
ibuler 52fb55e806 pref: 修改改密
2 years ago
ibuler 8c91cd7eb6 perf: 修改改密
2 years ago
ibuler 85a6f29a0a perf: 修改 playbook 任务执行
2 years ago
feng626 22e211625e fix: platform 500
2 years ago
ibuler 21816e3a39 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 9198c93fcf perf: 修改 ansible change password
2 years ago
feng626 6e0d211645 perf: automation migrate
2 years ago
ibuler 1d757ec19a pref: 修改改密
2 years ago
ibuler 9a0bae5bfd perf: 修改 ansible 执行
2 years ago
ibuler 4e5a7a0a25 perf: 修改改密
2 years ago
ibuler f921f12171 perf: 修改 adhoc
2 years ago
ibuler a543a2ee37 perf: 基本完成 adhoc runner
2 years ago
ibuler 0fb4b52232 perf: 修改 ansible 表结构
2 years ago
ibuler df5e63b3be perf: 修改 ansible 逻辑
2 years ago
ibuler 41589c5305 perf: 修改 ansible
2 years ago
Jiangjie.Bai cd847c483a Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Jiangjie.Bai 145814f1e8 perf: 统一后台定时任务的crontab表达式, 对于后台定时执行的任务更加清晰
2 years ago
feng626 e330776ab1 fix: ticket nothing comment bug
2 years ago
feng626 cd98ec4cac perf: account history record only secret
2 years ago
Jiangjie.Bai 237e7b22fb feat: 优化账号actions设置逻辑
2 years ago
Jiangjie.Bai 881c0a6042 feat: 修复获取用户授权的资产账号列表
2 years ago
Jiangjie.Bai 79a21bbc08 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Jiangjie.Bai 14f48c459c feat: 授权规则创建
2 years ago
feng626 b2991362f1 perf: 查看用户授权
2 years ago
Jiangjie.Bai 76747642c4 feat: 删除授权模块中关于系统用户的API
2 years ago
Jiangjie.Bai fd0ce0d1c6 feat: 添加一些注释信息
2 years ago
Jiangjie.Bai ba3af280d5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Jiangjie.Bai 4a1aeefb82 feat: 完成用户、用户组对于授权账号的API获取
2 years ago
feng626 ec0c334acc perf: account search
2 years ago
feng626 da35e931a2 perf: 更新平台username passwd submit selector可为空
2 years ago
Jiangjie.Bai 15c8c035aa Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Jiangjie.Bai 351d3b297d fix: 修复用户授权资产账号API及Model处理逻辑
2 years ago
ibuler 2a9613d90a perf: 修改 asset serializer
2 years ago
ibuler 72b0fb4274 perf: 修改 platform 支持设置 ansible
2 years ago
ibuler 00e1dd6996 fix: remote gateway filter address
2 years ago
ibuler 6ed3b51928 perf: 优化 serailizer 统一到 drf 目录中
2 years ago
ibuler f223cf43cc Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 234acd6317 perf: 修改 accounts
2 years ago
Jiangjie.Bai 399c6285f8 feat: 获取 用户、资产授权的所有账号API, 返回@INPUT、@USER等内部账号
2 years ago
Jiangjie.Bai 65b942ffa4 feat: 修改 Permission filter 方法名
2 years ago
ibuler 286d0e4ac1 perf: 修改 migrations
2 years ago
ibuler 3a884388cd perf: 修改名称
2 years ago
ibuler 8f31a25fda perf: 优化迁移文件
2 years ago
ibuler a35e0c5efa perf: 创建内置 platforms
2 years ago
ibuler 68ed3ac1a8 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler cc859f302a perf: 优化 asset migrations
2 years ago
feng626 33948d614b perf: ip -> address
2 years ago
ibuler 21a60bf55e perf: change cateogory data strucature
2 years ago
ibuler ea1cb158b5 perf: add charset control
2 years ago
feng626 ffdb3f3b83 perf: ticket
2 years ago
ibuler 584ce0afe3 perf: 修改迁移文件
2 years ago
ibuler 1b0195cb82 perf: 修改 asset 结构
2 years ago
ibuler cf5c50b343 perf: 优化平台协议
2 years ago
ibuler 79ce1215f5 merge: with remote branch
2 years ago
ibuler d0999dd1ef perf: 优化平台创建约束
2 years ago
feng626 615f36c6f6 perf: 收集账号
2 years ago
ibuler 8c72bab82d perf: 优化 account 结构
2 years ago
ibuler 9e84989bbe merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 5d48d1ab15 perf: stash it
2 years ago
feng626 7b4c2ce97e perf: xpack problem
2 years ago
feng626 108ccf5a8b perf: 账号管理api
2 years ago
ibuler 762d84b5c3 merge: with remote
2 years ago
ibuler fa28bfc659 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler b50d28ff9c perf: 暂存修改
2 years ago
ibuler 65331e13ac pref: 优化平台
2 years ago
feng626 389094f615 perf: 账号备份
2 years ago
ibuler a86d5c1456 perf: 修改 models
2 years ago
ibuler 1d1b252e58 perf: 解决冲突
2 years ago
ibuler 9b2acfe4a4 perf: 优化平台
2 years ago
feng626 a4d0ef3706 perf: verify ansible linux
2 years ago
feng626 139540fafe perf: 修改change password linux ansible yaml
2 years ago
ibuler e0e14a2fe1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 9edd786bb4 perf: 修改 platform 表结构
2 years ago
Jiangjie.Bai 572f03d844 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Jiangjie.Bai d23446016d refactor: 添加授权相关的获取资产账号API、Model method
2 years ago
ibuler 37bbf75f66 perf: 修改数据库迁移文件
2 years ago
ibuler ae189ebdfe perf: 修改 account serializer
2 years ago
ibuler 4fcbdfa3f4 perf: 优化 account 添加 name
2 years ago
ibuler c1ad072736 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Jiangjie.Bai a2c006f01b perf: 整理用户授权资产的API
2 years ago
Jiangjie.Bai 4a21f86cd1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 9a734e7069 perf: 修改结构
2 years ago
ibuler 3e794ec41a perf: 修改 serializer
2 years ago
ibuler 6bf7f7cb48 perf: 修改 migrations
2 years ago
ibuler 910eaf1228 perf: 修改 web 表结构
2 years ago
ibuler f6fdc258b1 perf: 修改 playbook 目录结构
2 years ago
ibuler 894f153638 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler aed7b32d6c perf: 修改 assets api
2 years ago
Jiangjie.Bai 6f71989553 perf: 下一步整理授权模块所有 API 的继承关系
2 years ago
Jiangjie.Bai da772b572a fix: 授权 API 顺序整理
2 years ago
ibuler 25bded69ab perf: 修改平台和资产
2 years ago
Jiangjie.Bai ca6b8ee960 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 706488d293 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 50cf40eaeb perf: 完美解决 accounts 创建
2 years ago
ibuler e9bb5223eb perf: 修改 platforms
2 years ago
feng626 b910180a12 自动化策略 表
2 years ago
Jiangjie.Bai 746c6e4242 fix: 修改资产、授权创建时的小问题
2 years ago
Jiangjie.Bai f633a50f8e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
Jiangjie.Bai a27aeca2fd refactor: 修改授权相关Model,Serializer,API结构
2 years ago
ibuler 56abf0da23 pref: 修改平台协议配置
2 years ago
ibuler 585ce6b46a perf: 修改表结构
2 years ago
ibuler 984b8dfb28 perf: 修改 m2m 日志记录
2 years ago
ibuler deba0c9057 feat: 支持 py3.9
2 years ago
ibuler 0011823789 perf: 去掉 pymysql, mysqlclie已支持 m1
2 years ago
ibuler d9663036f8 perf: revert csrf token project
2 years ago
ibuler 305e9bd0ea Merge branch 'v3' of github.com:jumpserver/jumpserver into v3
2 years ago
ibuler 2354650b82 perf: 暂时去掉 csrf token
2 years ago
feng626 757e688ab3 账号备份优化
2 years ago
ibuler 7ae395f7e8 perf: 修改 metadata
2 years ago
ibuler 81219e1e7c pref: 添加各种 field
2 years ago
ibuler d7d9fe2718 perf: 修改 model
2 years ago
ibuler 4947b0d8fd Merge remote-tracking branch 'origin/v3' into v3
2 years ago
feng626 94f898b55d login asset acl
2 years ago
ibuler 2ede152663 Merge remote-tracking branch 'origin/v3' into v3
2 years ago
feng626 60eb385c1e 账号过滤
2 years ago
ibuler 728dc43b6c perf: 修改 fields 支持 display choices
2 years ago
ibuler ffd08eef74 Merge remote-tracking branch 'origin/v3' into v3
2 years ago
feng626 d5c13df6be 补全资产api
2 years ago
ibuler 8020881e22 Merge remote-tracking branch 'origin/v3' into v3
2 years ago
Jiangjie.Bai f81805f361 fix: 删除perms application多余文件
2 years ago
ibuler 9e7435f1c0 perf: 解决冲突
2 years ago
ibuler 5c73cb9b4e perf: 修改 v3
2 years ago
feng626 62f8fac392 修复迁移文件
2 years ago
ibuler b16e8ef1a5 Merge remote-tracking branch 'origin/v3' into v3
2 years ago
feng626 28541c48f7 修复迁移文件
2 years ago