summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail...Richard van der Hoff2018-09-1813-39/+247
|\
| * Merge pull request #3879 from matrix-org/matthew/fix-autojoinRichard van der Hoff2018-09-181-0/+1
| |\
| | * don't ratelimit autojoinsMatthew Hodgson2018-09-151-0/+1
| * | Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_aliasRichard van der Hoff2018-09-182-4/+16
| |\ \
| | * | Reinstate missing null checkRichard van der Hoff2018-09-171-1/+1
| | * | Return a 404 when deleting unknown room aliasRichard van der Hoff2018-09-172-4/+16
| | |/
| * | Fix more b'abcd' noise in metricsRichard van der Hoff2018-09-172-12/+12
| * | Fix some b'abcd' noise in logs and metricsRichard van der Hoff2018-09-172-5/+8
| |/
| * Fix timeout functionErik Johnston2018-09-151-1/+2
| * Add an awful secondary timeout to fix wedged requestsErik Johnston2018-09-142-0/+62
| * don't filter membership events based on history visibility (#3874)Matthew Hodgson2018-09-141-8/+1
| * Merge pull request #3872 from matrix-org/hawkowl/timeouts-2Erik Johnston2018-09-144-7/+12
| |\
| | * fixAmber Brown2018-09-151-3/+3
| | * fixAmber Brown2018-09-141-1/+4
| | * fixAmber Brown2018-09-141-1/+1
| | * redact betterAmber Brown2018-09-141-2/+2
| | * we do that higher upAmber Brown2018-09-141-0/+1
| | * Merge remote-tracking branch 'origin/develop' into hawkowl/timeouts-2Amber Brown2018-09-144-15/+36
| | |\
| | * | buffer?Amber Brown2018-09-141-1/+2
| * | | Remove spurious commentErik Johnston2018-09-141-2/+0
| * | | Measure outbound requestsErik Johnston2018-09-141-3/+6
| * | | Add in flight real time metrics for Measure blocksErik Johnston2018-09-142-1/+131
| * | | Fix minor typo in exceptionTravis Ralston2018-09-131-1/+1
| | |/ | |/|
* / | fix link for case that config.email_riot_base_url is setNeil Johnson2018-09-131-1/+1
|/ /
* / merge (#3576)Amber Brown2018-09-144-15/+36
|/
* Merge pull request #3856 from matrix-org/erikj/speed_up_purge hhs-8Erik Johnston2018-09-131-16/+28
|\
| * commentErik Johnston2018-09-131-0/+2
| * pep8Erik Johnston2018-09-131-1/+0
| * Create indices after insertionErik Johnston2018-09-131-14/+18
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_p...Erik Johnston2018-09-132-1/+26
| |\
| * | Make purge history slightly fasterErik Johnston2018-09-131-2/+9
* | | Fix handling of redacted events from federationErik Johnston2018-09-132-1/+6
* | | Attempt to figure out what's going on with timeouts (#3857)Amber Brown2018-09-141-56/+42
| |/ |/|
* | Remove some superfluous logging (#3855)Amber Brown2018-09-132-1/+26
|/
* Merge pull request #3846 from matrix-org/neilj/expose-registered-users hhs-7Neil Johnson2018-09-122-3/+28
|\
| * improve namingNeil Johnson2018-09-122-6/+10
| * expose number of real reserved usersNeil Johnson2018-09-122-3/+24
* | show heroes if a room has a 'deleted' name/canonical_alias (#3851)Matthew Hodgson2018-09-121-2/+15
* | Merge pull request #3853 from matrix-org/erikj/log_outbound_each_timeErik Johnston2018-09-121-75/+74
|\ \
| * | Log outbound requests when we retryErik Johnston2018-09-121-75/+74
* | | argh pep8Matthew Hodgson2018-09-121-1/+1
* | | correctly log gappy sync metricsMatthew Hodgson2018-09-121-1/+1
* | | fix loglineMatthew Hodgson2018-09-121-1/+1
* | | Merge pull request #3841 from matrix-org/erikj/manhole_key_lengthErik Johnston2018-09-121-13/+31
|\ \ \
| * | | Change the manhole SSH key to have more bitsErik Johnston2018-09-111-13/+31
* | | | Port federation/ to py3 (#3847)Amber Brown2018-09-123-19/+18
* | | | Merge pull request #3835 from krombel/fix_3821Amber Brown2018-09-121-1/+5
|\ \ \ \
| * | | | fix VOIP crashes under Python 3 (#3821)Krombel2018-09-101-1/+5
| |/ / /
* | | | Merge pull request #3826 from matrix-org/rav/logging_for_keyringAmber Brown2018-09-123-13/+46
|\ \ \ \
| * | | | clearer logging when things fail, tooRichard van der Hoff2018-09-062-7/+28
| * | | | add some logging for the keyring queueRichard van der Hoff2018-09-061-6/+18
* | | | | Merge pull request #3824 from matrix-org/rav/fix_jwt_importAmber Brown2018-09-122-1/+1
|\ \ \ \ \
| * | | | | Fix jwt import checkRichard van der Hoff2018-09-072-1/+1
* | | | | | Port rest/ to Python 3 (#3823)Amber Brown2018-09-1217-100/+112
| |_|_|/ / |/| | | |
* | | | | Port crypto/ to Python 3 (#3822)Amber Brown2018-09-123-6/+13
* | | | | Timeout reading body for outbound HTTP requestsErik Johnston2018-09-121-7/+45
| |_|_|/ |/| | |
* | | | Speed up lazy loading (#3827)Matthew Hodgson2018-09-123-30/+157
| |_|/ |/| |
* | | Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_joinAmber Brown2018-09-071-0/+13
|\ \ \ | |/ / |/| |
| * | Don't send empty tags list down syncErik Johnston2018-09-061-0/+5
| * | Send existing room tags down sync on joinErik Johnston2018-09-061-0/+8
* | | Merge branch 'master' into developAmber Brown2018-09-071-1/+1
|\ \ \
| * | | versionAmber Brown2018-09-071-1/+1
| * | | Bump version and changelogErik Johnston2018-09-061-1/+1
| * | | Merge tag 'v0.33.3.1' into release-v0.33.4Erik Johnston2018-09-064-31/+125
| |\ \ \
| * | | | version and towncrier v0.33.4rc1Amber Brown2018-09-041-1/+1
* | | | | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6Neil Johnson2018-09-061-1/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | ensure guests never enter mau listNeil Johnson2018-09-061-4/+3
| * | | | guest users should not be part of mau totalNeil Johnson2018-09-051-1/+6
* | | | | Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edusAmber Brown2018-09-071-0/+12
|\ \ \ \ \
| * | | | | Limit the number of PDUs/EDUs per fedreation transactionErik Johnston2018-09-061-0/+12
* | | | | | Merge pull request #3788 from matrix-org/erikj/remove_conn_idAmber Brown2018-09-071-12/+12
|\ \ \ \ \ \
| * | | | | | Remove conn_idErik Johnston2018-09-041-2/+2
| * | | | | | Remove conn_id from repl prometheus metricsErik Johnston2018-09-031-10/+10
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3795 from matrix-org/erikj/faster_sync_stateAmber Brown2018-09-071-8/+8
|\ \ \ \ \ \
| * | | | | | User iter* during sync state calculationsErik Johnston2018-09-051-8/+8
* | | | | | | Merge pull request #3804 from matrix-org/rav/fix_openssl_depAmber Brown2018-09-071-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | bump dep on pyopenssl to 16.xRichard van der Hoff2018-09-061-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Port handlers/ to Python 3 (#3803)Amber Brown2018-09-076-19/+22
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'master' into developRichard van der Hoff2018-09-065-32/+126
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | prepare v0.33.3.1 v0.33.3.1 github/release-v0.33.3.1 release-v0.33.3.1Richard van der Hoff2018-09-061-1/+1
| * | | Fix origin handling for pushed transactionsRichard van der Hoff2018-09-053-15/+15
| * | | Check that signatures on events are validRichard van der Hoff2018-09-051-16/+110
* | | | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filterRichard van der Hoff2018-09-052-13/+39
|\ \ \ \
| * | | | Implement 'event_format' filter param in /syncRichard van der Hoff2018-09-042-13/+39
| | |_|/ | |/| |
* | | | Port http/ to Python 3 (#3771)Amber Brown2018-09-066-184/+130
| |_|/ |/| |
* | | Merge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings hhs-5Neil Johnson2018-09-042-7/+21
|\ \ \ | |/ / |/| |
| * | improve human readable error messageNeil Johnson2018-09-041-1/+2
| * | improve human readable error messagesNeil Johnson2018-09-042-7/+20
* | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_funcErik Johnston2018-09-033-57/+7
|\ \ \ | |/ / |/| |
| * | Remove unnecessary resolve_events_with_state_mapErik Johnston2018-08-223-57/+7
* | | assert rather than warn hhs-4Neil Johnson2018-08-311-3/+2
* | | move threepid checker to config, add missing yieldsNeil Johnson2018-08-315-21/+35
* | | fix reference to is_threepid_reservedNeil Johnson2018-08-311-1/+1
* | | ensure post registration auth checks do not fail erroneouslyNeil Johnson2018-08-314-6/+24
* | | fix bug where preserved threepid user comes to sign up and server is mau blockedNeil Johnson2018-08-314-3/+21
* | | Port storage/ to Python 3 (#3725)Amber Brown2018-08-3111-31/+77
* | | Merge pull request #3764 from matrix-org/rav/close_db_conn_after_initRichard van der Hoff2018-08-3012-48/+30
|\ \ \
| * | | use abc.abstractpropertyRichard van der Hoff2018-08-281-5/+4
| * | | Make sure that we close db connections opened during initRichard van der Hoff2018-08-2812-48/+31
* | | | fix #3445Krombel2018-08-291-2/+2
* | | | don't return non-LL-member state in incremental sync state blocks (#3760)Matthew Hodgson2018-08-281-1/+8
|/ / /
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contactErik Johnston2018-08-241-4/+3
|\ \ \
| * | | Fix checking if service notice room is already taggedErik Johnston2018-08-241-4/+3
* | | | Change admin_uri to admin_contact in config and errorsErik Johnston2018-08-244-8/+8
|/ / /
* | | Ensure we wake up /sync when we add tag to notice roomErik Johnston2018-08-242-2/+13
* | | Make content of tag an empty object rather than nullErik Johnston2018-08-242-2/+2
* | | Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1Erik Johnston2018-08-241-1/+1
|\ \ \
| * | | Fix bug when federation_domain_whitelist is an emtpy listErik Johnston2018-08-241-1/+1
* | | | Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticseErik Johnston2018-08-241-0/+4
|\ \ \ \
| * | | | Fix bug where we broke sync when using limit_usage_by_mauErik Johnston2018-08-241-0/+4
| |/ / /
* | | | Merge pull request #3751 from matrix-org/rav/twisted_17Richard van der Hoff2018-08-241-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Pin to twisted 17.1 or laterRichard van der Hoff2018-08-241-1/+1
* | | | Implement trail usersErik Johnston2018-08-234-2/+43
|/ / /
* | | Fix bug where we resent "limit exceeded" server noticesErik Johnston2018-08-231-1/+5
* | | Add missing yieldErik Johnston2018-08-231-1/+2
* | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Erik Johnston2018-08-2255-603/+1130
|\| |
| * | Merge branch 'master' into developRichard van der Hoff2018-08-221-1/+1
| |\ \
| | * | Use recaptcha_ajax.js directly from GoogleRichard van der Hoff2018-08-222-196/+1
| | * | Merge tag 'v0.33.3'Richard van der Hoff2018-08-22103-916/+2769
| | |\|
| | | * bump version to 0.33.3Richard van der Hoff2018-08-221-1/+1
| | * | Revert "Use recaptcha_ajax.js directly from Google"Richard van der Hoff2018-08-132-1/+196
| * | | Merge pull request #3724 from Half-Shot/hs/guest-fetch-eventErik Johnston2018-08-221-1/+1
| |\ \ \
| | * | | Allow guests to access /rooms/:roomId/event/:eventIdWill Hunt2018-08-201-1/+1
| * | | | Merge pull request #3659 from matrix-org/erikj/split_profilesErik Johnston2018-08-226-42/+74
| |\ \ \ \
| | * | | | Rename WorkerProfileHandler to BaseProfileHandlerErik Johnston2018-08-222-5/+12
| | * | | | Add assert to ensure handler is only run on masterErik Johnston2018-08-221-0/+2
| | * | | | Remove redundant varsErik Johnston2018-08-221-3/+0
| | * | | | Add some fixmesErik Johnston2018-08-172-0/+6
| | * | | | Call UserDirectoryHandler methods directlyErik Johnston2018-08-174-104/+8
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-1768-538/+1330
| | |\ \ \ \
| | * | | | | Split ProfileHandler into master and workerErik Johnston2018-08-172-9/+19
| | * | | | | Remote profile cache should remain in master workerErik Johnston2018-08-171-4/+2
| | * | | | | DocstringsErik Johnston2018-08-091-1/+11
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_prof...Erik Johnston2018-08-0930-126/+667
| | |\ \ \ \ \
| | * | | | | | Allow ratelimiting on workersErik Johnston2018-08-071-29/+29
| | * | | | | | Allow profile changes to happen on workersErik Johnston2018-08-075-8/+106
| * | | | | | | Merge pull request #3673 from matrix-org/erikj/refactor_state_handlerErik Johnston2018-08-226-271/+388
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2018-08-2081-748/+1735
| | |\ \ \ \ \ \ \
| | * | | | | | | | Remove redundant room_version checksErik Johnston2018-08-202-15/+4
| | * | | | | | | | Revert spurious changeErik Johnston2018-08-201-2/+2
| | * | | | | | | | Add fast path in state res for zero prev eventsErik Johnston2018-08-091-1/+6
| | * | | | | | | | Choose state algorithm based on room versionErik Johnston2018-08-094-16/+105
| | * | | | | | | | Add constants for room versionsErik Johnston2018-08-091-2/+7
| | * | | | | | | | Refactor state moduleErik Johnston2018-08-092-296/+325
| * | | | | | | | | Merge pull request #3735 from matrix-org/travis/federation-spellingRichard van der Hoff2018-08-221-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | limt -> limitTravis Ralston2018-07-311-1/+1
| * | | | | | | | | | Merge remote-tracking branch 'origin/release-v0.33.3' into developRichard van der Hoff2018-08-221-3/+12
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | fix another consent encoding failRichard van der Hoff2018-08-211-1/+1
| | * | | | | | | | | Fix 500 error from /consent formRichard van der Hoff2018-08-211-2/+11
| * | | | | | | | | | Split the state_group_cache in two (#3726)Matthew Hodgson2018-08-221-17/+141
| * | | | | | | | | | Merge tag 'v0.33.3rc2' into developRichard van der Hoff2018-08-213-4/+18
| |\| | | | | | | | |
| | * | | | | | | | | changelog v0.33.3rc2Amber Brown2018-08-211-1/+1
| | * | | | | | | | | Fix exceptions when a connection is closed before we read the headersRichard van der Hoff2018-08-202-2/+10
| | * | | | | | | | | Robustness fix for logcontext filterRichard van der Hoff2018-08-201-1/+7
| | * | | | | | | | | versionAmber Brown2018-08-211-1/+1
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3727 from matrix-org/erikj/dont_error_on_missing_keysErik Johnston2018-08-212-5/+9
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Log more detail when we fail to authenticate requestErik Johnston2018-08-211-3/+3
| | * | | | | | | | | Don't log exceptions when failing to fetch server keysErik Johnston2018-08-212-4/+8
| | |/ / / / / / / /
| * | | | | | | | | Fix typoErik Johnston2018-08-211-4/+4
| * | | | | | | | | isortErik Johnston2018-08-211-1/+2
| * | | | | | | | | Make the in flight requests metrics thread safeErik Johnston2018-08-201-3/+10
| * | | | | | | | | Make the in flight background process metrics thread safeErik Johnston2018-08-201-5/+20
| |/ / / / / / / /
| * | | / / / / / Port over enough to get some sytests running on Python 3 (#3668)Amber Brown2018-08-2011-40/+90
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Use get_cache_factor_for function for `state_cache`Erik Johnston2018-08-201-2/+2
| * | | | | | | Merge pull request #3713 from matrix-org/erikj/fixup_fed_loggingErik Johnston2018-08-201-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix logging bug in EDU handling over replicationErik Johnston2018-08-171-1/+1
| * | | | | | | | Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commandsRichard van der Hoff2018-08-178-20/+53
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Logcontexts for replication command handlersRichard van der Hoff2018-08-178-20/+53
| | |/ / / / / / /
| * | | | | | | | Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updatesRichard van der Hoff2018-08-175-21/+28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix logcontexts for running pushersRichard van der Hoff2018-08-175-21/+28
| | |/ / / / / / /
| * | | | | | | | Integrate presence from hotfixes (#3694)Amber Brown2018-08-189-17/+90
| * | | | | | | | Remove v1/register's broken shared secret functionality (#3703)Amber Brown2018-08-181-54/+0
| * | | | | | | | Merge pull request #3701 from matrix-org/rav/use_producer_for_responsesRichard van der Hoff2018-08-171-4/+13
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use a producer to stream back responsesRichard van der Hoff2018-08-151-4/+13
| * | | | | | | | | Merge pull request #3700 from matrix-org/rav/wait_for_producersRichard van der Hoff2018-08-172-92/+179
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Refactor request logging codeRichard van der Hoff2018-08-152-92/+179
* | | | | | | | | | | Update notice formatErik Johnston2018-08-222-5/+15
* | | | | | | | | | | rename error codeNeil Johnson2018-08-182-4/+4
* | | | | | | | | | | special case server_notices_mxidNeil Johnson2018-08-181-0/+6
* | | | | | | | | | | special case server_notices_mxidNeil Johnson2018-08-181-1/+1
* | | | | | | | | | | clean up, no functional changesNeil Johnson2018-08-172-41/+47
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-173-6/+55
|\| | | | | | | | | |
| * | | | | | | | | | Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse in...Neil Johnson2018-08-176-3/+18
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' into neilj/limit_exceeded_errorNeil Johnson2018-08-176-3/+18
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| * | / | | | | | | | | server limits config docsNeil Johnson2018-08-171-0/+26
| |/ / / / / / / / / /
| * | | | | | | | | | add new error type ResourceLimitNeil Johnson2018-08-163-6/+28
* | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-176-3/+17
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | remove errant yieldNeil Johnson2018-08-171-1/+1
| * | | | | | | | | | call reap on start up and fix under reaping bugNeil Johnson2018-08-163-2/+6
| * | | | | | | | | | block event creation and room creation on hitting resource limitsNeil Johnson2018-08-162-1/+9
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix inbound federation on reader workerErik Johnston2018-08-161-0/+2
| |/ / / / / / / /
* | | | | | | | | flake8Neil Johnson2018-08-161-3/+2
* | | | | | | | | refactor for readability, and reuse caching for setting tagsNeil Johnson2018-08-162-68/+114
* | | | | | | | | add room taggingNeil Johnson2018-08-161-9/+5
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-164-3/+96
|\| | | | | | | |
| * | | | | | | | Add GET media/v1/config (#3184)Will Hunt2018-08-162-1/+50
| * | | | | | | | lazyload aware /messages (#3589)Matthew Hodgson2018-08-162-2/+46
* | | | | | | | | check for room state before deciding on actionNeil Johnson2018-08-162-67/+26
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-165-18/+158
|\| | | | | | | |
| * | | | | | | | initial cut at a room summary API (#3574)Matthew Hodgson2018-08-165-18/+158
* | | | | | | | | WIP impl commiting to get feedbackNeil Johnson2018-08-161-6/+74
* | | | | | | | | fix case where empty string state check is evaulated as FalseNeil Johnson2018-08-161-1/+2
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-155-20/+172
|\| | | | | | | |
| * | | | | | | | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+mausNeil Johnson2018-08-151-2/+2
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...Neil Johnson2018-08-1523-178/+591
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by...Neil Johnson2018-08-142-2/+3
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-141-1/+0
| | * | | | | | | | | | fix off by 1s on mauNeil Johnson2018-08-141-2/+2
| | * | | | | | | | | | Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-141-10/+0
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-144-17/+35
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into nei...Neil Johnson2018-08-143-8/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | speed up /members and add at= and membership params (#3568)Matthew Hodgson2018-08-154-18/+170
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-1559-489/+855
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #3653 from matrix-org/erikj/split_federationErik Johnston2018-08-1514-138/+498
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fede...Erik Johnston2018-08-1554-337/+368
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Use federation handler function rather than duplicateErik Johnston2018-08-152-48/+10
| | * | | | | | | | | | | | Rename slave TransactionStore to SlaveTransactionStoreErik Johnston2018-08-156-11/+11
| | * | | | | | | | | | | | 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-0930-126/+667
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | 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-154-22/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | clean up AuthErrorNeil Johnson2018-08-151-7/+3
| | * | | | | | | | | | | Merge branch 'neilj/update_limits_error_codes' of github.com:matrix-org/synap...Neil Johnson2018-08-151-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | update error codes for resource limitingNeil Johnson2018-08-151-2/+1
| | * | | | | | | | | | | | update admin email to uriNeil Johnson2018-08-151-1/+1
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | replace admin_email with admin_uri for greater flexibilityNeil Johnson2018-08-153-8/+8
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_emailNeil Johnson2018-08-143-25/+56
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | remove blank lineNeil Johnson2018-08-141-1/+0
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Update register.pyNeil Johnson2018-08-141-10/+0
| | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-134-17/+35
| * | | | | | | | | | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_nameNeil Johnson2018-08-151-3/+3
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/change_pro...Neil Johnson2018-08-143-9/+28
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | 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-155-20/+78
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | 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-085-20/+76
| * | | | | | | | | | adding missing yieldNeil Johnson2018-08-141-1/+1
| * | | | | | | | | | Merge pull request #3670 from matrix-org/neilj/mau_sync_blockNeil Johnson2018-08-143-8/+27
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | make comments clearerNeil Johnson2018-08-141-1/+2
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_po...Amber Brown2018-08-144-196/+11
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge pull request #3677 from andrewshadura/masterRichard van der Hoff2018-08-132-196/+1
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | Use recaptcha_ajax.js directly from GoogleAndrej Shadura2018-08-102-196/+1
| | * | | | | | | | Revert "support admin_email config and pass through into blocking errors, ret...Neil Johnson2018-08-134-35/+17
| | * | | | | | | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-134-17/+35
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-27 14:20:24 +0000