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.

Sign up for GitHub

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

Jump to bottom

Initial MSC3083 + MSC3244 support #6212

Merged
merged 40 commits into from
Jul 23, 2021
Merged

Initial MSC3083 + MSC3244 support #6212

merged 40 commits into from
Jul 23, 2021

Commits on Jun 18, 2021

  1. Move JoinRule, GuestAccess, HistoryVisibility enums into the js-sdk

    @t3chguy
    t3chguy committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    bf66a72 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/17686
    @t3chguy
    t3chguy committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    56fe7f8 View commit details
    Browse the repository at this point in the history

  3. Add ability to disable entire StyledRadioGroup

    @t3chguy
    t3chguy committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    18cafeb View commit details
    Browse the repository at this point in the history

  4. Clean up typing to Security Room Settings

    @t3chguy
    t3chguy committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    e508ff0 View commit details
    Browse the repository at this point in the history

  5. Initial support for MSC3083 via MSC3244

    @t3chguy
    t3chguy committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    566b8af View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2021

  1. Update early MSC3083 support

    @t3chguy
    t3chguy committed Jun 22, 2021
    Configuration menu
    Copy the full SHA
    d0dc5cf View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2021

  1. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/17686

� Conflicts:
�	src/components/views/elements/StyledRadioGroup.tsx
�	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
    @t3chguy
    t3chguy committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    88cd5ae View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2021

  1. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/17686

� Conflicts:
�	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
�	src/createRoom.ts
    @t3chguy
    t3chguy committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    4c42313 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2021

  1. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/17686
    @t3chguy
    t3chguy committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    fb149c4 View commit details
    Browse the repository at this point in the history

  2. Add way to manage Restricted join rule in Room Settings

    @t3chguy
    t3chguy committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    e8f0412 View commit details
    Browse the repository at this point in the history

  3. Tweak behaviour of setting restricted join rule

    @t3chguy
    t3chguy committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    912e192 View commit details
    Browse the repository at this point in the history

  4. Add new in the spaces beta toast & explanatory modal

    @t3chguy
    t3chguy committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    89949bd View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2021

  1. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/17686

� Conflicts:
�	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
    @t3chguy
    t3chguy committed Jul 5, 2021
    Configuration menu
    Copy the full SHA
    1b25ab9 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2021

  1. Convert Dropdown to Typescript

    @t3chguy
    t3chguy committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    44bbf60 View commit details
    Browse the repository at this point in the history

  2. Bring dropdown styling into closer line with rest of our styling

    @t3chguy
    t3chguy committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    82100df View commit details
    Browse the repository at this point in the history

  3. Track restricted join rule support in the SpaceStore for sync access

    @t3chguy
    t3chguy committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    6923478 View commit details
    Browse the repository at this point in the history

  4. Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog

    @t3chguy
    t3chguy committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    c5ca98a View commit details
    Browse the repository at this point in the history

  5. Make CreateRoomDialog capable of creating restricted rooms in spaces

    @t3chguy
    t3chguy committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    eb9f4c6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/17686
    @t3chguy
    t3chguy committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    64d1d16 View commit details
    Browse the repository at this point in the history

  7. stub getCapabilities in tests

    @t3chguy
    t3chguy committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    3301763 View commit details
    Browse the repository at this point in the history

  8. fix getCapabilities stub

    @t3chguy
    t3chguy committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    0ca4a95 View commit details
    Browse the repository at this point in the history

  9. stub getJoinRule

    @t3chguy
    t3chguy committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    9d8acd1 View commit details
    Browse the repository at this point in the history

  10. fix tests by including client field on the Room stub and stubbing get… 

    …JoinedMemberCount
    @t3chguy
    t3chguy committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    04c923b View commit details
    Browse the repository at this point in the history

  11. Update e2e tests

    @t3chguy
    t3chguy committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    06284fe View commit details
    Browse the repository at this point in the history

  12. Fix 2 new NPEs

    @t3chguy
    t3chguy committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    d004163 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'develop' into t3chguy/fix/17686

    @germain-gg
    germain-gg committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    a5cec34 View commit details
    Browse the repository at this point in the history

  14. Update lockfile

    @germain-gg
    germain-gg committed Jul 6, 2021
    Configuration menu
    Copy the full SHA
    894bce7 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2021

  1. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/17686

� Conflicts:
�	src/SlashCommands.tsx
�	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
�	src/createRoom.ts
    @t3chguy
    t3chguy committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    f412fb4 View commit details
    Browse the repository at this point in the history

  2. Update space children (best effort) when upgrading a room

    @t3chguy
    t3chguy committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    437d53d View commit details
    Browse the repository at this point in the history

  3. Convert RoomUpgradeDialog to TS

    @t3chguy
    t3chguy committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    6fe00d1 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2021

  1. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/17686

� Conflicts:
�	src/components/views/elements/MiniAvatarUploader.tsx
�	src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
�	src/i18n/strings/en_EN.json
�	src/settings/handlers/RoomSettingsHandler.ts
�	src/stores/SpaceStore.tsx
    @t3chguy
    t3chguy committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    dcb9b9b View commit details
    Browse the repository at this point in the history

  2. i18n

    @t3chguy
    t3chguy committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    5986609 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2021

  1. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/17686

� Conflicts:
�	src/components/views/avatars/RoomAvatar.tsx
�	test/stores/SpaceStore-test.ts
�	test/test-utils.js
    @t3chguy
    t3chguy committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    de42a00 View commit details
    Browse the repository at this point in the history

  2. delint

    @t3chguy
    t3chguy committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    f2a8859 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2021

  1. tweak copy

    @t3chguy
    t3chguy committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    a58edcb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/17686

� Conflicts:
�	src/components/views/dialogs/CreateRoomDialog.tsx
�	src/components/views/dialogs/RoomUpgradeDialog.tsx
�	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
�	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
    @t3chguy
    t3chguy committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    390b056 View commit details
    Browse the repository at this point in the history

  3. Add iconography to Create Room Dialog dropdown 

    Remove unused old stale feather-customised/globe.svg
    @t3chguy
    t3chguy committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    fd64d37 View commit details
    Browse the repository at this point in the history

  4. delint and fix min-height issue

    @t3chguy
    t3chguy committed Jul 21, 2021
    Configuration menu
    Copy the full SHA
    d147aaa View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2021

  1. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/fix/17686

� Conflicts:
�	src/stores/SpaceStore.tsx
    @t3chguy
    t3chguy committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    18bb4bc View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2021

  1. merge two opposing if statements

    @t3chguy
    t3chguy committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    cd77b9f View commit details
    Browse the repository at this point in the history