Commit Graph

739 Commits (89496baae5f5ea33ade68a8a57d28497c5bd3111)

Author SHA1 Message Date
老广 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
ibuler 202aba048b [Update] 修改用户页面授权资产
6 years ago
老广 cccc74279d
Dev license (#2409)
6 years ago
ibuler f9a7cca478 [Update] 修改token有效期
6 years ago
老广 2a0e68c58f
Bugfix (#2350)
6 years ago
老广 d026b31c9f
Bugfix (#2346)
6 years ago
老广 50c1b3ed4a
[Update] 统一coco host key (#2336)
6 years ago
老广 0e1d3f93ff
[Update] 支持radius认证 (#2323)
6 years ago
老广 560df5027a
[Update] 禁用其他认证方式修改密码 (#2286)
6 years ago
BaiJiangJie 8e93bfecb0 [Bugfix] 修复DEFAULT组织下,批量删除(某组织下)一部分用户失败的bug (#2261)
6 years ago
老广 7ff39259af
Required opt (#2246)
6 years ago
老广 b3079a4a9b
[Update] Add index (#2208)
6 years ago
老广 a609f17078
[Update] Stash it (#2197)
6 years ago
老广 b56d73ba9e
Node asset amount (#2192)
6 years ago
vkill ab6c88823d Support for TOTP valid_window configuration (#2187)
6 years ago
老广 9c0f00f625
[Update] 修改命令执行 (#2148)
6 years ago
Titan 2833f343b2 otp issuer配置项 (#2133)
6 years ago
老广 3d13f3a17d
Command (#2134)
6 years ago
老广 9499a16a8b
[Update] 默认中可以看到所有用户 (#2102)
6 years ago
BaiJiangJie f380d82b55 [Update] 修改小问题 (#2100)
6 years ago
ibuler 091cf39e4e [Bugfix] ldap可以修改密码问题,platform大小写问题
6 years ago
ibuler f6def0b43f [Update] 修改表结构
6 years ago
老广 9cfcadc2f6
服务账号注册机制更改 (#2079)
6 years ago
BaiJiangJie 363985ee7a [Feature] 添加功能,密码过期间隔时间配置,检测用户密码过期 (#2043)
6 years ago
老广 16cc4a0f4e
[Update] 修改settings配置 (#2067)
6 years ago
ibuler dda367a956 [Update] 修改common settings配置
6 years ago
ibuler d50ad66b78 [Update] 维护统一的migrations
6 years ago
BaiJiangJie fd6e561d4b [Bugfix] 资产/用户等升序排序问题,显示创建oss录像存储bucket输入框 (#2017)
6 years ago
BaiJiangJie e09f3ca4fd [Update] 支持 OpenID 认证 (#2008)
6 years ago
BaiJiangJie f9e9bf0b2d [Update] 更新用户/授权规则过期时间精确到min (#1993)
6 years ago
BaiJiangJie f87e08efff [Update] 添加deb依赖,完善用户登录失败日志,修复资产标签bug (#1983)
6 years ago
BaiJiangJie 82d866db7d [Update] 添加用户授权资产列表页的分页,搜索,排序 (#1963)
6 years ago
老广 354b728f75
Merge pull request #1945 from jumpserver/dev_storage
6 years ago
BaiJiangJie cc387bf511 [Update] 用户列表页,添加分页,搜索
6 years ago
BaiJiangJie 1f502e02c7 [Update] 修改settings为common_settings
6 years ago
ibuler 310bc6ad0b [Update] 修复获取token的bug
6 years ago
ibuler 88a29c0a93 [Update] 增加手动结束非正常关闭的连接
6 years ago
老广 fe45d839fb
Dev2 (#1766)
6 years ago
ibuler 670c8a6d0b [Bugfix] 修复唯一认证
6 years ago
ibuler 75e67410cf [Bugfix] 修复批量更新资产和用户的bug
6 years ago
ibuler c9d137bc20 [Update] 修改Mixin,允许org_id不填写
6 years ago
ibuler bb6394150d [Update] 修改批量更新资产的bug
6 years ago
ibuler b7fcf80fc5 [Update] 优化用户资产页面
6 years ago
ibuler de3695bf97 Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler 7c814080b2 [Update] 优化一些api
6 years ago
BaiJiangJie f5531b6065 [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug; (#1644)
6 years ago
ibuler 1a05dab572 [Update] 修改user api权限
6 years ago
ibuler b8ecb6f81d [Update] 用户修改
6 years ago
ibuler 183ff09530 [Update] 修改token返回
6 years ago
BaiJiangJie 485a178c0a [Update] 创建/更新用户的role选项;密码强度提示信息中英文; (#1623)
6 years ago
ibuler 672dd66023 [Bugfix] 修复一些bug
6 years ago
ibuler 23815f87c5 [Update] 升级url
6 years ago
ibuler 8c12c382a5 [Bugfix] 修复merge带来的问题
6 years ago
ibuler 2ecfecb06f [Update] Merge with dev
6 years ago
BaiJiangJie e7c530d8e6 [Update] 添加授权规则org (#1580)
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
ibuler b5f6f80ae6 [Update] 修改Node
6 years ago
ibuler bbe4080008 [Update] 删掉Premiddleware
6 years ago
ibuler b6523da603 [Update] 修改外键为org_id
6 years ago
ibuler c24f1a0517 [Update] 修改约束
6 years ago
wojiushixiaobai e1fff18ce3 替换淘宝IP查询接口
6 years ago
ibuler c94d018d7e [Bugfix] 修复转义引起的中文乱码问题
6 years ago
ibuler fd5f562cbf [Update] stash it
6 years ago
老广 1a49cf4d9c
Merge pull request #1532 from wojiushixiaobai/dev
6 years ago
ibuler 4d1da56872 [Update] 修改asset api
6 years ago
BaiJiangJie 09e636495e [Update] 模版删除unblock的id属性
6 years ago
BaiJiangJie 812078331e [Update] 添加解除用户登录限制功能
6 years ago
wojiushixiaobai 696589a3cf 修改url
6 years ago
ibuler 5648dcd7e7 [Update] 修改用户view
6 years ago
ibuler 28e47f33c1 [Update] 修改一些逻辑
6 years ago
BaiJiangJie 1182313c1a [Update] 取消系统用户-清除认证信息,取消-网关rdp协议认证信息,添加用户unblock功能
6 years ago
ibuler 7412bdcba7 [Update] 完成基本框架
6 years ago
老广 df95c93bb1
Merge pull request #1503 from jumpserver/update_loginlog
6 years ago
ibuler b6cd4a20c5 [Bugfix] Data table xss attack
6 years ago
BaiJiangJie 5d800fa629 [Update] 修改coco端登录限制次数逻辑
6 years ago
BaiJiangJie bd14266abd [Update] 修改登录日志模型类的MFA字段默认状态为-
6 years ago
BaiJiangJie 512fc8f8f0 [Update] 优化登录失败次数限制的逻辑,并添加系统安全设置选项
6 years ago
BaiJiangJie ff9b1a887f [Update] 添加用户登录失败次数限制
6 years ago
BaiJiangJie 43370c547a [Update] 登录日志逻辑修改变量名
6 years ago
BaiJiangJie 2eda58eadd Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie e1be867913 [Update] 更新用户登录日志,记录登录失败日志并添加MFA启用状态信息
7 years ago
ibuler 4002289974 [Bugfix] 修复详情中删除时的bug
7 years ago
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
ibuler 3223d3b74d [Bugfix] 修复了一些显示上的bug
7 years ago
ibuler b2b123b41e [Bugfix] 用户添加报错
7 years ago
ibuler 7e23d2c234 [Bugfix] 修复重置密码bug
7 years ago
ibuler a4d02adb22 [Update] system user form add label
7 years ago
ibuler 72a82c41ee [Update] 修改 success message, 添加资产组时可以添加资产
7 years ago
ibuler 450a9495ec [Bug&Update] 以下bug和功能
7 years ago
ibuler c0829194dc [Update] 修改一些bug, 增加执行task的按钮
7 years ago
ibuler 07a70311df [Bugfix] 修复以下bug
7 years ago
ibuler 9a6bc9fec5 [Update] session添加登陆ip
7 years ago
ibuler 1888c698f1 [Bugfix] 修复一些bug
7 years ago
ibuler 28223421b1 [Bugfix] 修复一下bug
7 years ago
ibuler 3b6403b2f2 [Update] 修改一些翻译
7 years ago
ibuler c48531c586 [Update] 添加和修改部分翻译
7 years ago
ibuler 0916757eb8 [Bugfix] 修复一些bug
7 years ago
ibuler 0b299344a7 [Update] 修改database 表现
7 years ago
ibuler a755882100 [Bugfix] 修复打印中文报错异常
7 years ago
ibuler e0a3fafbd5 [Bugfix] 详见trello
7 years ago
ibuler 158678c2db [Bugfix] 修改bug,显示cluster
7 years ago
ibuler e20444983d [Bugfix] 修改html bug
7 years ago
ibuler 1c20f519a9 [Bugfix] 修改小的bug
7 years ago
ibuler 0848893f1e [Bugfix] 修复时间日期搜索的bug,select2模块自适应长度
7 years ago
ibuler 22b7b84a45 [Update] 修改创建默认集群,组等名称为Default
7 years ago
ibuler 6a6d0cf279 [Update] Change user model
7 years ago
ibuler f4beccddae [Update] 修改注册流程
7 years ago
ibuler d0ef1e715e [Add] Add initial migrations
7 years ago
ibuler bf9bb1b973 [Update] 修改ops task运行
7 years ago
ibuler 47040a61c8 [Bugfix] User first login
7 years ago
ibuler d33ae9d9d9 [Update] login add cookie test
7 years ago
ibuler d51b3eff6a [Update] 修改settings和配置文件
7 years ago
ibuler e1b23a7cb4 [Bugfix] 修复无法记录日志的bug
7 years ago
ibuler 76df1de634 [Bugfix] 修复一些明显的bug
7 years ago
ibuler b0eace6ad8 [Bugfix] 基本完成assets模块
7 years ago
ibuler b4e1ac1953 [Bugfix] 修复资产模块中一些bug
7 years ago
ibuler a308000d2e [Bugfix] 修改users模块一些bug
7 years ago
ibuler 08e1788426 [Feature] 打算拆分下载和上传为独立模块,时间有限暂时放弃
7 years ago
ibuler 18fbfb449d [Feature] 修改url pattern 精确匹配uuid
7 years ago
ibuler cb57002682 [Change] 去掉前端html中的hardcode 99991937
7 years ago
ibuler 722863428d [Feature] 添加context_processor
7 years ago
ibuler 99b4c66b5e [Feature] 添加signals 解耦代码
7 years ago
ibuler cbc000696e [Feature] 修改adminuser systemuser cluster及他们的关系
7 years ago
ibuler 18fd04d63c [Stash] Test case 通不过,import error
7 years ago
ibuler ec8106e43d [Feature] 完成登陆日志
7 years ago
ibuler a5f9735906 [Update] 更新index view
7 years ago
ibuler 61a8d95f46 [Change] Rename applications -> terminal
7 years ago
ibuler 19051d36dc [Update] 修改一些bug
7 years ago
ibuler 26607bc327 [Copyright] 修改copyrite
7 years ago
ibuler e7f38ec894 [Change] 全部使用uuid作为主键
7 years ago