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

Allow new users to be registered via the admin API even if the monthly active user limit has been reached #7263

Merged
merged 13 commits into from
Jun 5, 2020
Merged

Allow new users to be registered via the admin API even if the monthly active user limit has been reached #7263

merged 13 commits into from
Jun 5, 2020

Commits on Apr 5, 2020

  1. Sync develop

    @dklimpel
    dklimpel committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    d813e69 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2020

  1. Create user with admin API if MAU is reached

    @dklimpel
    dklimpel committed Apr 11, 2020
    Configuration menu
    Copy the full SHA
    8f75ac6 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2020

  1. Sync develop for renew tests

    @dklimpel
    dklimpel committed Apr 13, 2020
    Configuration menu
    Copy the full SHA
    26bddb3 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2020

  1. Add parameter 'by_admin' to register_user

    @dklimpel
    dklimpel committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    b1ad0f0 View commit details
    Browse the repository at this point in the history

  2. Update tests

    @dklimpel
    dklimpel committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    4c2d3a7 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. Update tests after review

    @dklimpel
    dklimpel committed May 1, 2020
    Configuration menu
    Copy the full SHA
    ae0eff0 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. Merge synapse/develop

    @dklimpel
    dklimpel committed May 12, 2020
    Configuration menu
    Copy the full SHA
    75975e0 View commit details
    Browse the repository at this point in the history

  2. Update MAU limit tests 

    Update because of changes in "Stop Auth methods from polling the config
on every req. (matrix-org#7420)"
    @dklimpel
    dklimpel committed May 12, 2020
    Configuration menu
    Copy the full SHA
    b3b347b View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2020

  1. Merge branch 'develop' into admin_api_create_user_mau

    @dklimpel
    dklimpel committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    9c17aa2 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2020

  1. Apply suggestions from code review

    @dklimpel
    dklimpel committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    cf1c9ea View commit details
    Browse the repository at this point in the history

  2. code style

    @dklimpel
    dklimpel committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    b9d9bec View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2020

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

    @richvdh
    richvdh committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    d3b0a82 View commit details
    Browse the repository at this point in the history

  2. Update 7263.bugfix

    @richvdh
    richvdh committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    d47b564 View commit details
    Browse the repository at this point in the history