Commit Graph

870 Commits (43cbf4f6a97cac33058896381c199a14175c9a39)

Author SHA1 Message Date
Bai 1845821f6c [Update] 修改用户profile序列类
5 years ago
ibuler 27d906a877 feat: 去掉js i18n catalog
5 years ago
ibuler 5bacab7475 fix: 重置密钥到auth中
5 years ago
ibuler 999286a089 fix: 修复用户公钥错误引起的profile bug
5 years ago
ibuler 68ccaf0cb3 feat: 去掉第一次登录的那个导航
5 years ago
ibuler 8d58d58519 feat: 修改profile view
5 years ago
ibuler 8efc0331de feat: 删掉所有view, templates, forms
5 years ago
ibuler 96551856a2 [Update] 部分view放到auth中
5 years ago
Bai 3b8a24eeb7 [Update] 添加用户profile public-key序列类
5 years ago
Bai 3e5d949610 [Update] 添加用户profile password序列类
5 years ago
Bai f3bc6c0b22 [Update] 修改用户profile序列类
5 years ago
Bai 7afff5e392 [Update] merge from dev to lina
5 years ago
Bai 566419cac4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into lina
5 years ago
Bai 7b362bfc76 [Update] 用户序列类添加mfa相关字段
5 years ago
ibuler 3c95c6fe11 [Feat] 添加失效用户权限的api
5 years ago
xinwen 7b0993959e [Update] orgs.serializers.OrgReadSerializer add `id`
5 years ago
ibuler 701582fe38 [Update] 修改license的判断方法
5 years ago
Bai e98626988b [Update] 解决开启OpenID,为用户强制启用MFA导致,登录时报错的问题
5 years ago
Bai 01a52812f0 [Update] 修改用户MFA禁用/更新的View
5 years ago
ibuler 76ef9b292b [Update] 修改public api
5 years ago
ibuler b529127461 [Update] 修改user role
5 years ago
ibuler 17163dd909 [Update] 用户Profile添加在当前组织的角色
5 years ago
ibuler 195cbbbe42 [Update] 修改profile serialzier
5 years ago
ibuler dd5bf546df [Update] 修改serialzier_class
5 years ago
Bai 4bd2681bf0 [Update] Merge from dev to lina
5 years ago
Bai 98e3adbb11 [Update] Merge from master to dev
5 years ago
Bai 7b3647e78a [Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug
5 years ago
Bai 0cff6ab29b [Update] Merge fromo dev to lina
5 years ago
ibuler 0bdc425c55 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler 0a7f63cc5e [Update] 修改remote app api
5 years ago
xinwen 3ee051303a [Update] audits 模块为一些 models 字段添加 verbose 信息
5 years ago
Bai 185c53d311 [Update] Merge from master to dev
5 years ago
Bai aec78dc3c7 [Update] 添加组织详情->组织用户tab页,解决组织详情页面加载超时问题
5 years ago
ibuler 6bb13a26f5 [Update] 修改用户serializer
5 years ago
ibuler f8c323cf5c [Update] 优化user group serializer
5 years ago
ibuler b6f5b335bd Merge branch 'api_perf' into lina
5 years ago
ibuler 230d6137f3 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler aa9533eb5b [Update] Groups users字段可以显示
5 years ago
Bai 9eee79f7d4 [Update] 调整openid backend顺序;openid 用户创建/更新添加日志输出
5 years ago
Bai c0089a98f4 [Update] 修改openid信号名称
5 years ago
Bai 87242c13a1 [Update] 修改信号监听kwargs
5 years ago
Bai 184432a2a6 [Update] 更新OpenID的配置项以及对应的信号监听
5 years ago
BaiJiangJie 7833ff6671
Dev oidc (#3941)
5 years ago
ibuler efb5d4135a [Update] 优化api字段显示
5 years ago
Bai 586c04cba6 [Update] 添加oidc-op配置信息
5 years ago
BaiJiangJie 1b1a686b96
Merge pull request #3922 from jumpserver/dev
5 years ago
BaiJiangJie 0379e5160c
[Bugfix] 修复真实组织下,新建的用户角色显示不稳定的问题2 (#3919)
5 years ago
Bai b4cc2bbff9 [Bugfix] 修复真实组织下,新建的用户角色显示不稳定的问题
5 years ago
BaiJiangJie e74289b223
[Update] 修改用户密码重置页面错误信息提示2 (#3914)
5 years ago
Bai 081f4b1c0a [Update] 修改用户密码重置页面错误信息提示
5 years ago
BaiJiangJie e9fe5b3004
Merge pull request #3908 from jumpserver/dev
5 years ago
Bai 6890d549ed [Update] 修改忘记密码页面的错误信息提示
5 years ago
BaiJiangJie 4dcd4749c3
Merge pull request #3884 from jumpserver/dev
5 years ago
Bai 3f6d7637c3 [Update] 更新用户添加CAS来源选项
5 years ago
Bai d1d73da322 [Update] Merge from dev
5 years ago
Bai 396bc9b6ae [Update] 修改用户ViewSet序列类返回的admin_orgs(解决组织管理员登录的Bug)
5 years ago
Bai af9d42695f [Update] 修改用户ViewSet序列类返回的admin_orgs(解决组织管理员登录的Bug)
5 years ago
ibuler cd7946f3f0 [Update] 修改一些bug
5 years ago
ibuler e7031d0ac1 [Update] 修改serailizer mixin
5 years ago
ibuler 9bf5d6dd45 [Update] 用户profile中添加orgs
5 years ago
ibuler b25096925b [Bugfix] 修复重置并下载ssh key的bug
5 years ago
Bai 04945809a5 [Update] 修改只有local用户需要发送创建成功邮件、发送密码过期邮件;
5 years ago
老广 1fd2e782f8
1.5.7 Merge to dev (#3766)
5 years ago
Bai da6a0c286d [Update] 修复用户更新页面会清空用户public_key的问题
5 years ago
BaiJiangJie b072e98148 [Update] 修改确认用户认证成功和绑定MFA的前后逻辑(解决绕过绑定MFA的漏洞;解决管理员重置用户MFA后自动退出的问题)
5 years ago
BaiJiangJie 352bfeeb7a [Update] 绑定MFA页面(二维码显示)
5 years ago
BaiJiangJie b4cf540e51
[Update] 操作日志添加新的Record Model;用户登录日志采用同步机制;修改DatabaseAppAPI权限(加入AppUser); (#3570)
5 years ago
BaiJiangJie 829e1f4cac
[Update] 修改用户详情页面 (#3555)
5 years ago
BaiJiangJie b365ba7982
[Update] 修改用户列表批量删除判断条件 (#3553)
5 years ago
老广 55c95c58f6 Add new model to operate log (#3546)
5 years ago
老广 e1919d0a62
Asset meta (#3539)
5 years ago
BaiJiangJie 16864ca34e
[Update] 用户列表添加移除操作(在其他组织中) (#3513)
5 years ago
老广 4944ac8e75 Config (#3502)
5 years ago
BaiJiangJie a07a90f1c9 [Update] 修改用户详情中审批人设置显示条件
5 years ago
BaiJiangJie 330c078597 [Update] Merge dev
5 years ago
jym503558564 a92aec2775 Merge branch 'dev' into user_detail_template
5 years ago
jym503558564 cc9554cdb4 [Update] 修改用户详情页中添加用户组标签的显示条件是:当前组织的普通用户或组管理员
5 years ago
BaiJiangJie 100dd24ff5
Merge pull request #3457 from jumpserver/dev
5 years ago
BaiJiangJie f47781a330 [Update] 发送重置密钥邮件时,清除用户公钥
5 years ago
jym503558564 54887a3460 [Update] 修改用户详情页中用户组标签不显示的问题
5 years ago
ibuler 4c801bb828 [Update] 修改用户列表
5 years ago
ibuler 1bba00412a [Update] 修改user list 页面字段宽度
5 years ago
ibuler bf40aa8df0 [Update] 修改user list api
5 years ago
ibuler 0c349f9350 [Update] 更改翻译
5 years ago
ibuler 4dc5d7d70e [Update] 换做lazyproperty
5 years ago
ibuler bb1349e962 [Update] 修改MFA
5 years ago
ibuler c9ee8edeaf [Update] 修改mfa
5 years ago
BaiJiangJie 5434b65773 [Update] Merge branch dev to 1.5.5
5 years ago
ibuler a01126c6c7 [Update] 修改radius MFA
5 years ago
BaiJiangJie 78a7bfbd30 [Update] 修复取消 LDAP 同步用户任务失败的问题
5 years ago
BaiJiangJie c31b56ddd9 [Update] Merge local branch dev to dev_ldap2
5 years ago
BaiJiangJie 596e5a6dd1 [Update] 重构 LDAP/AD 同步功能,添加缓存机制
5 years ago
ibuler aeff0ab5f3 [Update] 修改public key 校验
5 years ago
ibuler f9e41d71dc [Update] 修改登录工单
5 years ago
ibuler 08775551c2 [Update] Rename app
5 years ago
ibuler fb9e2ac9f6 [Update] 修改用户和用户组关系发生变化时,刷新权限
5 years ago
ibuler fa02e3fb75 [Update] Merge with bugfix
5 years ago
ibuler eedaaddbf5 [Update] 用户创建支持修改source
5 years ago
ibuler 6ce9815d51 [Update] 基本完成登录逻辑
5 years ago
ibuler 11f0024c33 [Update] 添加登录复核开关
5 years ago
ibuler dc3a9561c2 [Update] 基本完成登陆审核
5 years ago
ibuler d0ba67ed50 [Update] 基本完成登录二次审核
5 years ago
ibuler 517c682201 [Update] 修改登录路基
5 years ago
ibuler cf719f492d [Update] 修改user group relations api
5 years ago
BaiJiangJie 84b3e29db6
Merge pull request #3366 from jumpserver/bugfix
5 years ago
ibuler 86522627d3 [Update] 优化提交api报错时滚动到,优化table页面某些列宽度
5 years ago
BaiJiangJie 0930716a54 [Update] 优化用户组详情,用户选择下拉列表使用异步加载;命令过滤详情绑定到系统用户点击不关闭;
5 years ago
ibuler 87c7452d19 [Update] 修改email msg
5 years ago
BaiJiangJie f3dc9b886b Asset favor (#3352)
5 years ago
BaiJiangJie 8fcfcf7ad3 [Update] 更新创建/更新用户组是取消按钮->重置按钮(避免引起歧义)
5 years ago
BaiJiangJie fa1a167f8e [Feature] 添加同步 LDAP/AD 用户的定时任务3
5 years ago
BaiJiangJie 8b7c5b1545 [Feature] 添加同步 LDAP/AD 用户的定时任务2(添加同步参数配置项)
5 years ago
BaiJiangJie 8081a864da Merge branch 'dev' into dev_ldap_sync_timing
5 years ago
ibuler 9e12f3cd17 [Update] 表单中用户使用异步
5 years ago
BaiJiangJie 4b7cd79682 [Feature] 添加同步 LDAP/AD 用户的定时任务1
5 years ago
老广 c75fd3c108
Bugfix (#3286)
5 years ago
BaiJiangJie ddb34a0f59 [Update] 添加翻译
5 years ago
BaiJiangJie fa7150850f
Merge pull request #3243 from jumpserver/gather_asset_user
5 years ago
ibuler 847e37e641 [Update] 修改一些bug
5 years ago
ibuler 5464c884db [Update] 修改swagger
5 years ago
BaiJiangJie 124e042565 [Bugfix] 修复用户组创建页面Bug
5 years ago
BaiJiangJie f4c080dd19 [Update] API允许批量删除用户,修改前端提示信息逻辑
5 years ago
八千流 a2376d3afd 超级管理员可创建超级审计员并可设置审计员为组织审计员 (#3141)
5 years ago
老广 de43980ee2
Dev beta2 (#3177)
5 years ago
老广 8cd8f41cb0
Dev beta (#3167)
5 years ago
老广 164f48e131
Dev beta (#3048)
5 years ago
ibuler fdef282c57 [Bugfix] 修复批量更新用户的bug, 导出字段添加 *
5 years ago
ibuler 42ff5a382a [Update] 修改设置session的时间,避免sdk等报错
5 years ago
BaiJiangJie 586d6e6abb [Update] 添加用户过期邮件提醒
5 years ago
BaiJiangJie 3d9c0a212e [Update] 用户登录失败次数提示
5 years ago
BaiJiangJie a7066a5c85 [Update] htmlEscape
5 years ago
BaiJiangJie 637fc91413 [Update] 密码过期邮件发送(密码未过期用户&有效用户)
5 years ago
老广 c6ec00e84d
[Update] 修改collect static file机制 (#3044)
5 years ago
BaiJiangJie 947f16e371 [Update] 是否允许用户更改/使用密钥登录,根据settings配置进行控制
5 years ago
BaiJiangJie c929c1a87e [Bugfix] 解决下载导入模版时KeyError的问题(数据为空时) (#3017)
5 years ago
老广 421e98696c
Bugfix (#3014)
5 years ago
老广 8f5e91bc34
[Update] 授权显示节点下所有的资产 (#3001)
5 years ago
八千流 ea11aa4abb [Bugfix] 修改排序,去掉标签 (#2982)
5 years ago
老广 8ed3bb8586
Bugfix (#2980)
5 years ago
八千流 6cf11ab411 [Update] 优化mfa验证身份页面水平线在大屏幕无自动对其问题 (#2948)
5 years ago
老广 55b049c86a
Bugfix (#2938)
5 years ago
八千流 7bda48bd9f [Bugfix] 修复创建用户 数据库报1062 Duplicate entry .. for key PRIMARY 错误 (#2934)
5 years ago
八千流 63a502ba62 [Update] 创建/更新 用户 使用api (#2918)
5 years ago
八千流 4e3e166132 [Update] 创建/更新 用户组使用api (#2914)
5 years ago
BaiJiangJie 5f9f970abd
Perf (#2929)
5 years ago
BaiJiangJie e415ef8354 [Update] 限制用户通过API删除自己
5 years ago
老广 58875d9a95
Bugfix (#2831)
5 years ago
BaiJiangJie 371aff3251
[Update] 优化用户组列表用户显示问题 (#2882)
5 years ago
ibuler bf9a2714d3 Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
5 years ago
ibuler 29824fb7d2 [Update] 修改user group serialzier
5 years ago
八千流 3598bc79c3 [Bugfix] 修复创建用户的View,使用密码创建用户时没有校验密码规则 (#2877)
5 years ago
ibuler 5f6af8c07d [Update] 修改command列表
5 years ago
ibuler b9f82fd0ac [Update] 优化命令记录列表
5 years ago
ibuler 1b44172bc5 [Update] 修改migrations
5 years ago
ibuler 31d2f2a799 [Update] 去掉原来批量的view
5 years ago
ibuler e4880a247f [Update] 修改action
5 years ago
ibuler b064be3ec0 [Bugfix] 修复用户页面不走cache的bug
5 years ago
ibuler c33084421d [Update] Debug cache
5 years ago
八千流 768cfc7561 [Bugfix] 修复用户无权限执行批量命令却可直接访问批量执行页面的bug (#2857)
5 years ago
ibuler e8ebc94191 [Update] 修改assets users api
6 years ago
ibuler f10a7a75ae [Update] 修改用户表结构
6 years ago
ibuler e08d542c87 [Update] 修改users public_key等字段
6 years ago
老广 10616b8d9e
[Update] serializer mixin继承 (#2810)
6 years ago
BaiJiangJie 9cd75390bf [Update] Auth Info (#2806)
6 years ago
八千流 8adaf629b4 [Update] 增加审计员权限控制 (#2792)
6 years ago
八千流 03d9570895 [Update] 优化用户API,创建用户添加组织关系 (#2776)
6 years ago
八千流 9c55450a9e [Bugfix] 修复资源表可以选择多页的资源数据 (#2744)
6 years ago
BaiJiangJie 059a8de44a [Bufix] 修复用户更新时password_strategy字段不能为空的bug (#2741)
6 years ago
BaiJiangJie 21ac3eaf8b [Update] 用户创建添加密码设置策略 (#2731)
6 years ago
八千流 b7eac837f7 [Update] 创建用户自定义邮件内容 (#2703)
6 years ago
BaiJiangJie 217bb81722 [Update] 优化LDAPUtil逻辑 (#2728)
6 years ago
八千流 22f362aab3 Dev csv (#2640)
6 years ago
老广 3855fecc69
Password message (#2702)
6 years ago
BaiJiangJie b7ad6cfe62 [Update] 防止 XSS (#2633)
6 years ago
BaiJiangJie caa5060ecd [Update] 控制组织管理员不允许更新、删除超级用户;修复ViewSet API批量更新的bug (#2629)
6 years ago
八千流 56519354b6 Email reset password (#2547)
6 years ago
BaiJiangJie 9d62deeabe [Update] 修复小问题 (#2557)
6 years ago
ibuler 3062e3f64a [Update] 修复重定向的问题
6 years ago
ibuler ace028fa7f [Update] 统一可更改的interface
6 years ago
八千流 ce8f4b4a48 Ldap synchronization (#2512)
6 years ago
老广 311538dcf8
Bugfix (#2513)
6 years ago
老广 324cf2469f
Bugfix (#2506)
6 years ago
老广 b45b33380c
Monitor (#2485)
6 years ago
ibuler 58c4a46f6e [Update] 用户权限增加cache
6 years ago
ibuler dfd26d88d4 [Update] 用户资产添加缓存
6 years ago
ibuler 924affd978 [Update] 更新移动的model
6 years ago
ibuler d84ab1d215 [Update] 修改迁移
6 years ago
ibuler a5fc04e0ce [Update] merge
6 years ago
ibuler e76392a169 Merge branch 'stable' into dev
6 years ago
ibuler 53f0b2e9b0 [Update] 增加清理登陆日志的任务
6 years ago
ibuler 8199ea84f4 [Bugfix] 修复有时导致的token解析失败
6 years ago
ibuler ce1b0da09d [Update] Merge
6 years ago
ibuler cd6bb848e9 [Update] Squash table
6 years ago
ibuler 34040fcd59 [Update] 移动model
6 years ago
ibuler 1969fb79fe [Update] 修改authentication backends
6 years ago
BaiJiangJie 904f64604b [Bugfix] 修复authentication模块之间引用的bug
6 years ago
ibuler 9b3509208d [Update] 修改authentication目录结构
6 years ago
BaiJiangJie 6700dc969f [Update] users认证逻辑迁移到authentication中
6 years ago
ibuler 21714cc411 [Update] Stash
6 years ago
老广 69f640daa4
Api (#2439)
6 years ago