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

support admin_email config and pass through into blocking errors, #3687

Merged
merged 13 commits into from
Aug 15, 2018
Merged

support admin_email config and pass through into blocking errors, #3687

merged 13 commits into from
Aug 15, 2018

Commits on Aug 13, 2018

  1. support admin_email config and pass through into blocking errors, ret… 

    …urn AuthError in all cases
    @neilisfragile
    neilisfragile committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    f4b4915 View commit details
    Browse the repository at this point in the history

  2. set admin email via config

    @neilisfragile
    neilisfragile committed Aug 13, 2018
    Configuration menu
    Copy the full SHA
    1f24d86 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2018

  1. Update register.py 

    remove comments
    @neilisfragile
    neilisfragile authored Aug 14, 2018
    Configuration menu
    Copy the full SHA
    99ebaed View commit details
    Browse the repository at this point in the history

  2. remove blank line

    @neilisfragile
    neilisfragile committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    c74c711 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:matrix-org/synapse into neilj/ad… 

    …min_email
    @neilisfragile
    neilisfragile committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    19b433e View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2018

  1. replace admin_email with admin_uri for greater flexibility

    @neilisfragile
    neilisfragile committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    ab035bd View commit details
    Browse the repository at this point in the history

  2. update error codes for resource limiting

    @neilisfragile
    neilisfragile committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    b8429c7 View commit details
    Browse the repository at this point in the history

  3. update resource limit error codes

    @neilisfragile
    neilisfragile committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    596ce63 View commit details
    Browse the repository at this point in the history

  4. update error codes

    @neilisfragile
    neilisfragile committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    75c663c View commit details
    Browse the repository at this point in the history

  5. update admin email to uri

    @neilisfragile
    neilisfragile committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    55afba0 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'neilj/update_limits_error_codes' of github.com:matrix-o… 

    …rg/synapse into neilj/admin_email
    @neilisfragile
    neilisfragile committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    c4eb975 View commit details
    Browse the repository at this point in the history

  7. clean up AuthError

    @neilisfragile
    neilisfragile committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    87a824b View commit details
    Browse the repository at this point in the history

  8. remove changelog referencing another PR

    @neilisfragile
    neilisfragile committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    39176f2 View commit details
    Browse the repository at this point in the history