Commit Graph

486 Commits (c9f4b104c76a7a2bb1adaf498e30f1ea6077b910)

Author SHA1 Message Date
ibuler 0a2ff83ca1 Merge remote-tracking branch 'origin/dev' into dev
7 years ago
ibuler 7276bd0b2a [Update] 更新获取session log的方法,以后统一到media/replay中
7 years ago
ibuler dbc471c195 [Bugfix] 修复小错误
7 years ago
老广 8a5e1b8223
Merge pull request #1407 from jokimina/dev_for_pr
7 years ago
BaiJiangJie 221fae5875 [Bugfix] 修复用户失效日期截止后还可登录问题
7 years ago
xiaodong f4084c800a [Bugfix] 更新用户信息时不填密码也会触发密码规则验证,导致无法更新
7 years ago
BaiJiangJie 5f2c31e42c [Update] 重置公钥,添加成功信息(user-pubkey-update)/自动跳转下一步(first-login)
7 years ago
BaiJiangJie 64db02c3f8 [Update] 添加用户来源 db/ldap
7 years ago
BaiJiangJie 842841128f Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie b026e86741 [Update] 修改判断MFA是否全局启用的逻辑,放到User.otp_force_enabled中
7 years ago
ibuler 80d11bbaab [Update] 删除user group继承的抽象类
7 years ago
BaiJiangJie ee35ca3643 [Feature] 增加功能,安全设置(全局MFA设置,密码强度校验)
7 years ago
BaiJiangJie 3a2973023c [Update] 修改资产树和资产列表数量显示(游离资产)
7 years ago
ibuler ffabef0040 Merge branch 'large' into dev
7 years ago
ibuler 0b4df78393 [Update] 修改permistion utils优化返回的属性
7 years ago
ibuler 0bc86543b5 [Update] 修改用户组详情显示授权资产的bug
7 years ago
ibuler 9b4b9e6900 [Update] 发送邮件增加用户名显示
7 years ago
ibuler 4b7af1457d [Update] 系统用户新增清除认证的操作
7 years ago
BaiJiangjie 2583c0b26c [Bugfix] 资产树节点,取消model value unique,并添加唯一性校验,修改新增节点计数器规则
7 years ago
BaiJiangjie 0962a16b22 [Bugfix] 修复首次登录条款问题及引导页面MFA配置问题
7 years ago
BaiJiangjie c37414045b [Bugfix] 修改用户列表导出,默认导出全部用户
7 years ago
BaiJiangjie 784bec42ff [Update] 修改用户登录,首次登录不需要验证码,登录失败时需要验证码校验
7 years ago
BaiJiangjie b5fc76d6a5 [Update] 修改用户首次登录页
7 years ago
BaiJiangjie 5b52b907c0 [Update] 创建用户,更新用户,添加MFA设置选项
7 years ago
BaiJiangjie 8447c6f487 [Update] 修改coco文案OTP改为MFA
7 years ago
BaiJiangjie 7a219e1710 [Update] OTP文案修改为MFA
7 years ago
ibuler 9ac7f26c74 [Update] 修改用户详情,自己更改自己otp,提示小写
7 years ago
BaiJiangjie f73fe1f315 [Bugfix] 修复用户登录缓存设置问题
7 years ago
BaiJiangjie 12c8cf6b76 [Update] 添加OTP认证功能
7 years ago
BaiJiangjie f450accbf8 [Merge] with dev
7 years ago
BaiJiangjie 0bbfc7433d [Feature] 支持otp
7 years ago
ibuler 48e8785725 [Update] 修改users otp secret key
7 years ago
ibuler 2398e9acbd 更改表截稿
7 years ago
ibuler 8b3b517bab [Update] 修改授权规则详情列表页面
7 years ago
ibuler bbaa35c773 [Update] 修改Perms
7 years ago
ibuler 0fa8287811 Merge branch 'dev' into perms
7 years ago
ibuler 78f4e5a89a [Update] 修改用户Opt
7 years ago
ibuler 3193c5549d Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler ed71e7d2d9 [Update] 修改用户Opt
7 years ago
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 6a88fd2d60 [Update] 修改api权限
7 years ago
BaiJiangjie b63999f385 创建用户发送邮件
7 years ago
BaiJiangjie ec6103448e 使终端管理的应用用户不显示在用户组里
7 years ago
ibuler b959f1f68b Merge branch 'bugfix_ip_lookup' into dev
7 years ago
ibuler e1cab35db0 [Bugfix] 修改获取城市
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 f85e5b6f75 [Bugfix] 修改添加用户的bug
7 years ago
ibuler 759760e7d9 [Update] 服务器可以生成用户密钥
7 years ago
ibuler faf6a7b623 [Update] 删掉token api调用次数限制
7 years ago
ibuler 8e4ab9f3a9 [Update] 支持获取token的用户
7 years ago
ibuler fe03011177 [Update] 不允许添加应用程序类型的用户
7 years ago
liuzheng712 9162f4a226
revert: add the old apps/users/migrations/0002_auto_20171225_1157.py
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 86c0a2d28b [Update] 修改部分翻译和文档
7 years ago
ibuler e123599735 [Update] 修改一些bug和文案
7 years ago
ibuler bd4f96134f [Update] 修改一些文案
7 years ago
ibuler d284c2175d [Update] 修改一些小问题
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 870b863136 [Update] 修改设置的一些require
7 years ago
ibuler 9292e48554 [Bugfix] 用户csv导入编码问题
7 years ago
ibuler c68da5898a [Update] 修改初始
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 bd4768c147 [Update] 拆分asset api module
7 years ago
ibuler 2d3967872b [Feature] 完成资产授权和资产添加
7 years ago
ibuler 9e09a962af [Feature] 支持popover
7 years ago
ibuler 012614562f [Update] 修改小bug
7 years ago
ibuler 6d552f4680 [Feature] 添加链接token
7 years ago
ibuler f0b9a11482 [Update] ansible disk bug
7 years ago
ibuler b0fab2453a [Merge] 合并标签功能
7 years ago
ibuler d74c2e8466 [Model] 修改create_by字段
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 f40fbaf602 [Feature] 添加修改用户密码api
7 years ago
ibuler 968b395bce Merge branch 'es' into dev
7 years ago
ibuler 0a931bbf77 [Feature] es support
7 years ago
ibuler 57e508f331 [update] 修改用户创建时 姓名和用户名的位置
7 years ago
ibuler 681ddb5af2 [Bugfix] for login ip
7 years ago
ibuler 29061aa088 [Bugfix] user login ip
7 years ago
ibuler b2f97a263d [Feature] 添加后端paging
7 years ago
ibuler 59a69f0253 [Bugfix] 修复title显示Jumpserver
7 years ago
ibuler 39fff235d1 [Bugfix] 修复cluster创建的bug
7 years ago
ibuler abb1a40a4f [Feature] 添加basic settings
7 years ago
ibuler 121f56f44b [Feature] 添加setting页面
7 years ago