Commit Graph

1117 Commits (bbe4080008ba1fb18749752daaaa012d0d5591f7)

Author SHA1 Message Date
老广 8a5e1b8223
Merge pull request #1407 from jokimina/dev_for_pr
7 years ago
ibuler 5579d3f0de [Update] 修复测试网关连接known_host问题
7 years ago
BaiJiangJie 221fae5875 [Bugfix] 修复用户失效日期截止后还可登录问题
7 years ago
xiaodong f4084c800a [Bugfix] 更新用户信息时不填密码也会触发密码规则验证,导致无法更新
7 years ago
BaiJiangJie c6a8967376 [Update] 删除多余代码
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 30afcecf59 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 80d11bbaab [Update] 删除user group继承的抽象类
7 years ago
ibuler 58e36b5f63 [Bugfix] 暂时还不能删除Tree这个类
7 years ago
ibuler 2c413e8d51 [Bugfix] 修复权限查看引起的bug
7 years ago
xiaodong 6b2a38c78d remove useless image
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 e7c7c3a7a8 Merge branch 'dev' into perm_tree
7 years ago
ibuler 54efc88799 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler a9d1538135 [Update] 修改一些方法
7 years ago
ibuler f8ff223f90 [Update] 更新api和model方法
7 years ago
BaiJiangJie 526943a041 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie e9d0104a69 Merge branch 'dev' of github.com:jumpserver/jumpserver into fix_asset_count_dev
7 years ago
BaiJiangJie 7c694c6885 [Update] 合并Node的parent.setter方法,修改node_fake的parent逻辑
7 years ago
ibuler 69e5ab438a [Bugfix] 解决发送邮件重启的问题
7 years ago
ibuler 757a31a52f [Update] 优化asset api, 获取时增加prefetch
7 years ago
BaiJiangJie 5b53cfb4dd [Update] 修改资产树节点(数量)总显示此节点下的资产总数
7 years ago
ibuler b0710c42b0 Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangJie 3a2973023c [Update] 修改资产树和资产列表数量显示(游离资产)
7 years ago
ibuler 47397d2308 [Bugfix] 修复网关测试连接需要ssh信任key的问题
7 years ago
ibuler 7b57d24dc9 [Update] 优化代码
7 years ago
ibuler ffabef0040 Merge branch 'large' into dev
7 years ago
ibuler 0b4df78393 [Update] 修改permistion utils优化返回的属性
7 years ago
BaiJiangJie 2fab69ca61 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie f9ab0abc37 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
ibuler 0bc86543b5 [Update] 修改用户组详情显示授权资产的bug
7 years ago
ibuler fc2a44621b [Bugfix] 修复右击位置不对的bug
7 years ago
ibuler 9b4b9e6900 [Update] 发送邮件增加用户名显示
7 years ago
ibuler 22a84d57ca [Update] 修改树形结构
7 years ago
ibuler 3f4b5ad465 [Update] Merge
7 years ago
ibuler a96bda8ca9 [Update] 修改树形结构
7 years ago
ibuler b9d0d89f66 [Update] 更改版本好
7 years ago
ibuler 5a7192e035 [Update] 修改心跳bug
7 years ago
BaiJiangJie de2416b173 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie 486793ddcd [Bugfix] 修复取消LDAP认证不成功bug
7 years ago
ibuler c529061ee0 [Bugfix] 修复授权uitls的错误
7 years ago
ibuler fe52c57a11 [Bugfix] 修复授权uitls的错误
7 years ago
ibuler f8384973a1 [Update] 调整Luna的树形结构
7 years ago
ibuler d615eb80b5 [Update] 优化使用storage sdk
7 years ago
ibuler 4b7af1457d [Update] 系统用户新增清除认证的操作
7 years ago
BaiJiangJie c1db33713f [Bugfix] 修复资产授权树root节点bug
7 years ago
老广 e66cfc2e13
Merge pull request #1333 from jumpserver/update_rdp
7 years ago
BaiJiangJie ac67c231fc [Update] 修改前端rdp相关配置的选择逻辑
7 years ago
BaiJiangJie 599431f402 [Update] 去掉添加windows相关配置时的一些无用功能,网域网关/会话列表
7 years ago
ibuler ed18cb317f [Bugfix] 修复创建node api的bug
7 years ago
ibuler cb4afabc91 [Bugfix] 修复创建node节点的问题,修复windows session的问题
7 years ago
BaiJiangJie 718715cc6d [Update] 创建系统用户选择rdp协议,去掉相关配置的一些无用功能
7 years ago
BaiJiangjie 38f8c5bb72 [Bugfix] 修复资产树节点移动,资产授权树节点下的资产显示问题
7 years ago
ibuler ebc1b4975a [Update] 自动生成秘钥去掉密码
7 years ago
ibuler 2da87151ed Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangjie cbc4a0a97b [Bugfix] 资产树节点Node Value值校验修改异常抛出为400
7 years ago
ibuler 0031d025aa [Bugfix] 修复上次提交引起的bug
7 years ago
BaiJiangjie 2583c0b26c [Bugfix] 资产树节点,取消model value unique,并添加唯一性校验,修改新增节点计数器规则
7 years ago
ibuler ebef4f254a Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 116a04da68 Merge branch 'term_js' into dev
7 years ago
ibuler 7de6af89ad [Update] 使用xterm.js替换原来的term.js
7 years ago
ibuler 8e74a04282 [Update] 修改一些bug
7 years ago
BaiJiangjie 3af01d6a31 [Update] 添加功能:资产树显示全部/只显示当前节点下的资产;修复资产树节点主机数与列表显示不一致
7 years ago
老广 2a8358b1aa
Bugfix ldap option (#1300)
7 years ago
ibuler 0a9af98729 [Bugfix] 修复ldap参数改错引起的bug
7 years ago
老广 e9b86ca668
[Update] 修改replay api (#1298)
7 years ago
ibuler d2b0aba620 [Update] 修改replay api
7 years ago
ibuler 7f670ab709 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler 941e55bdec [Update] 添加ldap auth timeout时间
7 years ago
老广 01d136cf1e
Perms return (#1293)
7 years ago
ibuler 4ed9e11090 [Update] 修改用户名校验规则
7 years ago
ibuler cde2e7adb0 [Update] 修改授权列表创建api,返回id
7 years ago
ibuler e291ca9057 [Update] 默认关闭定时任务
7 years ago
老广 1edfb1cec4
[Update] 修改版本号 (#1282)
7 years ago
ibuler 0b89ff17fd [Update] 修改版本号
7 years ago
老广 c0bbda9769
[Update] 暂时隐藏rdp的session,等待windows录像播放 (#1276)
7 years ago
老广 55096f9ad5
Bugfix perm asset not active (#1273)
7 years ago
老广 494cd760d7
Trans change (#1272)
7 years ago
老广 6f494ef09c
校验用户名长度和特殊字符 (#1271)
7 years ago
老广 b074bd8fbd
Merge pull request #1267 from jumpserver/bugfix_user
7 years ago
ibuler 5103dab72e [Bugfix] 解决上次引入的bug
7 years ago
ibuler 16aa42a861 [Bugfix] 修复授权树列表和资产树列表不同的bug
7 years ago
BaiJiangjie 0962a16b22 [Bugfix] 修复首次登录条款问题及引导页面MFA配置问题
7 years ago
ibuler d5debc375e [Bugfix] 修复命令搜索异常bug
7 years ago
ibuler 40a0c4597b Merge remote-tracking branch 'github/dev' into dev
7 years ago
BaiJiangjie ea2863a51b [Update] 创建用户、资产成功的提示信息可关闭
7 years ago
BaiJiangjie 102e1ca97c [Bugfix] 创建资产,资产系统置上,RDP:3389
7 years ago
BaiJiangjie 2823d02763 [Bugfix] 修复资产列表导入,资产id问题
7 years ago
BaiJiangjie c37414045b [Bugfix] 修改用户列表导出,默认导出全部用户
7 years ago
BaiJiangjie 784bec42ff [Update] 修改用户登录,首次登录不需要验证码,登录失败时需要验证码校验
7 years ago
ibuler 9a3d0732bc [Update] 更新授权代码
7 years ago
ibuler 20a7247b16 Merge remote-tracking branch 'github/dev' into dev
7 years ago
ibuler df60981eb4 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
7 years ago
老广 7aa2bb06e8
Merge pull request #1228 from wojiushixiaobai/dev
7 years ago