Commit Graph

3460 Commits (f87e08efffb9095971692c60e898ac2489d47c55)
 

Author SHA1 Message Date
BaiJiangJie f87e08efff [Update] 添加deb依赖,完善用户登录失败日志,修复资产标签bug (#1983)
6 years ago
BaiJiangJie 82d866db7d [Update] 添加用户授权资产列表页的分页,搜索,排序 (#1963)
6 years ago
老广 ba0d822734
Merge pull request #1971 from waiwaiku/master
6 years ago
fangjian c8568eb244 修复子用户资产列表点击无法收起
6 years ago
老广 354b728f75
Merge pull request #1945 from jumpserver/dev_storage
6 years ago
老广 ce553710ba
Merge pull request #1958 from jumpserver/dev_bugfix_ops
6 years ago
BaiJiangJie 4f806f11f2 [Update] 修改命令/录像存储,创建/删除API的权限为SuperUser
6 years ago
老广 0a94a346a0
Merge pull request #1946 from jumpserver/dev_bugfix_perms
6 years ago
老广 d8afe72d4c
Merge pull request #1947 from jumpserver/dev_user_paging
6 years ago
BaiJiangJie e2072a1e02 [Update] 修复组织管理员刷新硬件信息,获取资产为None(使用fullname)和查看celery log 403问题
6 years ago
BaiJiangJie cc387bf511 [Update] 用户列表页,添加分页,搜索
6 years ago
BaiJiangJie 5c002e91ee [Update] 修改获取资产distinct
6 years ago
BaiJiangJie 41a8831034 [Bugfix] 修复授权规则下Default节点下的资产不显示
6 years ago
BaiJiangJie ebd92c79c7 [Update] 修改翻译小细节
6 years ago
BaiJiangJie 6278900201 [Update] 创建es命令存储,添加提示信息
6 years ago
BaiJiangJie 1f502e02c7 [Update] 修改settings为common_settings
6 years ago
BaiJiangJie cdf8398169 [Update] 修复创建es命令存储校验有效性异常
6 years ago
BaiJiangJie 1bfef829f3 [Update] 修改terminal表单获取storage, 删除无用代码
6 years ago
BaiJiangJie cc0cf8ed1c Merge branch 'dev' into dev_replay
6 years ago
BaiJiangJie 2791213844 [Update] 更新storage翻译
6 years ago
BaiJiangJie 284e8be45c [Update] 修改系统设置-命令/录像存储页面(添加,删除)
6 years ago
老广 76109f1808
Merge pull request #1938 from jumpserver/dev
6 years ago
ibuler 54b6e06d1f [Update] 暂时不支持上传目录
6 years ago
ibuler 5c30c76ea3 [Update] 修改jms-storage版本
6 years ago
老广 94b5eb8685
Merge pull request #1929 from jumpserver/dev
6 years ago
ibuler c9f4b104c7 Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler 3bf1c036c5 [Bugfix] 修改sshpubkey库版本
6 years ago
老广 09fbd3a5ab
Merge pull request #1922 from jumpserver/dev
6 years ago
ibuler ebecd00581 [Update] 修改优先级逻辑
6 years ago
ibuler 143fa060d1 [Update] 修改节点信息
6 years ago
ibuler 2c18a27e3a [Update] 修改节点创建规则
6 years ago
ibuler 910dd4e593 [Update] 修改节点生成规则
6 years ago
ibuler 11aefa479b [Bugfix] 修复common设置问题
6 years ago
ibuler abc56016f2 Merge remote-tracking branch 'github/dev' into dev
6 years ago
老广 f44db2a25b
Merge pull request #1916 from jumpserver/dev_tag_filter
6 years ago
BaiJiangJie 3fa6807837 [Update] 添加(减法)标签过滤器
6 years ago
ibuler 2c4195d619 Merge remote-tracking branch 'github/dev' into dev
6 years ago
老广 265ef0c8ac
Merge pull request #1913 from jumpserver/dev_requirements
6 years ago
BaiJiangJie 0b0b06a5c2 [Update] 更新requirements-aliyun
6 years ago
ibuler d77ba1d5ea Merge remote-tracking branch 'github/dev' into dev
6 years ago
老广 a3bd7cee80
Merge pull request #1912 from jumpserver/dev_cloud_manager
6 years ago
BaiJiangJie 8d73cd43e1 Merge branch 'dev' into dev_cloud_manager
6 years ago
BaiJiangJie 7e3fd73ae5 [Update] 修改文案
6 years ago
ibuler 70960d2ae4 Merge remote-tracking branch 'github/dev' into dev
6 years ago
老广 d2c574fe9d
Merge pull request #1910 from jumpserver/dev_cloud_manager
6 years ago
BaiJiangJie a70fcf057b [Update] 修改js,添加3级菜单active属性
6 years ago
ibuler f37582ec53 [Update] 用户导航加上文件管理
6 years ago
BaiJiangJie 29b87c40fe [Update] 修改云管理模块-文案
6 years ago
BaiJiangJie 1ec77c5bb9 [Update] 添加3级导航菜单-云管理模块
6 years ago
BaiJiangJie 21c71aba93 [Update] Merge branch dev_cloud_manager (baijiangjie_local) to dev
6 years ago