Commit Graph

422 Commits (85699106581e473aff0e43f516f31ba37d5c7e1d)

Author SHA1 Message Date
BaiJiangJie 4254775149
Bugfix (#3065)
5 years ago
老广 bb235f3e88
[Update] 修改获取资产时使用in (#3053)
5 years ago
BaiJiangJie a7066a5c85 [Update] htmlEscape
5 years ago
BaiJiangJie 69841a4198 [Feature] 资产授权规则页面添加刷新授权缓存按钮 (#3032)
5 years ago
BaiJiangJie 31c220605e [Update] 授权资产变动过期所有缓存(cache_key和cache_meta_key)
5 years ago
老广 5db704f793
Bugfix (#3007)
5 years ago
老广 a8af4e8804
Perm for assets (#3002)
5 years ago
老广 8f5e91bc34
[Update] 授权显示节点下所有的资产 (#3001)
5 years ago
ibuler 49ccba85a2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 9903adf71b [Update] 修改cache policy 开关
5 years ago
BaiJiangJie ce1bb66f23 [Update] 解决授权资产页面资产重复的问题
5 years ago
ibuler 8bb82d168b Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 1ef16d55ef [Update] 优化详情页获取nodes
5 years ago
八千流 ea11aa4abb [Bugfix] 修改排序,去掉标签 (#2982)
5 years ago
ibuler 1af40b6ca0 [Update] 支持etag
5 years ago
老广 8ed3bb8586
Bugfix (#2980)
5 years ago
BaiJiangJie 3451c2b418
[Update] 解决授权资产显示禁用资产的问题 (#2975)
5 years ago
jym503558564 1993dba2e0 [Bugfix] 修复资产授权详情页 删除弹出框的权限名显示不对
5 years ago
BaiJiangJie f19f28cf3e [Update] 获取用户授权资产时只返回资产协议支持的系统用户
5 years ago
BaiJiangJie a884d0d531
[Bugfix] 修改Bug (#2952)
5 years ago
老广 ab9744d529
Bugfix (#2944)
5 years ago
BaiJiangJie 13ca70b328
Merge pull request #2942 from jumpserver/remote_app_perms_api
5 years ago
BaiJiangJie 4ba306f597 [Bugfix] 修改授权规则详情用户组数量显示错误
5 years ago
jym503558564 cc7ce04402 [Update] 创建/更新 远程应用授权 使用api
5 years ago
老广 55b049c86a
Bugfix (#2938)
5 years ago
BaiJiangJie e5bdceed58 [Update] 优化授权规则资产列表页面 (#2937)
5 years ago
BaiJiangJie 5f9f970abd
Perf (#2929)
5 years ago
ibuler 533f32ed48 [Update] 修改授权页面不显示资产的问题
5 years ago
老广 6330f2d42d
[Update] 修改获取禁用资产的问题 (#2901)
5 years ago
八千流 033b44f9d2 [Bugfix] 修复禁用的资产在luna页面显示的问题 (#2900)
5 years ago
BaiJiangJie a8c95093c4 [Update] 修复Action转化的bug
5 years ago
BaiJiangJie e8f68eb6c1
[Update] 解决授权规则actions字段为空列表或只填一个action的问题 (#2888)
5 years ago
老广 59927ffcd9
Merge pull request #2889 from jumpserver/perf
5 years ago
ibuler aac5eed9fc [Update] 去掉debug
5 years ago
ibuler 3c825440f0 [Update] 优化协议
5 years ago
BaiJiangJie 0512988979 [Update] 修复授权规则更新失败的bug
5 years ago
BaiJiangJie c52ea089da [Update] 用户授权资产树进行排序
5 years ago
ibuler 1472f0437f [update] 修改一些性能问题
5 years ago
ibuler 858c7df86b Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
5 years ago
ibuler 2d07eeb16b [Update] 修改去掉一些print
5 years ago
BaiJiangJie 2eb942a947 [Update] 修改Permission响应层缓存key
5 years ago
BaiJiangJie 28ec1eb0ad
[Update] 解决用户授权资产/节点为空时,前端构建资产授权树的bug (#2874)
5 years ago
ibuler e7d600ee50 Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
5 years ago
ibuler b9f82fd0ac [Update] 优化命令记录列表
5 years ago
BaiJiangJie 186c22decd [Update] 资产授权Model模块添加导入
5 years ago
BaiJiangJie 9a20ec9c09 Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
5 years ago
ibuler 1b44172bc5 [Update] 修改migrations
5 years ago
BaiJiangJie bbf5e28571 Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
5 years ago
ibuler 7bf1555c67 [Update] 修改Minxs
5 years ago
BaiJiangJie 003601bbdd [Bugfix] 解决进入授权详情页的资产管理页面bug
5 years ago
ibuler 58182712a2 Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix
5 years ago
ibuler 930eb1d2e1 [Update] 修正migrations
5 years ago
BaiJiangJie 98260b5b52 [Update] 修改用户授权资产API返回的queryset
5 years ago
ibuler 79554b47d3 [Update] Merge
5 years ago
ibuler 31d2f2a799 [Update] 去掉原来批量的view
5 years ago
BaiJiangJie 1983533e76 [Bugfix] 修改校验系统用户资产动作权限的API逻辑
5 years ago
ibuler e4880a247f [Update] 修改action
5 years ago
ibuler e43da3d6e1 ipython
5 years ago
ibuler b064be3ec0 [Bugfix] 修复用户页面不走cache的bug
5 years ago
ibuler c33084421d [Update] Debug cache
5 years ago
ibuler 7f7853dbc9 Merge remote-tracking branch 'origin/bugfix' into bugfix
5 years ago
ibuler 4d3856975b [Update] 修改一些bug
5 years ago
BaiJiangJie 8905c27b86 [Update] 修改upgrouped_node key的获取(解决操作日志中出现coco/gua的问题)
5 years ago
ibuler 034fee0f75 [Update] 修改用户有权限的资产
5 years ago
ibuler d41d58e30f [Update] 修改serializer
5 years ago
ibuler ae690050e7 Stash
5 years ago
ibuler 8f699fa366 [Update] 修改Permission
5 years ago
ibuler 8e9b3f134b [Update] 修改permission actions
6 years ago
ibuler 1a0ff422fe [Update] 优化树结构
6 years ago
BaiJiangJie 320b17c8db [Update] Merge local branch dev to master
6 years ago
BaiJiangJie ed8ae300ae
[Update] 修改org.middleware自动切换组织的bug (#2829)
6 years ago
BaiJiangJie 8bead0a33b
[Update] Merge master_bugfix to dev_bugfix (#2817)
6 years ago
BaiJiangJie 50443de888 [Bugfix] 修复普通用户被授权的RemoteApp列表加载为空的bug
6 years ago
老广 10616b8d9e
[Update] serializer mixin继承 (#2810)
6 years ago
八千流 8adaf629b4 [Update] 增加审计员权限控制 (#2792)
6 years ago
BaiJiangJie c71f417ebf
[Update] 用户授权相关API,如果需要切换到root org (#2803)
6 years ago
BaiJiangJie 795807ddbe
[Bugfix] 和资产相关的Serializer添加protocols字段; (#2800)
6 years ago
老广 ddafd7ba26 Dev ansible windows 2 (#2783)
6 years ago
ibuler 3e86c07411 [Update] 修改授权节点显示
6 years ago
老广 44d33f70e4 [Update] 修改授权树显示策略 (#2784)
6 years ago
八千流 c300f0b549 [Update]优化用户页面的资产标签过滤功能 (#2781)
6 years ago
ibuler 505b801423 [Update] 当授权规则发生改变时刷新所有缓存
6 years ago
BaiJiangJie 3f3cc6359a
[Bugfix] 修复RemoteApp用户列表显示Bug (#2761)
6 years ago
BaiJiangJie 9f67daeb1e [Update] 优化AssetPermissionUtil动态设置系统用户actions属性逻辑 (#2739)
6 years ago
BaiJiangJie b18ca8c94f [Update] 校验用户对RemoteApp权限API添加权限控制 (#2715)
6 years ago
BaiJiangJie 84610f2a2c [Bugfix] 修改PermsModel抽象后的objects-bug (#2713)
6 years ago
BaiJiangJie d906df5b00 [Update] 抽象BasePermission (#2710)
6 years ago
BaiJiangJie 1eca517978 [Feature] 添加功能 RemoteApp (#2706)
6 years ago
BaiJiangJie b7ad6cfe62 [Update] 防止 XSS (#2633)
6 years ago
BaiJiangJie aabcf7f31c [Update] 授权列表下拉信息添加action字段 (#2618)
6 years ago
BaiJiangJie f235e20153 [Feature] 授权规则添加 actions 选项,控制用户对资产的操作行为 (#2610)
6 years ago
ibuler 6e7446f530 [Update] 增加task最大允许事件,并设置命令最大运行时间为60s
6 years ago
ibuler afe9471aa2 [Update] 更新缓存机制
6 years ago
老广 324cf2469f
Bugfix (#2506)
6 years ago
ibuler 8694511d86 [Update] 完成
6 years ago
ibuler 58c4a46f6e [Update] 用户权限增加cache
6 years ago
ibuler dfd26d88d4 [Update] 用户资产添加缓存
6 years ago
ibuler cd6bb848e9 [Update] Squash table
6 years ago
ibuler 202aba048b [Update] 修改用户页面授权资产
6 years ago
老广 176052e8e9
[Update] 权限页面增加过滤规则 (#2349)
6 years ago
BaiJiangJie 76a08c9039 [Bugfix] 修复创建/更新 Perms 时,名称重复不提示错误信息的问题 (#2272)
6 years ago
老广 a990098744
[Update] 优化资产选择 (#2267)
6 years ago
老广 7ff39259af
Required opt (#2246)
6 years ago
老广 332be54b46
Vnc (#2226)
6 years ago
老广 fe7c3c29ad
[Update] 优化授权协议, 支持vnc (#2220)
6 years ago
老广 b3079a4a9b
[Update] Add index (#2208)
6 years ago
ibuler 179018bf67 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
6 years ago
ibuler 583214e91a [Update] 优化获取授权资产api
6 years ago
BaiJiangJie fb44ef0986 [Bugfix] 修复 资产授权/标签 选择资产时,input框内的资产和弹出资产tabl显示不一致的bug (#2205)
6 years ago
老广 517a27ea33
Node asset amount (#2191)
6 years ago
ibuler 84f52eb337 [Update] 修改api
6 years ago
老广 9c0f00f625
[Update] 修改命令执行 (#2148)
6 years ago
BaiJiangJie 18e590effd [Bugfix] 修复创建授权规则,选择资产导致其他输入框清空的bug - select2 (#2141)
6 years ago
老广 3d13f3a17d
Command (#2134)
6 years ago
BaiJiangJie 8f479e364b [Update] 修复小细节 (#2111)
6 years ago
老广 16cc4a0f4e
[Update] 修改settings配置 (#2067)
6 years ago
ibuler c9aab608a9 [Bugfix] 修复luna不显示多组织资产的问题
6 years ago
ibuler d50ad66b78 [Update] 维护统一的migrations
6 years ago
ibuler 1fcb272ddc [Bugfix] 修复coco tree失败的问题,不应该过滤没有asset的node
6 years ago
ibuler b577c626f7 [Bugfix] 修复luna取到协议不同的系统用户
6 years ago
ibuler e38d089056 Merge remote-tracking branch 'github/dev' into dev
6 years ago
BaiJiangJie f9e9bf0b2d [Update] 更新用户/授权规则过期时间精确到min (#1993)
6 years ago
BaiJiangJie 82d866db7d [Update] 添加用户授权资产列表页的分页,搜索,排序 (#1963)
6 years ago
ibuler 6e19b9d5bc [Update] Luna支持异步加载
6 years ago
ibuler ebecd00581 [Update] 修改优先级逻辑
6 years ago
ibuler 3ce9d01b6d [Bugfix] 修复coco无法查看资产的bug
6 years ago
ibuler b54afbe7bb [Bugfix] 修复组织管理员无法查看用户授权的bug
6 years ago
ibuler c78107f62f [Bugfix] Remote datepicker bug
6 years ago
ibuler 6dc2272a26 [Update] 修复无法取消授权资产的前端bug
6 years ago
老广 fe45d839fb
Dev2 (#1766)
6 years ago
ibuler e59b95e97a Merge remote-tracking branch 'github/dev' into dev
6 years ago
ibuler 6b86b8b485 [Bugfix] 修复资产数量不对的bug
6 years ago
ibuler 3f049440b7 [Bugfix] 修复可能引起的创建外键失败
6 years ago
老广 d5451a482a
Dev (#1646)
6 years ago
ibuler b7fcf80fc5 [Update] 优化用户资产页面
6 years ago
ibuler 7c814080b2 [Update] 优化一些api
6 years ago
ibuler 23815f87c5 [Update] 升级url
6 years ago
ibuler 8afd5ef90a [Merge] 修改一下bug
6 years ago
BaiJiangJie 3dc214d1fa [Bugfix] 修复org下用户查看我的资产不显示已授权节点/资产的bug
6 years ago
老广 4ff7a1f066
Merge pull request #1600 from jumpserver/bai_org
6 years ago
ibuler eca245fdd5 [Bugfix] 修复节点前面有个空目录
6 years ago
BaiJiangJie 45a354f848 [Bugfix] 修复org下普通用户打开web终端看不到已被授权的资产和节点bug
6 years ago
BaiJiangJie 04e7f54c69 [Update] org admin显示资产详情右侧选项卡;修复资产授权添加用户,会显示其他org用户的bug (#1594)
6 years ago
ibuler 2ecfecb06f [Update] Merge with dev
6 years ago
BaiJiangJie e7c530d8e6 [Update] 添加授权规则org (#1580)
6 years ago
老广 b156f4ad16
Tmp org (#1579)
6 years ago
老广 16b23a37fe
增加命令导出 (#1566)
6 years ago
ibuler f4c31d8e86 [Update] 修改权限判断
6 years ago
老广 c816875f28
[Update] 修改permission (#1574)
6 years ago
老广 2208d6d51e
[Bugfix] 解决Node.root() 死循环,移动AdminRequired到permission中 (#1571)
6 years ago