Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Disable profile controls if the HS doesn't allow them to be set #12652

Merged
merged 8 commits into from
Jul 2, 2024
Merged

Disable profile controls if the HS doesn't allow them to be set #12652

merged 8 commits into from
Jul 2, 2024

Commits on Jun 20, 2024

  1. Disable profile controls if the HS doesn't allow them to be set 

    Also updates to the js-sdk interface changes in matrix-org/matrix-js-sdk#4246
    @dbkr
    dbkr committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    8a159bf View commit details
    Browse the repository at this point in the history

  2. Remove unnecessary await

    @dbkr
    dbkr committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    b88c78a View commit details
    Browse the repository at this point in the history

  3. Pass disabled prop to accessiblebutton in avatarsetting

    @dbkr
    dbkr committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    28adbf4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into dbkr/profile_settings_oidc_2

    @dbkr
    dbkr authored Jun 20, 2024
    Configuration menu
    Copy the full SHA
    124bb97 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Use getCapabilities 

    in case there are no cached capabilities
    @dbkr
    dbkr committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    aaa9f5f View commit details
    Browse the repository at this point in the history

  2. Fix test

    @dbkr
    dbkr committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    79dd3bf View commit details
    Browse the repository at this point in the history

  3. Go back to just using getCapabilities 

    Rather than change the other places
    @dbkr
    dbkr committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    6eaa738 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Merge remote-tracking branch 'origin/develop' into dbkr/profile_setti… 

    …ngs_oidc_2
    @dbkr
    dbkr committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    a45b240 View commit details
    Browse the repository at this point in the history