Commit Graph

3166 Commits (91b3b7ce69d6495a832e668d8d321bd3fe325263)
 

Author SHA1 Message Date
老广 91b3b7ce69
Merge pull request #1515 from wstart/master
6 years ago
wstart fd3df81a64
Update api.py
6 years ago
ycfuck 72517a2c72 授权页面分页
6 years ago
老广 76be054fcb
Merge pull request #1502 from Nevss/patch-1
6 years ago
ycfuck eaefb5c669 Revert "资产授权页面增加分页"
6 years ago
林峰任1049851 0ddb9476ba 资产授权页面增加分页
6 years ago
Nevss 7a7c6d40df
update docker-guacamole version to latest
6 years ago
老广 e7a731fae9
Merge pull request #1417 from jumpserver/dev
7 years ago
ibuler 73f9f54620 [Update] 修改版本号
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
BaiJiangJie ee35ca3643 [Feature] 增加功能,安全设置(全局MFA设置,密码强度校验)
7 years ago
老广 99c4875dd7
Merge pull request #1395 from jumpserver/dev
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
老广 a3f1622a50
Merge pull request #1371 from jumpserver/fix_asset_count
7 years ago
老广 0021f2e5e1
Merge pull request #1377 from wojiushixiaobai/dev
7 years ago
wojiushixiaobai dbcad47214 更新升级文档
7 years ago
wojiushixiaobai 6c384b49fe 修改脚本
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