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

Quarantine media by ID or user ID #6681

Merged
merged 15 commits into from
Jan 13, 2020
Merged

Quarantine media by ID or user ID #6681

merged 15 commits into from
Jan 13, 2020

Commits on Jan 10, 2020

  1. Add admin ability to quarantine media by id and user_id

    @anoadragon453
    anoadragon453 committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    191005d View commit details
    Browse the repository at this point in the history

  2. add tests

    @anoadragon453
    anoadragon453 committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    145b9c2 View commit details
    Browse the repository at this point in the history

  3. Add documentation

    @anoadragon453
    anoadragon453 committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    bfc3819 View commit details
    Browse the repository at this point in the history

  4. Remove old comment

    @anoadragon453
    anoadragon453 committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    01501fb View commit details
    Browse the repository at this point in the history

  5. Add to docstring

    @anoadragon453
    anoadragon453 committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    f8fb980 View commit details
    Browse the repository at this point in the history

  6. Add changelog

    @anoadragon453
    anoadragon453 committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    b760f7b View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2020

  1. Split endpoints into multiple, delete dup'd methods

    @anoadragon453
    anoadragon453 committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    7514d9b View commit details
    Browse the repository at this point in the history

  2. Fix up req/resp documentation

    @anoadragon453
    anoadragon453 committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    cd66f2a View commit details
    Browse the repository at this point in the history

  3. Fix bytes vs str in test

    @anoadragon453
    anoadragon453 committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    c410a64 View commit details
    Browse the repository at this point in the history

  4. Remove dupe

    @anoadragon453
    anoadragon453 committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    3056850 View commit details
    Browse the repository at this point in the history

  5. Update changelog.d/6681.feature 

    Co-Authored-By: Erik Johnston <[email protected]>
    @anoadragon453 @erikjohnston
    anoadragon453 and erikjohnston authored Jan 13, 2020
    Configuration menu
    Copy the full SHA
    06ab38a View commit details
    Browse the repository at this point in the history

  6. Rejig endpoints to be more extensible

    @anoadragon453
    anoadragon453 committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    673f126 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'anoa/quarantine_media_ids' of github.com:matrix-org/syn… 

    …apse into anoa/quarantine_media_ids
    @anoadragon453
    anoadragon453 committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    68c2eae View commit details
    Browse the repository at this point in the history

  8. Remove unittest.DEBUG statements

    @anoadragon453
    anoadragon453 committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    3c95fe0 View commit details
    Browse the repository at this point in the history

  9. Update workers.md to point media admin requests at media worker

    @anoadragon453
    anoadragon453 committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    d6f6a72 View commit details
    Browse the repository at this point in the history