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

Make video & voice call buttons pin conference widget if unpinned #11576

Merged
merged 11 commits into from
Sep 19, 2023
Merged

Make video & voice call buttons pin conference widget if unpinned #11576

merged 11 commits into from
Sep 19, 2023

Commits on Sep 6, 2023

  1. Fix double-tooltips

    @t3chguy
    t3chguy committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    5f0501a View commit details
    Browse the repository at this point in the history

  2. Rebuild hook around room header call management 

    And tweak behaviour around ongoing yet unpinned calls to add a shortcut to quickly pin
    @t3chguy
    t3chguy committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    5a2595a View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Handle ManagedHybrid widgets in useRoomCall and mark them in the wi… 

    …dget state event

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    569832b View commit details
    Browse the repository at this point in the history

  2. i18n 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    623212e View commit details
    Browse the repository at this point in the history

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

    … t3chguy/cr/72
    @t3chguy
    t3chguy committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    0a36af7 View commit details
    Browse the repository at this point in the history

  4. Update tests 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    e54dd60 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Tests 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    68e8fa7 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

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

    … t3chguy/cr/72

# Conflicts:
#	test/components/views/rooms/__snapshots__/RoomHeader-test.tsx.snap
    @t3chguy
    t3chguy committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    e301fe4 View commit details
    Browse the repository at this point in the history

  2. i18n 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    1d0c704 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

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

    … t3chguy/cr/72

# Conflicts:
#	src/components/views/rooms/RoomHeader.tsx
#	test/components/views/rooms/__snapshots__/RoomHeader-test.tsx.snap
    @t3chguy
    t3chguy committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    c839123 View commit details
    Browse the repository at this point in the history

  2. i18n 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    ea3067b View commit details
    Browse the repository at this point in the history