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

Allow using room pills in slash commands #7513

Merged
merged 8 commits into from
Jan 12, 2022
Merged

Allow using room pills in slash commands #7513

merged 8 commits into from
Jan 12, 2022

Commits on Jan 11, 2022

  1. De-duplicate slash command code between edit & send composers

    @t3chguy
    t3chguy committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    ad9ff25 View commit details
    Browse the repository at this point in the history

  2. When using a pill in a slash command pass resourceId into the string

    @t3chguy
    t3chguy committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    cdf359b View commit details
    Browse the repository at this point in the history

  3. delint

    @t3chguy
    t3chguy committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    a4f562d View commit details
    Browse the repository at this point in the history

  4. improve typing

    @t3chguy
    t3chguy committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    cd224fd View commit details
    Browse the repository at this point in the history

  5. Fix edge case with /me command

    @t3chguy
    t3chguy committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    a3cbfb7 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2022

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

    … t3chguy/fix/20343

� Conflicts:
�	src/components/views/rooms/SendMessageComposer.tsx
�	src/i18n/strings/en_EN.json
    @t3chguy
    t3chguy committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    32ad9c4 View commit details
    Browse the repository at this point in the history

  2. i18n

    @t3chguy
    t3chguy committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    0824fe4 View commit details
    Browse the repository at this point in the history

  3. i18n

    @t3chguy
    t3chguy committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    e91ce62 View commit details
    Browse the repository at this point in the history