Commit Graph

3347 Commits (5b93a1a0a582cc3cd446aab958eedadee0d767bc)
 

Author SHA1 Message Date
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
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
老广 d9d82cea5e
Merge pull request #1370 from jumpserver/fix_asset_count
7 years ago
老广 4f521e5a94
Merge pull request #1369 from gengkeye/master
7 years ago
BaiJiangJie 3a2973023c [Update] 修改资产树和资产列表数量显示(游离资产)
7 years ago
oldseven 4f28f85410 #1368
7 years ago
oldseven a1905ecfdb Merge branch 'master' of https://github.com/jumpserver/jumpserver
7 years ago
ibuler 47397d2308 [Bugfix] 修复网关测试连接需要ssh信任key的问题
7 years ago
ibuler 7b57d24dc9 [Update] 优化代码
7 years ago
老广 f2216274c5
Merge pull request #1366 from jumpserver/dev
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
老广 7987056b12
Merge pull request #1365 from jumpserver/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
老广 62c114d9c4
Merge pull request #1362 from jumpserver/dev
7 years ago
ibuler 22a84d57ca [Update] 修改树形结构
7 years ago
ibuler 3f4b5ad465 [Update] Merge
7 years ago