Commit Graph

3166 Commits (91b3b7ce69d6495a832e668d8d321bd3fe325263)
 

Author SHA1 Message Date
BaiJiangjie cbc4a0a97b [Bugfix] 资产树节点Node Value值校验修改异常抛出为400
7 years ago
ibuler 0031d025aa [Bugfix] 修复上次提交引起的bug
7 years ago
BaiJiangjie 4c53eebdbe Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
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
老广 84d3fa6db0
Merge pull request #1303 from jumpserver/update_asset_tree
7 years ago
ibuler e2fa492987 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
老广 5bfc34a9ea
Merge pull request #1301 from jumpserver/dev
7 years ago
老广 869a84964d
Merge branch 'master' into dev
7 years ago
老广 2a8358b1aa
Bugfix ldap option (#1300)
7 years ago
ibuler 0a9af98729 [Bugfix] 修复ldap参数改错引起的bug
7 years ago
老广 dfd98f8aea
Dev (#1299)
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
老广 e630321e55
Perms return (#1293) (#1294)
7 years ago
老广 01d136cf1e
Perms return (#1293)
7 years ago
ibuler 4ed9e11090 [Update] 修改用户名校验规则
7 years ago
ibuler cde2e7adb0 [Update] 修改授权列表创建api,返回id
7 years ago
zhangbohan 7a27021d3d 图片调小一些
7 years ago
zhangbohan 966123e4c6 README功能说明修改
7 years ago
ibuler e291ca9057 [Update] 默认关闭定时任务
7 years ago
老广 84003b777c
Merge pull request #1283 from jumpserver/dev
7 years ago
老广 1edfb1cec4
[Update] 修改版本号 (#1282)
7 years ago
ibuler 0b89ff17fd [Update] 修改版本号
7 years ago
老广 9fa6b3e387
[Update] 暂时隐藏rdp的session,等待windows录像播放 (#1276) (#1278)
7 years ago
老广 c0bbda9769
[Update] 暂时隐藏rdp的session,等待windows录像播放 (#1276)
7 years ago
oldseven 0d8a600277 #1258 bug fix: 阿里云OSS录像无法回放问题
7 years ago
老广 d7a32120ba
Merge pull request #1274 from jumpserver/dev
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
wojiushixiaobai e476cab2a1 更新自动升级脚本 (#1250)
7 years ago
老广 cc67fcb53b
Merge pull request #1269 from jumpserver/dev
7 years ago
老广 b074bd8fbd
Merge pull request #1267 from jumpserver/bugfix_user
7 years ago
老广 627582233b
Merge pull request #1268 from jumpserver/bufix_for_perm_tree
7 years ago
ibuler 5103dab72e [Bugfix] 解决上次引入的bug
7 years ago
老广 43c13355f2
Merge pull request #1266 from jumpserver/dev
7 years ago
老广 59eb1f8e3e
Merge pull request #1265 from jumpserver/bufix_for_perm_tree
7 years ago
ibuler 16aa42a861 [Bugfix] 修复授权树列表和资产树列表不同的bug
7 years ago
BaiJiangjie 0962a16b22 [Bugfix] 修复首次登录条款问题及引导页面MFA配置问题
7 years ago
老广 787be3ff7a
Merge pull request #1248 from jumpserver/dev
7 years ago
ibuler d5debc375e [Bugfix] 修复命令搜索异常bug
7 years ago
ibuler 40a0c4597b Merge remote-tracking branch 'github/dev' into dev
7 years ago
老广 5c17b1a7f7
Merge pull request #1240 from jumpserver/dev
7 years ago