Commit Graph

3734 Commits (324cf2469f1e7f15a58477ba42954c7fe1a79a63)
 

Author SHA1 Message Date
BaiJiangJie 2eda58eadd Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
6 years ago
BaiJiangJie e1be867913 [Update] 更新用户登录日志,记录登录失败日志并添加MFA启用状态信息
6 years ago
ibuler 01afcf701c Merge remote-tracking branch 'origin/dev' into dev
7 years ago
ibuler 4002289974 [Bugfix] 修复详情中删除时的bug
7 years ago
ibuler ef9e03c7ed Merge remote-tracking branch 'github/dev' into dev
7 years ago
老广 442d4e727a
Merge pull request #1492 from jumpserver/feature_telnet
7 years ago
BaiJiangJie 3993797527 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie f1f06491d6 [Feature] 添加功能, 支持 telnet server.
7 years ago
ibuler eb95a0a912 [Bugfix] 修改下载录像没有目录的bug
7 years ago
ibuler 401a7f88a8 [Update] 更新依赖storage的版本
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
wojiushixiaobai 2950613b69 修改提示文字
7 years ago
老广 6fa0562d7a
Merge pull request #1441 from chnliyong/master
7 years ago
老广 ef22d33afa
Merge pull request #1161 from Nidhoggur1993/dev
7 years ago
老广 86404db6c7
Merge pull request #1414 from leostudio/dev
7 years ago
老广 fdf2807d9b
Merge pull request #1419 from jumpserver/feature_login_mode
7 years ago
BaiJiangJie 2e6d238c76 [Bugfix] 修复系统用户选择手动登录,ssh命令行连接获取不到login_mode字段值
7 years ago
BaiJiangJie f5a4370b80 [Update] 系统用户选择手动登录,取消自动推送
7 years ago
BaiJiangJie db2273ef27 Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
7 years ago
BaiJiangJie dd07fa678f [Update] 添加功能,系统用户选择登录模式(自动/手动登录)
7 years ago
老广 e7a731fae9
Merge pull request #1417 from jumpserver/dev
7 years ago
ibuler 73f9f54620 [Update] 修改版本号
7 years ago
梁志艳 a2f23e9681 新增Redis DB配置
7 years ago
ibuler dbc471c195 [Bugfix] 修复小错误
7 years ago
ibuler 4c8eb4a94b Merge remote-tracking branch 'github/dev' into dev
7 years ago
老广 9946c4612f
Merge pull request #1409 from jokimina/dev_for_pr2
7 years ago
老广 8a5e1b8223
Merge pull request #1407 from jokimina/dev_for_pr
7 years ago
老广 06ce098e00
Merge pull request #1408 from jumpserver/bugfix_user_date_expired
7 years ago
ibuler 5579d3f0de [Update] 修复测试网关连接known_host问题
7 years ago
xiaodong 1ef582e9ac [Update]删除示例配置中未使用的BROKER_URL配置
7 years ago
BaiJiangJie 221fae5875 [Bugfix] 修复用户失效日期截止后还可登录问题
7 years ago
xiaodong f4084c800a [Bugfix] 更新用户信息时不填密码也会触发密码规则验证,导致无法更新
7 years ago
老广 5464ac8167
Merge pull request #1397 from jumpserver/feature_security_setting
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
老广 283b1c1d64
Merge pull request #1403 from jumpserver/dev
7 years ago
ibuler c8c0479ce5 [Update] 修改清理用户组脚本
7 years ago
老广 2a30204c4e
Merge pull request #1401 from jumpserver/dev
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
老广 17de014ee9
Merge pull request #1400 from jokimina/dev_for_pr
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