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

Delabs Spaces, iterate some copy and move communities/space toggle to preferences #6594

Merged
merged 34 commits into from
Sep 16, 2021
Merged

Delabs Spaces, iterate some copy and move communities/space toggle to preferences #6594

merged 34 commits into from
Sep 16, 2021

Commits on Aug 10, 2021

  1. Merge branch 't3chguy/fix/18092' of github.com:matrix-org/matrix-reac… 

    …t-sdk into t3chguy/fix/18088
    @t3chguy
    t3chguy committed Aug 10, 2021
    Configuration menu
    Copy the full SHA
    065dbf3 View commit details
    Browse the repository at this point in the history

  2. Tweak space panel new/cancel button colouring

    @t3chguy
    t3chguy committed Aug 10, 2021
    Configuration menu
    Copy the full SHA
    1272b37 View commit details
    Browse the repository at this point in the history

  3. Add blue beta dot to the space panel create button

    @t3chguy
    t3chguy committed Aug 10, 2021
    Configuration menu
    Copy the full SHA
    f98de18 View commit details
    Browse the repository at this point in the history

  4. Tweak copy in the space create menu

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

  5. Fix feedback form in space create menu exploding

    @t3chguy
    t3chguy committed Aug 10, 2021
    Configuration menu
    Copy the full SHA
    013ccd4 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2021

  1. Fix space public share dialog showing atop the space invite dialog

    @t3chguy
    t3chguy committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    40cf05a View commit details
    Browse the repository at this point in the history

  2. Delabs Spaces, keeping it as a default-on preference for the time being

    @t3chguy
    t3chguy committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    be85dcd View commit details
    Browse the repository at this point in the history

  3. Tweak copy on space preview

    @t3chguy
    t3chguy committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    cbd6f2d View commit details
    Browse the repository at this point in the history

  4. delint and remove groups-specific tests and setups

    @t3chguy
    t3chguy committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    da11085 View commit details
    Browse the repository at this point in the history

  5. delint test

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

  6. Add basic spaces tests to the e2e suite

    @t3chguy
    t3chguy committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    d602dac View commit details
    Browse the repository at this point in the history

  7. delint e2e test

    @t3chguy
    t3chguy committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    29e5a69 View commit details
    Browse the repository at this point in the history

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

    … t3chguy/fix/18088
    @t3chguy
    t3chguy committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    5f54abc View commit details
    Browse the repository at this point in the history

  9. Merge branch 't3chguy/fix/18092' of github.com:matrix-org/matrix-reac… 

    …t-sdk into t3chguy/fix/18088

� Conflicts:
�	src/components/views/spaces/SpaceCreateMenu.tsx
�	src/i18n/strings/en_EN.json
    @t3chguy
    t3chguy committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    38dbe89 View commit details
    Browse the repository at this point in the history

  10. Show disabled spaces section in preferences regardless

    @t3chguy
    t3chguy committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    4f47907 View commit details
    Browse the repository at this point in the history

  11. delint unused imports

    @t3chguy
    t3chguy committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    0ef9ea7 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2021

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

    … t3chguy/fix/18088

� Conflicts:
�	src/components/views/spaces/SpacePanel.tsx
    @t3chguy
    t3chguy committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    57bf64b View commit details
    Browse the repository at this point in the history

  2. i18n

    @t3chguy
    t3chguy committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    03e3da8 View commit details
    Browse the repository at this point in the history

  3. Iterate PR based on feedback

    @t3chguy
    t3chguy committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    0414ea2 View commit details
    Browse the repository at this point in the history

  4. Only show spaces blue flashy dot if user is in 0 spaces

    @t3chguy
    t3chguy committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    4f0ae0a View commit details
    Browse the repository at this point in the history

  5. Fix e2e test

    @t3chguy
    t3chguy committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    f2becd9 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2021

  1. try fix tests s'more

    @t3chguy
    t3chguy committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    5e38b8b View commit details
    Browse the repository at this point in the history

  2. add more delay

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

  3. tweak order of e2e tests

    @t3chguy
    t3chguy committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    2509c86 View commit details
    Browse the repository at this point in the history

  4. tweaks

    @t3chguy
    t3chguy committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    9d909dc View commit details
    Browse the repository at this point in the history

  5. delint

    @t3chguy
    t3chguy committed Aug 13, 2021
    Configuration menu
    Copy the full SHA
    8e7ef39 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2021

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

    … t3chguy/fix/18088

� Conflicts:
�	src/components/structures/LoggedInView.tsx
�	src/stores/SpaceStore.tsx
    @t3chguy
    t3chguy committed Sep 6, 2021
    Configuration menu
    Copy the full SHA
    a688e5b View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2021

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

    … t3chguy/fix/18088
    @t3chguy
    t3chguy committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    911ca07 View commit details
    Browse the repository at this point in the history

  2. Use new SCSS vars

    @t3chguy
    t3chguy committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    29b4ba6 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2021

  1. fix expected number of radios

    @t3chguy
    t3chguy committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    41118b4 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/18088
    @t3chguy
    t3chguy committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    80fd960 View commit details
    Browse the repository at this point in the history

  3. fix e2e test

    @t3chguy
    t3chguy committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    456de35 View commit details
    Browse the repository at this point in the history

  4. delint

    @t3chguy
    t3chguy committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    554c8ba View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2021

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

    … t3chguy/fix/18088
    @t3chguy
    t3chguy committed Sep 16, 2021
    Configuration menu
    Copy the full SHA
    e17318a View commit details
    Browse the repository at this point in the history