Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into release-1.12 #6216

Merged
merged 11 commits into from
Dec 15, 2023
Merged

Merge main into release-1.12 #6216

merged 11 commits into from
Dec 15, 2023

Commits on Dec 12, 2023

  1. Guard a possibly null pathManager.

    If the 'settings-update' event is handled before settings are loaded, `pathManager`
    could be null.
    
    Also, extract initializing `pathManager` into a function.
    
    - This happens from both changing a pref (any pref) in the
      first-run window, as well as during normal settings loading.
    
    Note that from first-run we're calling `pathManager.enforce()`,
    while from standard startup we're calling `integrationManager.enforce()`
    If there's a problem here, it should be covered in a separate issue and PR.
    
    Signed-off-by: Eric Promislow <epromislow@suse.com>
    ericpromislow committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    8261886 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. win-ca: Fix importing CAs from system

    - Use dotAll flag on the RE to find end of certificates
    - Emit any extra data at the end of the cert list (even though it is likely
      to be empty)
    
    Signed-off-by: Mark Yen <mark.yen@suse.com>
    mook-as committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    5bd909f View commit details
    Browse the repository at this point in the history
  2. Window: determine RDX content area based on layout

    This makes us base the RDX content area on the actual bounds of the UI,
    instead of a single point.  This resolves issues with the status bar being
    clipped by the extension browser, and pushes the relevant sizing to the UI
    where it has better knowledge of the layout.
    
    Signed-off-by: Mark Yen <mark.yen@suse.com>
    mook-as committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    18a2637 View commit details
    Browse the repository at this point in the history
  3. RDX: Fix window resizing on mac

    On mac, the user can use cmd+numpad plus to zoom; the previous code did not
    consider that and caused the zoom to not be adjusted in that case.
    
    Signed-off-by: Mark Yen <mark.yen@suse.com>
    mook-as committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    267bf0a View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Merge pull request #6207 from mook-as/ui/rdx-statusbar

    UI: Adjust how we calculate window size when showing extension browser
    mook-as committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    5be1273 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #6199 from mook-as/win32/ca-import

    win-ca: Fix importing CAs from system
    mook-as committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    38e966c View commit details
    Browse the repository at this point in the history
  3. Bump helm from 3.13.2 to 3.13.3

    Signed-off-by: Rancher Desktop Dependency Manager <donotuse@rancherdesktop.io>
    Rancher Desktop Dependency Manager committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    a47c1b4 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #6213 from rancher-sandbox/rddepman/helm/3.13.2-to…

    …-3.13.3
    
    rddepman: bump helm from 3.13.2 to 3.13.3
    jandubois committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    99d9f52 View commit details
    Browse the repository at this point in the history
  5. Enable Lima guestagent logging

    Signed-off-by: Jan Dubois <jan.dubois@suse.com>
    jandubois committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    62843d5 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #6179 from ericpromislow/guard-null-strategy

    Guard a possibly null pathManager.
    mook-as committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    3b09b9e View commit details
    Browse the repository at this point in the history
  7. Merge pull request #6211 from jandubois/guestagent-logging

    Enable Lima guestagent logging
    mook-as committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    f68985d View commit details
    Browse the repository at this point in the history