Commit Graph

1074 Commits (7a7c6d40dffdf8ce82c59e1e92af3114a365a523)

Author SHA1 Message Date
ibuler 84634eb8c0 [Update] 修改Permr认证
7 years ago
ibuler a4ff2181c5 [Update] 修改用户view的api
7 years ago
ibuler fffa0def9e [Update] 修改api和view
7 years ago
ibuler d0ede246e7 [Update] 修改授权
7 years ago
BaiJiangJie b8b78ffeb2
Merge pull request #1162 from BaiJiangJie/dev
7 years ago
ibuler cb8e59edf2 [Update] 修改文案
7 years ago
ibuler 1c0d783eec [update] 添加Migrations
7 years ago
ibuler 4fa72400be Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 37c0062fae [Update] 添加审计模块
7 years ago
BaiJiangjie 8504c3d2fd 修复资产列表导出问题
7 years ago
ibuler 1d7ba3e204 [Bugfix] 修复小bug
7 years ago
ibuler d966e22cf9 [Update] 修改小bug
7 years ago
ibuler 6a88fd2d60 [Update] 修改api权限
7 years ago
BaiJiangjie b63999f385 创建用户发送邮件
7 years ago
ibuler aa8bece724 Merge branch 'ansible' into dev
7 years ago
ibuler 168335a381 [Update] 更新内容
7 years ago
ibuler 121726b731 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 0b812a03c6 [Bugfix] 修复 ApiUpdateAttr的bug
7 years ago
ibuler 79ae6efafb [Bugfix] 修复没有Log path引起的bug
7 years ago
BaiJiangjie 5b65ed8a19 修复导入资产列表IP字段前后有空格问题,导入资产列表时doamin保存为对象
7 years ago
ibuler 951ac252fe [Merge] 更新ansible功能
7 years ago
ibuler 24c4e1df50 [Update] 资产,系统用户,管理用户等支持查看日志
7 years ago
ibuler d247e49b70 [Update] 修改celery位置
7 years ago
ibuler a4c843ff13 [Update] 迁移celery到ops
7 years ago
BaiJiangjie ec6103448e 使终端管理的应用用户不显示在用户组里
7 years ago
ibuler df80e8047a [Update] 修改日志
7 years ago
ibuler 09fc2776df [Update] Support history view
7 years ago
ibuler d32f070b5c [Update] 修改Inverntoy,增加更多属性
7 years ago
ibuler b959f1f68b Merge branch 'bugfix_ip_lookup' into dev
7 years ago
ibuler e1cab35db0 [Bugfix] 修改获取城市
7 years ago
ibuler 8014cc48b6 [Update] 修改settings和缩进
7 years ago
ibuler 829f57e2d7 [Bugfix] 修复小bug
7 years ago
ibuler 5f0b4a4b63 [Update] 修改一些翻译
7 years ago
ibuler c5af4d47eb Merge branch 'some_auth_api' into dev
7 years ago
ibuler c37bfb682a [Update] 添加设置认证api和创建用户时可以不选择组
7 years ago
ibuler 3aaea6cc31 Merge branch 'bugfix_useradd' into dev
7 years ago
ibuler f85e5b6f75 [Bugfix] 修改添加用户的bug
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 759760e7d9 [Update] 服务器可以生成用户密钥
7 years ago
ibuler 2fc9c04228 [Bugfix] 修复更新系统用户后关联节点丢失的问题
7 years ago
ibuler d8e614c54d [Update] 管理脚本
7 years ago
ibuler f195b309d4 [Bugfix] 全选后编辑checkbox问题
7 years ago
ibuler a58db9826e [Update] 升级版本号
7 years ago
ibuler 15427fb743 [Update] 还原ldap配置
7 years ago
ibuler 7874a1539c [Update] 修改配置,默认先从数据库认证
7 years ago
ibuler 7e087ad5c6 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 93895b6b92 [Update] 修改一些文案说明和翻译
7 years ago
q4speed 4d7fbcc49b 修复文字过长bug
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 faf6a7b623 [Update] 删掉token api调用次数限制
7 years ago
ibuler 8e4ab9f3a9 [Update] 支持获取token的用户
7 years ago
ibuler e4823a21e3 [Update] 优化部分代码
7 years ago
ibuler 634af19945 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
7 years ago
liuzheng712 b2ae0e8f44
fix: download update
7 years ago
ibuler 4a3e5e9b22 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
7 years ago
ibuler 43b4b7c55e [Feature] 资产节点增加批量测试可连接性和更新硬件信息
7 years ago
liuzheng b92ccdd05e
fix: update the jms-storage==0.0.11
7 years ago
ibuler f59f03adfd [Update] 支持使用环境变量关闭定时任务
7 years ago
ibuler fe03011177 [Update] 不允许添加应用程序类型的用户
7 years ago
ibuler 9ffb079c8f [Update] 增加修改system user auth 的api
7 years ago
liuzheng712 9162f4a226
revert: add the old apps/users/migrations/0002_auto_20171225_1157.py
7 years ago
ibuler 51e15b583f Merge remote-tracking branch 'origin/dev' into dev
7 years ago
ibuler f2251bbb32 [Update] index
7 years ago
liuzheng712 3c6c05f83e
fix: update
7 years ago
liuzheng712 51d7e51119
fix: AttributeError: 'SessionReplayViewSet' object has no attribute 'ACCESS_KEY'
7 years ago
liuzheng712 3c32048aa8
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
7 years ago
liuzheng712 166a3fff5c
fix(config = settings.TERMINAL_REPLAY_STORAGE.items()):
7 years ago
ibuler 476a00d270 Merge branch 'docs' into dev
7 years ago
ibuler 88c10e851b [Update] 修改推送任务
7 years ago
ibuler 2def25cae6 [Update] 修改文档地址
7 years ago
ibuler d3fa3d63e7 [Update] 修改Model
7 years ago
ibuler 5cc43f6907 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler d852f0182b [Update] 修改bug
7 years ago
liuzheng712 9aed73d644
feat: update
7 years ago
liuzheng712 d1a2fe145d
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
7 years ago
liuzheng712 83f83d9b07
feat: s3 replay file get
7 years ago
ibuler 40d2934de0 [Bugfix] 修复首页无法显示数据的bug
7 years ago
ibuler cd9000e7e9 [Update] 修改Node value唯一
7 years ago
ibuler af2db2d870 [Update] 增加批量终端session api
7 years ago
ibuler 0aa4755565 [Update] 修改链接
7 years ago
fit2cloud-fengyi 115c7c4d50 add ignore
7 years ago
fit2cloud-fengyi 094e862abf fix bug
7 years ago
fit2cloud-fengyi 8e09151a02 Merge branch 'docs' of https://github.com/jumpserver/jumpserver into docs
7 years ago
fit2cloud-fengyi 18841d6c21 add ignore
7 years ago
ibuler d3e77b09ef [Merge] with doc
7 years ago
ibuler 25ebb5c442 [Update] 修改一些bug
7 years ago
ibuler 86c0a2d28b [Update] 修改部分翻译和文档
7 years ago
ibuler bc230e0ea5 [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 5dcdeddf22 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 1018deda96 [Update] 支持拖拽更新
7 years ago
ibuler 5a0068d86a [Update] 修改文案
7 years ago
ibuler 31629fc975 [Bugfix] 修复资产禁用还可以登录
7 years ago
ibuler 521a5c57a2 [Update] 统一copyright
7 years ago
ibuler 1e5b9fb3ef [Update] terminal可以更改名称
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 8e2891d7d7 [Update] 修改文案
7 years ago
ibuler 315159e4b6 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
7 years ago
liuzheng712 fc61dea9b5
fix: app get replay storage
7 years ago
ibuler 08ccac3f66 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
7 years ago
liuzheng712 ea27d05c58
feat: update app setting
7 years ago
q4speed 05255f850f Merge remote-tracking branch 'origin/dev' into dev
7 years ago
q4speed c96a107e0a 对齐菜单文字。修改英文
7 years ago
ibuler e2cb128794 [Update] 修改翻译
7 years ago
ibuler 24fdff0120 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 8999458a72 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
7 years ago
q4speed 66b8e8bcf8 增加隐藏树功能
7 years ago
liuzheng 459d0668a8
feat: replay setting page and api
7 years ago
ibuler c68da5898a [Update] 修改初始
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 274cb74097 [Update] 修改授权
7 years ago
ibuler 2d3967872b [Feature] 完成资产授权和资产添加
7 years ago
ibuler 653c328e84 [Abandon] ...
7 years ago
ibuler 2bc5e882fd [Update] 更改授权规则前commit
7 years ago
ibuler 45f6a62989 [Update] 修改一处翻译
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 0f15a94b08 Merge remote-tracking branch 'origin/dev' into dev
7 years ago
ibuler 012614562f [Update] 修改小bug
7 years ago
ibuler 8b626ea9d4 [Update] 修改部分翻译
7 years ago
ibuler 58d22b72ec [Feature] Label 删除修改
7 years ago
ibuler 6d552f4680 [Feature] 添加链接token
7 years ago
liuzheng e821d2995d
refactor: rename folder i18n
7 years ago
ibuler cc4eca2563 [Update] add debug log
7 years ago
ibuler 6d4e9c7d30 [Bugfix] 资产model 太长
7 years ago
ibuler 9433d6177a [Bugfix] 修改翻译
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 0a2b6494cc [Update] 修改签名md5算法
7 years ago
ibuler 17f91f7f53 [Update] 修改位置
7 years ago
ibuler d74c2e8466 [Model] 修改create_by字段
7 years ago
ibuler 070c3d73cc [Bugfix] git status
7 years ago
ibuler 7433327d75 [Feature] 标签管理功能
7 years ago
ibuler a976475617 [Update] 修改禁止排序的颜色
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 cad07434ff add logo test
7 years ago
ibuler f40fbaf602 [Feature] 添加修改用户密码api
7 years ago
ibuler 2f136800c7 [Update] 修改默认头像和logo
7 years ago
ibuler dd6e9444e1 [Bugfix] 倒序显示
7 years ago
ibuler 7670f521a2 [Fix] 修改Logger
7 years ago
ibuler cafb0e02a3 [Update] 修改dictfiled
7 years ago
ibuler 968b395bce Merge branch 'es' into dev
7 years ago
ibuler 0a931bbf77 [Feature] es support
7 years ago
ibuler 17181db8a5 [Feature] 支持es存储
7 years ago
ibuler 41f1c3f7f7 [Feature] terminal config load
7 years ago
ibuler 7f18821990 [Update] remote default PAGE_SIZE stting
7 years ago
ibuler 57e508f331 [update] 修改用户创建时 姓名和用户名的位置
7 years ago
ibuler b936d54a48 [Feature] 添加es支持
7 years ago
ibuler 67001dd99f [Feature] 支持es存储命令
7 years ago