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

Add support for MD / HTML in room topics #8215

Merged
merged 26 commits into from
Jun 7, 2022
Merged

Add support for MD / HTML in room topics #8215

merged 26 commits into from
Jun 7, 2022

Commits on May 2, 2022

  1. Add support for MD / HTML in room topics 

    Setting MD / HTML supported:
- /topic command
- Room settings overlay
- Space settings overlay

Display of MD / HTML supported:
- /topic command
- Room header
- Space home

Based on extensible events as defined in [MSC1767]

Fixes: element-hq/element-web#5180
Signed-off-by: Johannes Marbach <johannesm@element.io>

[MSC1767]: matrix-org/matrix-spec-proposals#1767
    @Johennes
    Johennes committed May 2, 2022
    Configuration menu
    Copy the full SHA
    78f8d38 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2022

  1. Merge branch 'develop' into feature/html-topic

    @Johennes
    Johennes committed May 9, 2022
    Configuration menu
    Copy the full SHA
    93c7fcf View commit details
    Browse the repository at this point in the history

  2. Fix build error

    @Johennes
    Johennes committed May 9, 2022
    Configuration menu
    Copy the full SHA
    36cb244 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2022

  1. Add comment to explain origin of styles 

    Co-authored-by: Travis Ralston <travpc@gmail.com>
    @Johennes @turt2live
    Johennes and turt2live committed May 11, 2022
    Configuration menu
    Copy the full SHA
    e68273a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/html-topic

    @Johennes
    Johennes committed May 11, 2022
    Configuration menu
    Copy the full SHA
    080a485 View commit details
    Browse the repository at this point in the history

  3. Empty commit to retrigger build

    @Johennes
    Johennes committed May 11, 2022
    Configuration menu
    Copy the full SHA
    ec16b10 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2022

  1. Merge branch 'develop' into feature/html-topic 

     Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/elements/RoomTopic.tsx
	src/components/views/rooms/RoomHeader.tsx
	src/components/views/rooms/RoomPreviewCard.tsx
	src/components/views/spaces/SpaceSettingsGeneralTab.tsx
    @Johennes
    Johennes committed May 17, 2022
    Configuration menu
    Copy the full SHA
    21a67f6 View commit details
    Browse the repository at this point in the history

  2. Fix import grouping

    @Johennes
    Johennes committed May 17, 2022
    Configuration menu
    Copy the full SHA
    0894a5b View commit details
    Browse the repository at this point in the history

Commits on May 18, 2022

  1. Merge branch 'develop' into feature/html-topic

    @Johennes
    Johennes committed May 18, 2022
    Configuration menu
    Copy the full SHA
    29a1597 View commit details
    Browse the repository at this point in the history

  2. Fix useTopic test

    @Johennes
    Johennes committed May 18, 2022
    Configuration menu
    Copy the full SHA
    a87d9b7 View commit details
    Browse the repository at this point in the history

  3. Add tests for HtmlUtils

    @Johennes
    Johennes committed May 18, 2022
    Configuration menu
    Copy the full SHA
    e889223 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2022

  1. Add slash command test

    @Johennes
    Johennes committed May 19, 2022
    Configuration menu
    Copy the full SHA
    5c2ccf2 View commit details
    Browse the repository at this point in the history

  2. Add further serialize test

    @Johennes
    Johennes committed May 19, 2022
    Configuration menu
    Copy the full SHA
    000c29a View commit details
    Browse the repository at this point in the history

Commits on May 20, 2022

  1. Fix ternary formatting 

    Co-authored-by: Travis Ralston <travpc@gmail.com>
    @Johennes @turt2live
    Johennes and turt2live committed May 20, 2022
    Configuration menu
    Copy the full SHA
    215ea37 View commit details
    Browse the repository at this point in the history

  2. Add blank line 

    Co-authored-by: Travis Ralston <travpc@gmail.com>
    @Johennes @turt2live
    Johennes and turt2live committed May 20, 2022
    Configuration menu
    Copy the full SHA
    2f19de8 View commit details
    Browse the repository at this point in the history

  3. Properly mock SettingsStore access

    @Johennes
    Johennes committed May 20, 2022
    Configuration menu
    Copy the full SHA
    f248472 View commit details
    Browse the repository at this point in the history

  4. Remove trailing space

    @Johennes
    Johennes committed May 20, 2022
    Configuration menu
    Copy the full SHA
    d7d74d5 View commit details
    Browse the repository at this point in the history

  5. Assert on HTML content and add test for plain text in HTML parameter

    @Johennes
    Johennes committed May 20, 2022
    Configuration menu
    Copy the full SHA
    f1b08ec View commit details
    Browse the repository at this point in the history

  6. Appease the linter

    @Johennes
    Johennes committed May 20, 2022
    Configuration menu
    Copy the full SHA
    553a02e View commit details
    Browse the repository at this point in the history

Commits on May 25, 2022

  1. Fix JSDoc comment

    @Johennes
    Johennes committed May 25, 2022
    Configuration menu
    Copy the full SHA
    87f114a View commit details
    Browse the repository at this point in the history

  2. Fix toEqual call formatting

    @Johennes
    Johennes committed May 25, 2022
    Configuration menu
    Copy the full SHA
    04448ec View commit details
    Browse the repository at this point in the history

  3. Repurpose test for literal HTML case

    @Johennes
    Johennes committed May 25, 2022
    Configuration menu
    Copy the full SHA
    91bf281 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into feature/html-topic

    @Johennes
    Johennes committed May 25, 2022
    Configuration menu
    Copy the full SHA
    d8bf47b View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2022

  1. Merge branch 'develop' into feature/html-topic

    @turt2live
    turt2live committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    ee089c5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/html-topic

    @turt2live
    turt2live committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    eac9691 View commit details
    Browse the repository at this point in the history

  3. Empty commit to fix CI

    @turt2live
    turt2live committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    ee85b7d View commit details
    Browse the repository at this point in the history