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

Add order_by to list users' media admin API #8978

Merged
merged 18 commits into from
Feb 22, 2021
Merged

Add order_by to list users' media admin API #8978

merged 18 commits into from
Feb 22, 2021

Commits on Dec 22, 2020

  1. Add order_by to list users' media admin API

    @dklimpel
    dklimpel committed Dec 22, 2020
    Configuration menu
    Copy the full SHA
    f6b4954 View commit details
    Browse the repository at this point in the history

  2. update test - mismatch SQlite and PostreSQL

    @dklimpel
    dklimpel committed Dec 22, 2020
    Configuration menu
    Copy the full SHA
    23a731e View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2021

  1. Change default sort order to prevent breaking change

    @dklimpel
    dklimpel committed Jan 4, 2021
    Configuration menu
    Copy the full SHA
    e0b5345 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'synapse/develop' into order_media

    @dklimpel
    dklimpel committed Jan 4, 2021
    Configuration menu
    Copy the full SHA
    278fe01 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2021

  1. Add performance warning

    @dklimpel
    dklimpel committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    c8f1904 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'synapse/develop' into order_media

    @dklimpel
    dklimpel committed Jan 11, 2021
    Configuration menu
    Copy the full SHA
    f0e8c8a View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2021

  1. Apply suggestions from code review - Part 1 

    Co-authored-by: Richard van der Hoff <[email protected]>
    @dklimpel @richvdh
    dklimpel and richvdh authored Feb 11, 2021
    Configuration menu
    Copy the full SHA
    84ab2b6 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review - Part 2

    @dklimpel
    dklimpel committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    ef3a96f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'synapse/develop' into order_media

    @dklimpel
    dklimpel committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    5e813f5 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2021

  1. Add missing store to UserMediaRestTestCase

    @dklimpel
    dklimpel authored Feb 12, 2021
    Configuration menu
    Copy the full SHA
    cd85a9d View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2021

  1. Apply suggestions from code review - Part 1 

    Co-authored-by: Patrick Cloke <[email protected]>
    @dklimpel @clokep
    dklimpel and clokep authored Feb 18, 2021
    Configuration menu
    Copy the full SHA
    222af2f View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review - Part 2 

    order test parameter
replace MediaSortOrder block
    @dklimpel
    dklimpel committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    179dc3c View commit details
    Browse the repository at this point in the history

  3. Update tests/rest/admin/test_user.py 

    Co-authored-by: Patrick Cloke <[email protected]>
    @dklimpel @clokep
    dklimpel and clokep authored Feb 18, 2021
    Configuration menu
    Copy the full SHA
    50e6c67 View commit details
    Browse the repository at this point in the history

  4. re-order test

    @dklimpel
    dklimpel committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    15947d6 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'synapse/develop' into order_media 

    Conflicts:
	tests/rest/admin/test_user.py
    @dklimpel
    dklimpel committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    79a5ee5 View commit details
    Browse the repository at this point in the history

  6. fix wrong merge and code style

    @dklimpel
    dklimpel committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    fc6c345 View commit details
    Browse the repository at this point in the history

  7. fix test

    @dklimpel
    dklimpel committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    dd69590 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'synapse/develop' into order_media

    @dklimpel
    dklimpel committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    48ed7f8 View commit details
    Browse the repository at this point in the history