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

Integrate MediaProxy to bridge authenticated Matrix media (MSC3916) #1805

Merged
merged 19 commits into from
Sep 2, 2024
Merged

Integrate MediaProxy to bridge authenticated Matrix media (MSC3916) #1805

merged 19 commits into from
Sep 2, 2024

Commits on May 29, 2024

  1. Integrate MediaProxy to bridge authenticated Matrix media (MSC3910)

    @tadzik
    tadzik committed May 29, 2024
    Configuration menu
    Copy the full SHA
    25990cf View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. linting

    @tadzik
    tadzik committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    4efcccc View commit details
    Browse the repository at this point in the history

  2. Make singing key generator emit valid JSON; include a sample in test … 

    …files
    @tadzik
    tadzik committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    515c09d View commit details
    Browse the repository at this point in the history

  3. Fix media-related tests

    @tadzik
    tadzik committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    3d822e8 View commit details
    Browse the repository at this point in the history

  4. Make mediaProxy required in the configuration

    @tadzik
    tadzik committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    b573de2 View commit details
    Browse the repository at this point in the history

  5. Await MediaProxy's startup

    @tadzik
    tadzik committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    395a8c1 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Add a test signingkey

    @tadzik
    tadzik committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    4958454 View commit details
    Browse the repository at this point in the history

  2. De-typescriptify signing key generator

    @tadzik
    tadzik committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    e992b5c View commit details
    Browse the repository at this point in the history

  3. Update MAB dependency to pull in Media Proxy

    @tadzik
    tadzik committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    fa75a9c View commit details
    Browse the repository at this point in the history

  4. Add mediaProxy config to e2e tests

    @tadzik
    tadzik committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    df2c0d5 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Close the media proxy when killing the bridge

    @tadzik
    tadzik committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    659981c View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. Make MediaProxy listen on random ports in tests 

    This reduces the chance of conflict with other processes,
and also stops one non-clean shutdown from blowing up the rest of the test suite.
    @tadzik
    tadzik committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    86dc504 View commit details
    Browse the repository at this point in the history

  2. Care less about mediaProxy not shutting down cleanly in kill()

    @tadzik
    tadzik committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    9a591c3 View commit details
    Browse the repository at this point in the history

  3. Log the failure to close mediaproxy to not leave dangling rejections

    @tadzik
    tadzik committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    f1e5ecc View commit details
    Browse the repository at this point in the history

  4. Changelog

    @tadzik
    tadzik committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    ad63db4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into tadzik/media-proxy

    @tadzik
    tadzik authored Aug 28, 2024
    Configuration menu
    Copy the full SHA
    9f5daf0 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Undo accidental jest config changes

    @tadzik
    tadzik committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    ae28463 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Remove the mention of HS url being used for media

    @tadzik
    tadzik committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    dabae2b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into tadzik/media-proxy

    @tadzik
    tadzik authored Sep 2, 2024
    Configuration menu
    Copy the full SHA
    c7b6981 View commit details
    Browse the repository at this point in the history