Commit Graph

424 Commits (b0710c42b03f11855efaf69969f41942acc467ce)

Author SHA1 Message Date
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