summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-15163-2853/+2949
|\
| * Merge pull request #3653 from matrix-org/erikj/split_federationErik Johnston2018-08-1516-138/+512
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-15217-2760/+2605
| | |\
| | * | Use federation handler function rather than duplicateErik Johnston2018-08-152-48/+10
| | * | Rename slave TransactionStore to SlaveTransactionStoreErik Johnston2018-08-156-11/+11
| | * | Update docs/workers.rstErik Johnston2018-08-091-0/+13
| | * | NewsfileErik Johnston2018-08-091-0/+1
| | * | Move clean_room_for_join to masterErik Johnston2018-08-092-2/+49
| | * | Fixup doc commentsErik Johnston2018-08-092-0/+28
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-0967-408/+1156
| | |\ \
| | * | | Pull in necessary stores in federation_readerErik Johnston2018-08-062-1/+2
| | * | | Move necessary storage functions to worker classesErik Johnston2018-08-063-98/+100
| | * | | Import all functions from TransactionStoreErik Johnston2018-08-061-11/+2
| | * | | Add EDU/query handling over replicationErik Johnston2018-08-064-13/+62
| | * | | Add replication APIs for persisting federation eventsErik Johnston2018-08-064-10/+290
| * | | | Merge pull request #3687 from matrix-org/neilj/admin_emailNeil Johnson2018-08-159-30/+38
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | remove changelog referencing another PRNeil Johnson2018-08-151-1/+0
| | * | | clean up AuthErrorNeil Johnson2018-08-151-7/+3
| | * | | Merge branch 'neilj/update_limits_error_codes' of github.com:matrix-org/synap...Neil Johnson2018-08-154-6/+6
| | |\ \ \
| | | * | | update error codesNeil Johnson2018-08-151-2/+2
| | | * | | update resource limit error codesNeil Johnson2018-08-151-0/+1
| | | * | | update error codes for resource limitingNeil Johnson2018-08-152-4/+3
| | * | | | update admin email to uriNeil Johnson2018-08-152-2/+2
| | |/ / /
| | * | | replace admin_email with admin_uri for greater flexibilityNeil Johnson2018-08-155-11/+11
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_emailNeil Johnson2018-08-1418-76/+373
| | |\ \ \
| | * | | | remove blank lineNeil Johnson2018-08-141-1/+0
| | * | | | Update register.pyNeil Johnson2018-08-141-10/+0
| | * | | | set admin email via configNeil Johnson2018-08-131-0/+1
| | * | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-137-22/+45
| * | | | | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_nameNeil Johnson2018-08-152-3/+4
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_pro...Neil Johnson2018-08-148-22/+115
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Rename MAU prometheus metricNeil Johnson2018-08-141-0/+1
| | * | | | | pep8Neil Johnson2018-08-141-0/+1
| | * | | | | combine mau metrics into one groupNeil Johnson2018-08-141-4/+3
| * | | | | | Merge pull request #3667 from matrix-org/erikj/fixup_unbindErik Johnston2018-08-156-20/+79
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Log when we 3pid/unbind request failsErik Johnston2018-08-091-0/+2
| | * | | | | Don't fail requests to unbind 3pids for non supporting ID serversErik Johnston2018-08-086-20/+77
| * | | | | | Merge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_re...Neil Johnson2018-08-144-3/+4
| |\ \ \ \ \ \
| | * | | | | | fix setup_test_homeserver to be postgres compatibleNeil Johnson2018-08-141-1/+1
| | * | | | | | Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved...Neil Johnson2018-08-141-0/+1
| | * | | | | | adding missing yieldNeil Johnson2018-08-141-1/+1
| | * | | | | | in case max_mau is less than I thinkNeil Johnson2018-08-141-1/+1
| |/ / / / / /
| * | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-147-20/+112
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | make comments clearerNeil Johnson2018-08-141-1/+2
| * | | | | | Dockerised sytest (#3660)Amber Brown2018-08-144-0/+53
| * | | | | | Merge pull request #3681 from matrix-org/neilj/fix_reap_users_in_postgresAmber Brown2018-08-142-16/+29
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_po...Amber Brown2018-08-1456-292/+404
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Implement a new test baseclass to cut down on boilerplate (#3684)Amber Brown2018-08-143-37/+174
| * | | | | | | Merge pull request #3669 from matrix-org/jcgruenhage/update-docker-baseJan Christian Grünhage2018-08-142-1/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | update docker base-image to alpine 3.8Jan Christian Grünhage2018-08-092-1/+2
| * | | | | | | Name changelog after PR, not bugRichard van der Hoff2018-08-131-0/+0
| * | | | | | | Merge pull request #3677 from andrewshadura/masterRichard van der Hoff2018-08-133-196/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Use recaptcha_ajax.js directly from GoogleAndrej Shadura2018-08-103-196/+2
| * | | | | | | | Revert "support admin_email config and pass through into blocking errors, ret...Neil Johnson2018-08-137-45/+22
| * | | | | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-137-22/+45
| * | | | | | | | Run tests under PostgreSQL (#3423)Amber Brown2018-08-1349-59/+227
| | | | * | | | | Fixes test_reap_monthly_active_users so it passes under postgresNeil Johnson2018-08-111-0/+1
| | | | * | | | | fix sqlite/postgres incompatibility in reap_monthly_active_usersNeil Johnson2018-08-111-16/+28
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #3679 from matrix-org/hawkowl/blackify-testsAmber Brown2018-08-1176-2280/+1631
| |\ \ \ \ \ \ \
| | * | | | | | | fix up a forced long lineAmber Brown2018-08-111-1/+2
| | * | | | | | | changelogAmber Brown2018-08-101-0/+1
| | * | | | | | | Run black.black2018-08-1075-2280/+1629
| * | | | | | | | Merge branch 'rav/fix_linearizer_cancellation' into developRichard van der Hoff2018-08-102-43/+69
| |\ \ \ \ \ \ \ \
| | * | | | | | | | changelogRichard van der Hoff2018-08-101-0/+1
| | * | | | | | | | Fix linearizer cancellation on twisted < 18.7Richard van der Hoff2018-08-101-43/+68
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | log *after* reloading log configRichard van der Hoff2018-08-101-2/+1
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Rename async to async_helpers because `async` is a keyword on Python 3.7 (#3678)Amber Brown2018-08-1033-34/+35
| * | | | | | | Merge pull request #3439 from vojeroen/send_sni_for_federation_requestsRichard van der Hoff2018-08-1015-16/+113
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | more generic conversion of str/bytes to unicodeJeroen2018-08-091-1/+1
| | * | | | | | include private functions from twistedJeroen2018-08-091-2/+35
| | * | | | | | updated docstring for ServerContextFactoryJeroen2018-08-081-1/+1
| | * | | | | | fix isortJeroen2018-07-291-2/+3
| | * | | | | | fix accidental removal of hsJeroen2018-07-271-1/+1
| | * | | | | | Merge branch 'develop' into send_sni_for_federation_requestsRichard van der Hoff2018-07-27156-5187/+7015
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_...Jeroen2018-07-14347-1985/+2111
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' into send_sni_for_federation_requestsJeroen2018-07-0988-205/+1673
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | take idna implementation from twistedJeroen2018-06-261-2/+2
| | * | | | | | | | | towncrier changelogJeroen2018-06-261-0/+1
| | * | | | | | | | | allow self-signed certificatesJeroen2018-06-263-35/+36
| | * | | | | | | | | formatting changes for pep8Jeroen2018-06-254-5/+8
| | * | | | | | | | | send SNI for federation requestsJeroen2018-06-2415-13/+71
* | | | | | | | | | | wip cut at sending resource server noticesNeil Johnson2018-08-152-44/+55
* | | | | | | | | | | add new event typesNeil Johnson2018-08-151-0/+1
* | | | | | | | | | | backout ability to pass in event type to server noticesNeil Johnson2018-08-143-4/+5
* | | | | | | | | | | support server notice state events for resource limitsNeil Johnson2018-08-144-8/+22
* | | | | | | | | | | fix typoNeil Johnson2018-08-131-1/+1
* | | | | | | | | | | server notices for resource limit blockingNeil Johnson2018-08-101-0/+1
* | | | | | | | | | | implementation of server notices to alert on hitting resource limitsNeil Johnson2018-08-103-45/+190
* | | | | | | | | | | wip at implementing MSC 7075Neil Johnson2018-08-091-0/+84
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | rename _user_last_seen_monthly_activeNeil Johnson2018-08-094-18/+19
* | | | | | | | | | fix errant parenthesisNeil Johnson2018-08-091-1/+1
* | | | | | | | | | fix importsNeil Johnson2018-08-091-1/+1
* | | | | | | | | | only block on sync where user is not part of the mau cohortNeil Johnson2018-08-093-12/+48
* | | | | | | | | | Where server is disabled, block ability for locked out users to read new mess...Neil Johnson2018-08-091-0/+1
* | | | | | | | | | block sync if auth checks failNeil Johnson2018-08-092-13/+18
* | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-096-1/+22
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #3655 from matrix-org/neilj/disable_hsNeil Johnson2018-08-096-1/+22
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fix pep8 too many linesNeil Johnson2018-08-081-1/+0
| | * | | | | | | | | Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-0814-22/+245
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-086-7/+115
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Ability to disable client/server Synapse via conf toggleNeil Johnson2018-08-081-0/+1
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable_hsNeil Johnson2018-08-0816-157/+226
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-061-4/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-061-4/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-062-8/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | disable HS from configNeil Johnson2018-08-045-1/+21
* | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_b...Neil Johnson2018-08-0998-405/+819
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into developAmber Brown2018-08-0961-56/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | 0.33.2 changelog v0.33.2 github/release-v0.33.2 release-v0.33.2Amber Brown2018-08-091-0/+6
| | * | | | | | | | | | | | | | 0.33.2Amber Brown2018-08-091-1/+1
| | * | | | | | | | | | | | | | fix the changelog & templateAmber Brown2018-08-092-50/+50
| | * | | | | | | | | | | | | | fix changelogAmber Brown2018-08-071-1/+4
| | * | | | | | | | | | | | | | fix for rc1 v0.33.2rc1Amber Brown2018-08-072-3/+3
| | * | | | | | | | | | | | | | changelogAmber Brown2018-08-0759-54/+64
| | * | | | | | | | | | | | | | versionAmber Brown2018-08-071-1/+1
| * | | | | | | | | | | | | | | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servletErik Johnston2018-08-096-274/+396
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fixup wording and remove dead codeErik Johnston2018-08-092-2/+2
| | * | | | | | | | | | | | | | | Rename POST param to METHODErik Johnston2018-08-082-13/+22
| | * | | | | | | | | | | | | | | Fixup logging and docstringsErik Johnston2018-08-082-2/+40
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix isortErik Johnston2018-08-061-4/+1
| | * | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_r...Erik Johnston2018-08-0367-647/+1073
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | NewsfileErik Johnston2018-07-311-0/+0
| | * | | | | | | | | | | | | | | Use new helper base class for membership requestsErik Johnston2018-07-312-195/+108
| | * | | | | | | | | | | | | | | Use new helper base class for ReplicationSendEventRestServletErik Johnston2018-07-312-86/+40
| | * | | | | | | | | | | | | | | Add helper base class for generating new replication endpointsErik Johnston2018-07-311-0/+208
| * | | | | | | | | | | | | | | | Test fixes for Python 3 (#3647)Amber Brown2018-08-0914-52/+71
| * | | | | | | | | | | | | | | | Merge pull request #3664 from matrix-org/rav/federation_metricsRichard van der Hoff2018-08-084-1/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | changelogRichard van der Hoff2018-08-071-0/+1
| | * | | | | | | | | | | | | | | fix metric nameRichard van der Hoff2018-08-071-1/+1
| | * | | | | | | | | | | | | | | more metrics for the federation and appservice sendersRichard van der Hoff2018-08-073-1/+32
| | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #3654 from matrix-org/rav/room_versionsRichard van der Hoff2018-08-0814-22/+244
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Don't expose default_room_version as config optRichard van der Hoff2018-08-073-15/+5
| | * | | | | | | | | | | | | | changelogRichard van der Hoff2018-08-061-0/+1
| | * | | | | | | | | | | | | | Check m.room.create for sane room_versionsRichard van der Hoff2018-08-062-4/+32
| | * | | | | | | | | | | | | | include known room versions in outgoing make_joinsRichard van der Hoff2018-08-064-8/+25
| | * | | | | | | | | | | | | | sanity check response from make_joinRichard van der Hoff2018-08-031-1/+3
| | * | | | | | | | | | | | | | Enforce compatibility when processing make_join requestsRichard van der Hoff2018-08-033-4/+63
| | * | | | | | | | | | | | | | Basic support for room versioningRichard van der Hoff2018-08-037-5/+83
| | * | | | | | | | | | | | | | Docstrings for BaseFederationServletRichard van der Hoff2018-08-031-0/+47
| | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
* | / | | | | | | | | | | | | sync auth blockingNeil Johnson2018-08-082-5/+53
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #3662 from matrix-org/neilj/reserved_usersNeil Johnson2018-08-086-7/+115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_u...Neil Johnson2018-08-0816-156/+225
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3633 from matrix-org/neilj/mau_trackerNeil Johnson2018-08-0818-163/+414
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | typosNeil Johnson2018-08-082-3/+3
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3658 from matrix-org/rav/fix_event_persisted_position_met...Richard van der Hoff2018-08-072-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | changelogRichard van der Hoff2018-08-071-0/+1
| * | | | | | | | | | | | | Fix occasional glitches in the synapse_event_persisted_position metricRichard van der Hoff2018-08-071-3/+8
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* / | | | | | | | | | | | fix event lag graphRichard van der Hoff2018-08-071-8/+16
|/ / / / / / / / / / / /
* | | | | | | | | | | | Return M_NOT_FOUND when a profile could not be found. (#3596)Will Hunt2018-08-032-31/+59
* | | | | | | | | | | | Merge pull request #3644 from matrix-org/michaelkaye/refactor_docker_location...Michael Kaye2018-08-039-112/+139
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update README.mdMichael Kaye2018-08-031-1/+1
| * | | | | | | | | | | Update README.mdMichael Kaye2018-08-031-1/+1
| * | | | | | | | | | | Update README.rstMichael Kaye2018-08-031-1/+1
| * | | | | | | | | | | Update README.rstMichael Kaye2018-08-031-3/+10
| * | | | | | | | | | | Add news entryMichael Kaye2018-08-021-0/+1
| * | | | | | | | | | | Address SPAG issuesMichael Kaye2018-08-021-2/+4
| * | | | | | | | | | | Do not include docker files in python buildMichael Kaye2018-08-021-0/+1
| * | | | | | | | | | | Refactor docker locations and README.Michael Kaye2018-08-027-110/+126
| | | * | | | | | | | | Ability to whitelist specific threepids against monthly active user limitingNeil Johnson2018-08-081-0/+1
| | | * | | | | | | | | mock config.max_mau_valueNeil Johnson2018-08-081-0/+1
| | | * | | | | | | | | prevent total number of reserved users being too largeNeil Johnson2018-08-071-1/+3
| | | * | | | | | | | | implement reserved users for mau limitsNeil Johnson2018-08-074-13/+99
| | | * | | | | | | | | WIP building out mau reserved usersNeil Johnson2018-08-061-1/+15
| | | * | | | | | | | | add default mau_limits_reserved_threepidsNeil Johnson2018-08-061-0/+1
| | | * | | | | | | | | load mau limit threepidsNeil Johnson2018-08-061-0/+3
| | |/ / / / / / / / /
| | * | | | / / / / / Fix postgres compatibility bugNeil Johnson2018-08-061-4/+15
| | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | update comments to reflect new sigNeil Johnson2018-08-061-4/+1
| | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | make use of _simple_select_one_onecol, improved commentsNeil Johnson2018-08-062-8/+15
| | | |/ / / / / | | |/| | | | |
| | * | | | | | py3 fixNeil Johnson2018-08-031-1/+1
| | * | | | | | remove unused importNeil Johnson2018-08-031-1/+1
| | * | | | | | bug fixesNeil Johnson2018-08-035-27/+10
| | * | | | | | wip commit - tests failingNeil Johnson2018-08-035-53/+66
| | * | | | | | fix (lots of) py3 test failuresNeil Johnson2018-08-033-3/+3
| | * | | | | | fix py3 test failureNeil Johnson2018-08-031-0/+1
| | * | | | | | Add ability to limit number of monthly active users on the serverNeil Johnson2018-08-031-0/+1
| | * | | | | | fix caching and testsNeil Johnson2018-08-033-62/+80
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-0325-379/+450
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragmentAmber Brown2018-08-032-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | newsfragmentMichael Kaye2018-08-021-0/+1
| * | | | | | | Mention the word "newsfragment" in CONTRIBUTING.rstMichael Kaye2018-08-021-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #3639 from matrix-org/rav/refactor_error_handlingRichard van der Hoff2018-08-029-142/+124
|\ \ \ \ \ \ \
| * | | | | | | changelogRichard van der Hoff2018-08-011-0/+1
| * | | | | | | Kill off MatrixCodeMessageExceptionRichard van der Hoff2018-08-015-78/+47
| * | | | | | | Refactor code for turning HttpResponseException into SynapseErrorRichard van der Hoff2018-08-013-34/+56
| * | | | | | | Be more careful which errors we send back over the C-S APIRichard van der Hoff2018-08-013-32/+22
* | | | | | | | Merge pull request #3638 from matrix-org/rav/refactor_federation_client_excep...Richard van der Hoff2018-08-022-129/+149
|\ \ \ \ \ \ \ \
| * | | | | | | | changelogRichard van der Hoff2018-08-011-0/+1
| |/ / / / / / /
| * | | | | | | Factor out exception handling in federation_clientRichard van der Hoff2018-08-011-129/+148
* | | | | | | | Merge branch 'master' into developRichard van der Hoff2018-08-0211-21/+77
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge tag 'v0.33.1'Richard van der Hoff2018-08-029-19/+73
| |\ \ \ \ \ \ \ \
| | * | | | | | | | changelog: this is a security release v0.33.1 github/release-v0.33.1 release-v0.33.1Richard van der Hoff2018-08-021-2/+2
| | * | | | | | | | fix changelog typosRichard van der Hoff2018-08-021-1/+1
| | * | | | | | | | Prepare 0.33.1Richard van der Hoff2018-08-024-3/+11
| | * | | | | | | | Merge pull request #3642 from matrix-org/rav/another_room_id_checkRichard van der Hoff2018-08-025-7/+25
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | changelogsRichard van der Hoff2018-08-022-1/+2
| | | * | | | | | | | Check room visibility for /event/ requestsRichard van der Hoff2018-08-023-6/+23
| | * | | | | | | | | Merge pull request #3641 from matrix-org/rav/room_id_checkRichard van der Hoff2018-08-025-12/+40
| | |\| | | | | | | |
| | | * | | | | | | | changelogRichard van der Hoff2018-08-021-0/+1
| | | * | | | | | | | Avoid extra db lookupsRichard van der Hoff2018-08-023-62/+26
| | | * | | | | | | | Validation for events/rooms in fed requestsRichard van der Hoff2018-08-023-1/+64
| | |/ / / / / / / /
| * | | | | | | | | Merge pull request #3594 from matrix-org/richvdh-patch-1Richard van der Hoff2018-07-241-2/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update ISSUE_TEMPLATE.mdRichard van der Hoff2018-07-241-2/+3
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3377 from Valodim/note-affinityRichard van der Hoff2018-07-191-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | add note that the affinity package is required for the cpu_affinity settingVincent Breitmoser2018-06-091-0/+2
* | | | | | | | | | Merge pull request #3621 from matrix-org/erikj/split_fed_storeErik Johnston2018-08-023-89/+101
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update docsErik Johnston2018-08-012-4/+6
| * | | | | | | | | | _persist_auth_tree no longer returns anythingErik Johnston2018-08-011-1/+1
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_...Erik Johnston2018-07-3037-108/+787
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | NewsfileErik Johnston2018-07-271-0/+1
| * | | | | | | | | | | Split out DB writes in federation handlerErik Johnston2018-07-252-85/+94
| | | | | | * | | | | | update generate_monthly_active_users, and reap_monthly_active_usersNeil Johnson2018-08-021-2/+2
| | | | | | * | | | | | typoNeil Johnson2018-08-021-1/+1
| | | | | | * | | | | | wip attempt at cachingNeil Johnson2018-08-021-9/+47
| | | | | | * | | | | | do mau checks based on monthly_active_users tableNeil Johnson2018-08-027-61/+97
| | | | | | * | | | | | remove unused count_monthly_usersNeil Johnson2018-08-022-90/+0
| | | | | | * | | | | | fix test, update constructor callNeil Johnson2018-08-021-1/+1
| | | | | | * | | | | | insertion into monthly_active_usersNeil Johnson2018-08-025-11/+99
| | | | | | * | | | | | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-022-1/+3
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | self.db_conn unusedNeil Johnson2018-08-011-1/+0
| | | | | | | * | | | | | normalise reaping queryNeil Johnson2018-08-011-3/+38
| | | | | | * | | | | | | Revert "change monthly_active_users table to be a single column"Neil Johnson2018-08-023-7/+13
| | | | | | |/ / / / / /
| | | | | | * | | | | | change monthly_active_users table to be a single columnNeil Johnson2018-08-013-13/+7
| | | | | | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-0148-279/+625
| | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-0111-16/+275
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | count_monthly_users is now asyncNeil Johnson2018-08-011-1/+2
| * | | | | | | | | | | | improve clarityNeil Johnson2018-08-012-5/+6
| * | | | | | | | | | | | fix isortNeil Johnson2018-08-011-1/+0
| * | | | | | | | | | | | fix test for py3Neil Johnson2018-08-011-0/+4
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_i...Neil Johnson2018-08-0127-198/+5193
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fix known broken testNeil Johnson2018-08-011-25/+20
| * | | | | | | | | | | | | count_monthly_users() asyncNeil Johnson2018-08-011-4/+7
| * | | | | | | | | | | | | remove need to plot limit_usage_by_mauNeil Johnson2018-08-012-7/+6
| * | | | | | | | | | | | | remove errant printNeil Johnson2018-08-011-1/+0
| * | | | | | | | | | | | | make count_monthly_users async synapse/handlers/auth.pyNeil Johnson2018-08-014-38/+46
| * | | | | | | | | | | | | only need to loop if mau limiting is enabledNeil Johnson2018-08-011-1/+2
| * | | | | | | | | | | | | mau limtsNeil Johnson2018-07-311-0/+1
| * | | | | | | | | | | | | coding styleNeil Johnson2018-07-317-9/+12
| * | | | | | | | | | | | | fix user_ips countingNeil Johnson2018-07-311-9/+33
| * | | | | | | | | | | | | remove errant loggingNeil Johnson2018-07-301-1/+0
| * | | | | | | | | | | | | actually close connNeil Johnson2018-07-301-4/+8
| * | | | | | | | | | | | | monthly_active_testsNeil Johnson2018-07-301-0/+48
| * | | | | | | | | | | | | factor out metrics from __init__ to app/homeserverNeil Johnson2018-07-302-25/+32
| * | | | | | | | | | | | | limit register and sign in on number of monthly usersNeil Johnson2018-07-307-3/+166
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #3620 from fuzzmz/return-404-room-not-foundRichard van der Hoff2018-08-013-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Update 2952.bugfixRichard van der Hoff2018-08-011-1/+1
| * | | | | | | | | | | | return NotFoundError if room not foundSerban Constantin2018-07-313-3/+7
* | | | | | | | | | | | | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-0217-67/+122
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3543 from bebehei/dockerJan Christian Grünhage2018-08-014-10/+22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [Docker] Use sorted multiline package listsBenedikt Heine2018-07-192-3/+20
| * | | | | | | | | | | | [Docker] Build docker image via composeBenedikt Heine2018-07-172-7/+2
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-05 11:43:30 +0000