Commit Graph

537 Commits (3eab621b28b8eabae474022d2681f49b1c589f7c)

Author SHA1 Message Date
ibuler 49632241b6 [Update] 导入解析csv coding
6 years ago
ibuler 1cdcc66dba [Update] 修改excel打开乱码
6 years ago
ibuler 0847539e02 [Update] 修改导出的csv名称
6 years ago
八千流 22f362aab3 Dev csv (#2640)
6 years ago
BaiJiangJie 1eca517978 [Feature] 添加功能 RemoteApp (#2706)
6 years ago
老广 3855fecc69
Password message (#2702)
6 years ago
ibuler 9e52579ca6 [Update] 修改api meta data
6 years ago
BaiJiangJie b7ad6cfe62 [Update] 防止 XSS (#2633)
6 years ago
BaiJiangJie caa5060ecd [Update] 控制组织管理员不允许更新、删除超级用户;修复ViewSet API批量更新的bug (#2629)
6 years ago
jokimina 78e4e13fb9 [Bugfix] IsSuperUserOrAppUser deny app user (#2558)
6 years ago
ibuler 6e7446f530 [Update] 增加task最大允许事件,并设置命令最大运行时间为60s
6 years ago
老广 b45b33380c
Monitor (#2485)
6 years ago
ibuler d84ab1d215 [Update] 修改迁移
6 years ago
ibuler 21714cc411 [Update] Stash
6 years ago
老广 69f640daa4
Api (#2439)
6 years ago
ibuler 866e5d2011 [Update] 修改ldap test密码为空
6 years ago
ibuler 7c422d2ed6 [Update] Merge
6 years ago
ibuler 2a5129c481 [Update] 修改支持记录cmd filter日志
6 years ago
BaiJiangJie 28cdfca14b [Update] 优化 License (#2420)
6 years ago
ibuler 3c2a4703bc [Update] ldap允许空密码
6 years ago
ibuler 303f88d6ee [Update] 更新replay storage 配置
6 years ago
ibuler 859f2d9795 [Update] 支持telnet自定义正则
6 years ago
ibuler 4fd9957bec [Update] 修改celery日志显示
6 years ago
ibuler 5a1b894138 [Update] gunicorn的日志
6 years ago
ibuler 4051225ecb [Bugfix] 修复命令执行bug,修复修改日志级别后无法查看日志
6 years ago
ibuler 8285610097 [Update] 创建Host Key
6 years ago
ibuler 6acac9cb3d Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
6 years ago
ibuler 9d78f26807 [Update] 创建Host Key
6 years ago
BaiJiangJie 9d53ba22e1 [Update] 取消ceph录像存储,添加命令执行翻译 (#2365)
6 years ago
ibuler 56a47b6ba3 [Update] 存储添加说明
6 years ago
老广 01a101a710
[Update] 修改一些terminal storage (#2357)
6 years ago
老广 d026b31c9f
Bugfix (#2346)
6 years ago
老广 50c1b3ed4a
[Update] 统一coco host key (#2336)
6 years ago
BaiJiangJie b9b8c35a81 [Update] 修改创建资产选择vnc协议,默认端口5901 (#2276)
6 years ago
BaiJiangJie dab692c0eb [Update] 限制终端设置中心跳间隔和会话保留时长的form最小值 (#2262)
6 years ago
ibuler e15c9e6588 [Update] 修改小bug
6 years ago
ibuler 94d6525548 [Bugfix] 修复小bug
6 years ago
老广 e7725e6910
Bugfix (#2252)
6 years ago
老广 7ff39259af
Required opt (#2246)
6 years ago
ibuler 583214e91a [Update] 优化获取授权资产api
6 years ago
老广 1293d72189
Session task (#2196)
6 years ago
老广 985bd6fc82
Bugfix2 (#2183)
6 years ago
BaiJiangJie 374039d287 [Update] 终端设置,添加coco端资产列表页面大小配置项 (#2182)
6 years ago
老广 3d13f3a17d
Command (#2134)
6 years ago
BaiJiangJie 8f479e364b [Update] 修复小细节 (#2111)
6 years ago
ibuler 2661bbb70a [Update] 修改config example
6 years ago
BaiJiangJie 646a29108c [Update] 修改安全设置模块排版,翻译 (#2083)
6 years ago
ibuler 091cf39e4e [Bugfix] ldap可以修改密码问题,platform大小写问题
6 years ago
老广 9cfcadc2f6
服务账号注册机制更改 (#2079)
6 years ago
BaiJiangJie 363985ee7a [Feature] 添加功能,密码过期间隔时间配置,检测用户密码过期 (#2043)
6 years ago
老广 16cc4a0f4e
[Update] 修改settings配置 (#2067)
6 years ago
ibuler 9d7b82085e [Update] 修改common settings
6 years ago
ibuler dda367a956 [Update] 修改common settings配置
6 years ago
ibuler d50ad66b78 [Update] 维护统一的migrations
6 years ago
BaiJiangJie 28b6144189 [Bugfix] 修复创建用户common_settings.SITE_URL 为None的bug (#2027)
6 years ago
BaiJiangJie fd6e561d4b [Bugfix] 资产/用户等升序排序问题,显示创建oss录像存储bucket输入框 (#2017)
6 years ago
ibuler 2e4e5503cc [Bugfix] 修复获取common settings时数据库问题
6 years ago
BaiJiangJie 82d866db7d [Update] 添加用户授权资产列表页的分页,搜索,排序 (#1963)
6 years ago
BaiJiangJie 4f806f11f2 [Update] 修改命令/录像存储,创建/删除API的权限为SuperUser
6 years ago
BaiJiangJie ebd92c79c7 [Update] 修改翻译小细节
6 years ago
BaiJiangJie 6278900201 [Update] 创建es命令存储,添加提示信息
6 years ago
BaiJiangJie 1f502e02c7 [Update] 修改settings为common_settings
6 years ago
BaiJiangJie cdf8398169 [Update] 修复创建es命令存储校验有效性异常
6 years ago
BaiJiangJie 1bfef829f3 [Update] 修改terminal表单获取storage, 删除无用代码
6 years ago
BaiJiangJie 2791213844 [Update] 更新storage翻译
6 years ago
BaiJiangJie 284e8be45c [Update] 修改系统设置-命令/录像存储页面(添加,删除)
6 years ago
ibuler 11aefa479b [Bugfix] 修复common设置问题
6 years ago
BaiJiangJie 3fa6807837 [Update] 添加(减法)标签过滤器
6 years ago
ibuler 70fa43adaa [Update] 修改一些逻辑
6 years ago
ibuler 44bf01d4ed [Update] 支持命令过滤
6 years ago
ibuler 0eda8865e6 [Bugfix] 修复首页显示问题
6 years ago
ibuler 88a29c0a93 [Update] 增加手动结束非正常关闭的连接
6 years ago
ibuler 2c4966c678 [Update] 修改form
6 years ago
老广 fe45d839fb
Dev2 (#1766)
6 years ago
ibuler ccc292d9a9 [Update] 去掉debug信息
6 years ago
pufer 337338ebf3 增加多OU支持 (#1262)
6 years ago
ibuler 672dd66023 [Bugfix] 修复一些bug
6 years ago
ibuler 23815f87c5 [Update] 升级url
6 years ago
ibuler f4c86718dc [Update] Merge dev
6 years ago
ibuler 2ecfecb06f [Update] Merge with dev
6 years ago
BaiJiangJie ac238aa36e [Update] 修改用户登录失败限制次数,3->7 (#1586)
6 years ago
ibuler 2abb9efe96 [Update] Org功能修改
6 years ago
老广 36f1165d1b
Tmp org (#1583)
6 years ago
老广 b156f4ad16
Tmp org (#1579)
6 years ago
老广 c816875f28
[Update] 修改permission (#1574)
6 years ago
老广 2208d6d51e
[Bugfix] 解决Node.root() 死循环,移动AdminRequired到permission中 (#1571)
6 years ago
ibuler e3aa18ff2d [Update] 修改get_current_org 为 proxy对象 current_org
6 years ago
BaiJiangJie 83f220d7de [Feature] 添加命令记录下载功能 (#1559)
6 years ago
ibuler 28e47f33c1 [Update] 修改一些逻辑
6 years ago
ibuler 7412bdcba7 [Update] 完成基本框架
6 years ago
BaiJiangJie 512fc8f8f0 [Update] 优化登录失败次数限制的逻辑,并添加系统安全设置选项
7 years ago
BaiJiangJie c6a8967376 [Update] 删除多余代码
7 years ago
BaiJiangJie fcd17460d7 [Update] 增加密码校验规则中密码最小长度限制6位
7 years ago
BaiJiangJie 4c4430661b [Merge] Merge branch dev of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie ee35ca3643 [Feature] 增加功能,安全设置(全局MFA设置,密码强度校验)
7 years ago
ibuler 482d1bb27f [Update] 修改permisstion util
7 years ago
ibuler 69e5ab438a [Bugfix] 解决发送邮件重启的问题
7 years ago
BaiJiangJie 486793ddcd [Bugfix] 修复取消LDAP认证不成功bug
7 years ago
ibuler 8e74a04282 [Update] 修改一些bug
7 years ago
ibuler 4ed9e11090 [Update] 修改用户名校验规则
7 years ago
老广 6f494ef09c
校验用户名长度和特殊字符 (#1271)
7 years ago
ibuler 763cf0d981 [Bugfix] 修复解密None的bug
7 years ago
ibuler 48e8785725 [Update] 修改users otp secret key
7 years ago
ibuler 33c299566a [Update] 修复bug
7 years ago
ibuler 84634eb8c0 [Update] 修改Permr认证
7 years ago
ibuler d0ede246e7 [Update] 修改授权
7 years ago
ibuler d247e49b70 [Update] 修改celery位置
7 years ago
ibuler a4c843ff13 [Update] 迁移celery到ops
7 years ago
ibuler df80e8047a [Update] 修改日志
7 years ago
ibuler 7f4f67aa8d [Update] 支持网域
7 years ago
ibuler 15427fb743 [Update] 还原ldap配置
7 years ago
ibuler 7874a1539c [Update] 修改配置,默认先从数据库认证
7 years ago
ibuler 40d2934de0 [Bugfix] 修复首页无法显示数据的bug
7 years ago
ibuler d284c2175d [Update] 修改一些小问题
7 years ago
ibuler 870b863136 [Update] 修改设置的一些require
7 years ago
ibuler 9292e48554 [Bugfix] 用户csv导入编码问题
7 years ago
ibuler 8e2891d7d7 [Update] 修改文案
7 years ago
liuzheng 459d0668a8
feat: replay setting page and api
7 years ago
ibuler d047ff3b3a Merge branch 'dev' into tree
7 years ago
ibuler 2d3967872b [Feature] 完成资产授权和资产添加
7 years ago
ibuler 653c328e84 [Abandon] ...
7 years ago
ibuler 45f6a62989 [Update] 修改一处翻译
7 years ago
ibuler 21a7202587 [Bugfix] 修复ldap认证bug
7 years ago
ibuler b0fab2453a [Merge] 合并标签功能
7 years ago
ibuler 0a2b6494cc [Update] 修改签名md5算法
7 years ago
ibuler 7433327d75 [Feature] 标签管理功能
7 years ago
ibuler cafb0e02a3 [Update] 修改dictfiled
7 years ago
ibuler 0a931bbf77 [Feature] es support
7 years ago
ibuler 17181db8a5 [Feature] 支持es存储
7 years ago
ibuler b936d54a48 [Feature] 添加es支持
7 years ago
ibuler d08a1c3ddb [Update] 启用ldap移动位置
7 years ago
ibuler ba5ab21b37 For storage
7 years ago
ibuler cc18ad9a7f Merge branch 'paging' into dev
7 years ago
ibuler b2f97a263d [Feature] 添加后端paging
7 years ago
ibuler 89e013e2e2 [Bugfix] setting tables not found
7 years ago
ibuler 59a69f0253 [Bugfix] 修复title显示Jumpserver
7 years ago
ibuler 39fff235d1 [Bugfix] 修复cluster创建的bug
7 years ago
ibuler 7316661eb5 [Update] 启动加载common setting
7 years ago
ibuler d48f8dceb5 [Update] 修改翻译
7 years ago
ibuler abb1a40a4f [Feature] 添加basic settings
7 years ago
ibuler 121f56f44b [Feature] 添加setting页面
7 years ago
ibuler 72a82c41ee [Update] 修改 success message, 添加资产组时可以添加资产
7 years ago
ibuler c0829194dc [Update] 修改一些bug, 增加执行task的按钮
7 years ago
ibuler 4dbf332a56 [Bugfix] 修复刷新硬件的bug
7 years ago
ibuler 3b6403b2f2 [Update] 修改一些翻译
7 years ago
ibuler 0916757eb8 [Bugfix] 修复一些bug
7 years ago
ibuler e0a3fafbd5 [Bugfix] 详见trello
7 years ago
ibuler 0848893f1e [Bugfix] 修复时间日期搜索的bug,select2模块自适应长度
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 b4e1ac1953 [Bugfix] 修复资产模块中一些bug
7 years ago
ibuler 11fa3e08e9 [Bugfix] 修改ts_to_date 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 99b4c66b5e [Feature] 添加signals 解耦代码
7 years ago
ibuler 0c9e24dc59 [Feture] 添加ops 页面
7 years ago
ibuler 2b3551f1fc [Feature] 修改ansible和ops
7 years ago
ibuler a5f9735906 [Update] 更新index view
7 years ago
ibuler 9b6696bb6e [Feture] session detail页面,包含命令列表
7 years ago
ibuler 61a8d95f46 [Change] Rename applications -> terminal
7 years ago
ibuler 7f9ce57318 修改 terminal上报接口和api
7 years ago
ibuler 034f0a02b1 Update terminal api
7 years ago
ibuler 477d23ea37 fix some bug
7 years ago
Fengxu Lin 26a169d938 fix bug in pagination_range function (#511)
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
crisewng 18169251fa [Bugfix] 修复管理用户上传私钥兼容问题 (#451)
8 years ago
ibuler 1719eee264 [Bugfix] 修复py3 bytes bug
8 years ago
ibuler 31025b8c52 [bugfix] 修复重置密码bug
8 years ago
GuangHongwei 458989328e [Bugfix] 修改bug,使用py3编程
8 years ago
ibuler a320b9e05e [Bugfix] 兼容py3
8 years ago
ibuler 92ebe85a3f [Fixture] 详情页添加system user 推送
8 years ago
ibuler 067426d5e0 [Fixture] 完成用户向导页
8 years ago
ibuler b60e5a7ee3 [Change] 修改一些view
8 years ago
ibuler a4504dc0c7 [Change] 拆分tasks
8 years ago
ibuler 0fbd9843bd [Change] 修改runner, inventory位置
8 years ago
ibuler a822f667af [Fixture] 完成用户推送task
8 years ago
ibuler 7825c107ab [Bugfix] model FieldError
8 years ago
ibuler a79c3dd156 [Fixture] 添加command log backends, 未来支持es
8 years ago
ibuler 25cb47d2f5 [Change] 拆分user view为多个view
8 years ago
ibuler 2707012325 Finish access key auth
8 years ago
ibuler c5ab49c515 Finish access key auth
8 years ago
ibuler 6e843533cb Base finish user
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 db8b0022fc Update usergroup detail
8 years ago
ibuler 419876b575 Update heatbeat
8 years ago
ibuler 2635217421 Update celery
8 years ago
ibuler 69f2bf664b Finish user permission revoke
8 years ago
ibuler 47090eb0f7 update some user api
8 years ago
ibuler a75e1db970 Add form validate
8 years ago
ibuler 968b1b4cb6 Stash
8 years ago
ibuler 34a0a37b63 Add token
8 years ago
ibuler 1159d9494c Update signer
8 years ago
ibuler 5d3f9b4a03 Add command list
8 years ago
ibuler 17ade287ab Add proxy log api
8 years ago
ibuler a62a2178d0 Add user backend
8 years ago
ibuler f038423ce2 Add isdangerous
8 years ago
江世峰 73f5891f87 asset:update assets_list by tag
8 years ago
ibuler 45df58114c Merge branch 'connect'
8 years ago
xiaokong1937@gmail.com 6856fad0c0 integrate the user-group list page with its api;
8 years ago
xiaokong1937@gmail.com d40aa49d8c user bulk import through Excel and close #20
8 years ago
ibuler acf51238d0 Modify ssh server bug for using public key
8 years ago
ibuler ce5950ca73 Merge with asset
8 years ago
xiaoyu f00da20764 user-group delete implement
8 years ago
ibuler d323c9df88 Modify asset create
8 years ago
ibuler 7d3474aeea Add user permission user list
8 years ago
ibuler 037d9323a4 Modify and code review
8 years ago
ibuler a4dc27f073 Finish permissin detail asset list and user list
8 years ago
ibuler 5bca783e12 permission user search
8 years ago
ibuler 627a5825f4 Add user perm
8 years ago
ibuler 6f4a832389 Add admin user list view
8 years ago
ibuler 7350e150c8 Merge branch 'master' into cmdb
8 years ago
ibuler f274684473 Add translation for support i18n
8 years ago
wangyong d96ac56460 merge master
8 years ago
wangyong 77f3a1f146 add asset add
8 years ago
ibuler 10d51ada37 Update login error message
8 years ago
ibuler 3a9cf6c360 Add forget password and reset password
8 years ago
ibuler 5940cec0e6 Add user and send mail
8 years ago
ibuler b31f8d5867 Add user generate reset password token
8 years ago
ibuler 5350f83275 Add celery usage more
8 years ago
广宏伟 dd80b94b43 Update README.md
8 years ago
广宏伟 4cbadbd941 Update README.rst
8 years ago
广宏伟 e61341df79 Update README.md to README.rst
8 years ago
ibuler f7ab26a5da Add celery broker
8 years ago
ibuler ffed46175d update .gitignore
8 years ago
yumaojun03 363ddb70e2 add celery support (not use django-celery)
8 years ago
ibuler 0427d406b9 Add init data file
8 years ago
ibuler e355c7b8ef Modify pagination and Role model
8 years ago
ibuler 98d6043f2d merged
8 years ago
ibuler 3bf0d4aabb Add common app
8 years ago