summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Add a way to run tests in PostgreSQL in Docker (#3699)Amber Brown2018-09-208-9/+79
* Add a regression test for logging on failed connections (#3912)Amber Brown2018-09-204-5/+77
* Improve the logging when handling a federation transaction (#3904)Richard van der Hoff2018-09-193-56/+111
* Merge pull request #3910 from matrix-org/erikj/update_timeoutErik Johnston2018-09-195-87/+52
|\
| * FixupErik Johnston2018-09-192-4/+1
| * Replace custom DeferredTimeoutError with defer.TimeoutErrorErik Johnston2018-09-192-12/+5
| * Run canceller first to allow it to generate correct errorErik Johnston2018-09-191-2/+5
| * NewsfileErik Johnston2018-09-191-0/+1
| * Update to use new timeout function everywhere.Erik Johnston2018-09-194-72/+43
|/
* update changelog for #3909Richard van der Hoff2018-09-191-1/+1
* Merge pull request #3909 from turt2live/travis/fix-logging-1Amber Brown2018-09-192-4/+5
|\
| * ChangelogTravis Ralston2018-09-181-0/+1
| * Destination is a stringTravis Ralston2018-09-181-4/+4
* | Remove documentation referencing Cygwin (#3873)Amber Brown2018-09-193-31/+10
* | Merge pull request #3907 from matrix-org/rav/set_sni_to_server_nameAmber Brown2018-09-192-3/+11
|\ \
| * | changelogRichard van der Hoff2018-09-181-0/+1
| * | Set SNI to the server_name, not whatever was in the SRV recordRichard van der Hoff2018-09-181-3/+10
* | | Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeoutAmber Brown2018-09-192-1/+31
|\ \ \ | |_|/ |/| |
| * | changelogRichard van der Hoff2018-09-181-0/+1
| * | Bump timeout on get_missing_events requestRichard van der Hoff2018-09-181-1/+30
| |/
* | Use directory server for room joins (#3899)Richard van der Hoff2018-09-182-0/+6
* | Refactor matrixfederationclient to fix logging (#3906)Richard van der Hoff2018-09-185-186/+359
* | Merge pull request #3894 from matrix-org/hs/phone_home_py_versionAmber Brown2018-09-192-0/+5
|\ \ | |/ |/|
| * Create 3894.featureWill Hunt2018-09-171-0/+1
| * typoWill Hunt2018-09-171-1/+1
| * make pip happy?Will Hunt2018-09-171-2/+4
| * Use a string for versionsWill Hunt2018-09-171-1/+1
| * Add python_version phone home statWill Hunt2018-09-171-0/+2
* | Merge pull request #3879 from matrix-org/matthew/fix-autojoinRichard van der Hoff2018-09-182-0/+2
|\ \
| * | changelogMatthew Hodgson2018-09-151-0/+1
| * | don't ratelimit autojoinsMatthew Hodgson2018-09-151-0/+1
* | | Merge pull request #3882 from SimmyD/max_upload_docker_varRichard van der Hoff2018-09-183-1/+3
|\ \ \
| * | | Adding the ability to change MAX_UPLOAD_SIZE for the docker container variables.Simon Dwyer2018-09-161-0/+1
| * | | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable.Simon Dwyer2018-09-161-1/+1
| * | | Added description for "SYNAPSE_MAX_UPLOAD_SIZE" variable.Simon Dwyer2018-09-161-0/+1
| * | | Added 'MAX_UPLOAD_SIZE' variable and set default to "10M"Simon Dwyer2018-09-161-1/+1
| |/ /
* | | Merge pull request #3889 from matrix-org/rav/404_on_remove_unknown_aliasRichard van der Hoff2018-09-183-4/+17
|\ \ \
| * | | Reinstate missing null checkRichard van der Hoff2018-09-171-1/+1
| * | | changelogRichard van der Hoff2018-09-171-0/+1
| * | | Return a 404 when deleting unknown room aliasRichard van der Hoff2018-09-172-4/+16
* | | | Merge pull request #3895 from matrix-org/rav/decode_bytes_in_metricsRichard van der Hoff2018-09-183-12/+13
|\ \ \ \
| * | | | changelogRichard van der Hoff2018-09-171-0/+1
| * | | | Fix more b'abcd' noise in metricsRichard van der Hoff2018-09-172-12/+12
* | | | | Merge pull request #3897 from aaronraimist/synaspse-typoRichard van der Hoff2018-09-182-1/+2
|\ \ \ \ \
| * | | | | Add changelogAaron Raimist2018-09-171-0/+1
| * | | | | Fix typo in README, synaspse -> synapseAaron Raimist2018-09-171-1/+1
|/ / / / /
* | | | / Merge pull request #3892 from matrix-org/rav/decode_bytes_in_request_logsRichard van der Hoff2018-09-173-5/+9
|\| | | | | |_|_|/ |/| | |
| * | | changelogRichard van der Hoff2018-09-171-0/+1
| * | | Fix some b'abcd' noise in logs and metricsRichard van der Hoff2018-09-172-5/+8
|/ / /
* / / README: run python_dependencies with -mRichard van der Hoff2018-09-171-1/+1
|/ /
* | Merge pull request #3888 from matrix-org/rav/nuke_nuke_roomsAmber Brown2018-09-172-57/+1
|\ \ | |/ |/|
| * changelogRichard van der Hoff2018-09-171-0/+1
| * Remove nuke-room-from-db.sh scriptRichard van der Hoff2018-09-171-57/+0
|/
* missing changelogMatthew Hodgson2018-09-151-0/+1
* mention libjemalloc in readme (#3877)Vincent Breitmoser2018-09-151-0/+8
* Fix timeout functionErik Johnston2018-09-151-1/+2
* Merge pull request #3875 from matrix-org/erikj/extra_timeoutsErik Johnston2018-09-143-0/+63
|\
| * NewsfileErik Johnston2018-09-141-0/+1
| * 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-142-8/+1
* Merge pull request #3872 from matrix-org/hawkowl/timeouts-2Erik Johnston2018-09-145-7/+13
|\
| * fixAmber Brown2018-09-151-3/+3
| * changelogAmber Brown2018-09-151-0/+1
| * 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-148-61/+55
| |\
| * | buffer?Amber Brown2018-09-141-1/+2
* | | Merge pull request #3871 from matrix-org/erikj/in_flight_block_metricsErik Johnston2018-09-145-4/+217
|\ \ \
| * | | Remove spurious commentErik Johnston2018-09-141-2/+0
| * | | Measure outbound requestsErik Johnston2018-09-141-3/+6
| * | | NewsfileErik Johnston2018-09-141-0/+1
| * | | TestsErik Johnston2018-09-141-0/+81
| * | | Add in flight real time metrics for Measure blocksErik Johnston2018-09-142-1/+131
|/ / /
* | | Merge pull request #3860 from matrix-org/travis/typo-1Travis Ralston2018-09-132-1/+2
|\ \ \ | |_|/ |/| |
| * | Create 3860.miscTravis Ralston2018-09-131-0/+1
| * | Fix minor typo in exceptionTravis Ralston2018-09-131-1/+1
|/ /
* / merge (#3576)Amber Brown2018-09-148-61/+55
|/
* Merge pull request #3856 from matrix-org/erikj/speed_up_purge hhs-8Erik Johnston2018-09-132-16/+29
|\
| * 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-134-2/+28
| |\
| * | NewsfileErik Johnston2018-09-131-0/+1
| * | Make purge history slightly fasterErik Johnston2018-09-131-2/+9
* | | Merge pull request #3859 from matrix-org/erikj/add_iterkeysAmber Brown2018-09-143-1/+7
|\ \ \
| * | | NewsfileErik Johnston2018-09-131-0/+1
| * | | Fix handling of redacted events from federationErik Johnston2018-09-132-1/+6
* | | | fix circleci merged builds (#3858)Amber Brown2018-09-142-0/+5
|/ / /
* | / Attempt to figure out what's going on with timeouts (#3857)Amber Brown2018-09-144-57/+241
| |/ |/|
* | Remove some superfluous logging (#3855)Amber Brown2018-09-134-2/+28
|/
* Merge pull request #3846 from matrix-org/neilj/expose-registered-users hhs-7Neil Johnson2018-09-124-3/+60
|\
| * improve namingNeil Johnson2018-09-124-10/+14
| * towncrierNeil Johnson2018-09-121-0/+1
| * expose number of real reserved usersNeil Johnson2018-09-123-3/+55
* | show heroes if a room has a 'deleted' name/canonical_alias (#3851)Matthew Hodgson2018-09-122-2/+16
* | Merge pull request #3853 from matrix-org/erikj/log_outbound_each_timeErik Johnston2018-09-122-75/+75
|\ \
| * | NewsfileErik Johnston2018-09-121-0/+1
| * | 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-122-13/+32
|\ \ \
| * | | NewsfileErik Johnston2018-09-111-0/+1
| * | | Change the manhole SSH key to have more bitsErik Johnston2018-09-111-13/+31
* | | | Add JUnit summaries to CircleCI as well as merged runs (#3704)Amber Brown2018-09-123-0/+94
* | | | Port federation/ to py3 (#3847)Amber Brown2018-09-124-19/+19
* | | | Merge pull request #3835 from krombel/fix_3821Amber Brown2018-09-122-1/+6
|\ \ \ \
| * | | | add changelogKrombel2018-09-101-0/+1
| * | | | 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-124-13/+47
|\ \ \ \ \
| * | | | | changelogRichard van der Hoff2018-09-071-0/+1
| * | | | | 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-123-1/+2
|\ \ \ \ \ \
| * | | | | | changelogRichard van der Hoff2018-09-071-0/+1
| * | | | | | Fix jwt import checkRichard van der Hoff2018-09-072-1/+1
* | | | | | | Port rest/ to Python 3 (#3823)Amber Brown2018-09-1218-100/+113
| |_|_|_|/ / |/| | | | |
* | | | | | Port crypto/ to Python 3 (#3822)Amber Brown2018-09-124-6/+14
* | | | | | Merge pull request #3845 from matrix-org/erikj/timeout_readsAmber Brown2018-09-122-7/+46
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | NewsfileErik Johnston2018-09-121-0/+1
| * | | | | Timeout reading body for outbound HTTP requestsErik Johnston2018-09-121-7/+45
|/ / / / /
* | | | / Speed up lazy loading (#3827)Matthew Hodgson2018-09-125-30/+159
| |_|_|/ |/| | |
* | | | Merge pull request #3834 from mvgorcum/developErik Johnston2018-09-102-10/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | add runtime dependenciesJan Christian Grünhage2018-09-101-5/+10
| * | | NewsfileMathijs van Gorcum2018-09-101-0/+1
| * | | Move COPY before RUN and merge RUNsMathijs van Gorcum2018-09-101-5/+5
| * | | Remove build requirements after buildingMathijs van Gorcum2018-09-101-2/+3
|/ / /
* | | Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_joinAmber Brown2018-09-072-0/+14
|\ \ \
| * | | NewsfileErik Johnston2018-09-061-0/+1
| * | | 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 pull request #3783 from cwmke/developRichard van der Hoff2018-09-071-0/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove end '/'sColin W2018-09-021-2/+2
| * | | Update readme on develop branchColin W2018-09-021-0/+12
* | | | Merge branch 'master' into developAmber Brown2018-09-0729-28/+61
|\ \ \ \
| * | | | changelog v0.33.4 github/release-v0.33.4 release-v0.33.4Amber Brown2018-09-072-1/+9
| * | | | versionAmber Brown2018-09-071-1/+1
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into release-v0.33.4 v0.33.4rc2Erik Johnston2018-09-060-0/+0
| |\ \ \ \
| * | | | | Bump version and changelogErik Johnston2018-09-062-1/+7
| * | | | | Merge tag 'v0.33.3.1' into release-v0.33.4Erik Johnston2018-09-067-46/+158
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #3802 from matrix-org/jcgruenhage/docker-unignore-synctlAmber Brown2018-09-062-1/+1
| |\ \ \ \ \ \
| | * | | | | | Create 3802.miscJan Christian Grünhage2018-09-061-0/+1
| | * | | | | | remove synctl from .dockerignoreJan Christian Grünhage2018-09-061-1/+0
| |/ / / / / /
| * | | | | | version and towncrier v0.33.4rc1Amber Brown2018-09-0429-28/+45
* | | | | | | Port tests/ to Python 3 (#3808)Amber Brown2018-09-0712-430/+349
* | | | | | | Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6Neil Johnson2018-09-065-6/+54
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | ensure guests never enter mau listNeil Johnson2018-09-064-8/+10
| * | | | | | towncrierNeil Johnson2018-09-051-0/+1
| * | | | | | guest users should not be part of mau totalNeil Johnson2018-09-052-3/+48
* | | | | | | Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edusAmber Brown2018-09-072-0/+13
|\ \ \ \ \ \ \
| * | | | | | | SpellingErik Johnston2018-09-061-1/+1
| * | | | | | | NewsfileErik Johnston2018-09-061-0/+1
| * | | | | | | Limit the number of PDUs/EDUs per fedreation transactionErik Johnston2018-09-061-0/+12
* | | | | | | | Merge pull request #3806 from matrix-org/erikj/limit_postgres_travisAmber Brown2018-09-072-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | NewsfileErik Johnston2018-09-061-0/+1
| * | | | | | | | Only start postgres instance for postgres tests on Travis CIErik Johnston2018-09-061-3/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #3788 from matrix-org/erikj/remove_conn_idAmber Brown2018-09-072-12/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove conn_idErik Johnston2018-09-041-2/+2
| * | | | | | | | NewsfileErik Johnston2018-09-031-0/+1
| * | | | | | | | 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-072-8/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NewsfileErik Johnston2018-09-051-0/+1
| * | | | | | | | | User iter* during sync state calculationsErik Johnston2018-09-051-8/+8
* | | | | | | | | | Merge pull request #3804 from matrix-org/rav/fix_openssl_depAmber Brown2018-09-072-2/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | changelogRichard van der Hoff2018-09-061-0/+1
| * | | | | | | | | bump dep on pyopenssl to 16.xRichard van der Hoff2018-09-061-2/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Port handlers/ to Python 3 (#3803)Amber Brown2018-09-078-19/+24
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'master' into developRichard van der Hoff2018-09-069-47/+157
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge tag 'v0.33.3.1'Richard van der Hoff2018-09-069-47/+157
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | prepare v0.33.3.1 v0.33.3.1 github/release-v0.33.3.1 release-v0.33.3.1Richard van der Hoff2018-09-063-2/+15
| | * | | | | Create 3802.miscJan Christian Grünhage2018-09-061-0/+1
| | * | | | | remove synctl from .dockerignoreJan Christian Grünhage2018-09-061-1/+0
| | * | | | | Fix origin handling for pushed transactionsRichard van der Hoff2018-09-055-29/+32
| | * | | | | 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-053-13/+40
|\ \ \ \ \ \ \
| * | | | | | | changelogRichard van der Hoff2018-09-041-0/+1
| * | | | | | | Implement 'event_format' filter param in /syncRichard van der Hoff2018-09-042-13/+39
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Port http/ to Python 3 (#3771)Amber Brown2018-09-068-186/+134
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings hhs-5Neil Johnson2018-09-043-7/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | towncrierNeil Johnson2018-09-041-0/+1
| * | | | | improve human readable error messageNeil Johnson2018-09-041-1/+2
| * | | | | improve human readable error messagesNeil Johnson2018-09-042-7/+20
* | | | | | Fix tests on postgresql (#3740)Amber Brown2018-09-0418-341/+356
| |_|_|/ / |/| | | |
* | | | | Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_funcErik Johnston2018-09-034-57/+8
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2018-09-031-0/+1
| * | | | | Remove unnecessary resolve_events_with_state_mapErik Johnston2018-08-223-57/+7
* | | | | | Merge pull request #3378 from NickEckardt/developAmber Brown2018-09-032-5/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Create 3378.miscAmber Brown2018-09-031-0/+1
| * | | | | Merge branch 'develop' into developAmber Brown2018-09-03441-11570/+24237
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #3777 from matrix-org/neilj/fix_register_user_registrationNeil Johnson2018-08-319-5/+78
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | assert rather than warn hhs-4Neil Johnson2018-08-311-3/+2
| * | | | | move threepid checker to config, add missing yieldsNeil Johnson2018-08-316-21/+41
| * | | | | fix reference to is_threepid_reservedNeil Johnson2018-08-311-1/+1
| * | | | | typoNeil Johnson2018-08-311-1/+1
| * | | | | ensure post registration auth checks do not fail erroneouslyNeil Johnson2018-08-314-6/+24
| * | | | | news fragemntNeil Johnson2018-08-311-0/+1
| * | | | | fix bug where preserved threepid user comes to sign up and server is mau blockedNeil Johnson2018-08-315-3/+38
|/ / / / /
* | | | | Port storage/ to Python 3 (#3725)Amber Brown2018-08-3117-36/+208
* | | | | Merge pull request #3764 from matrix-org/rav/close_db_conn_after_initRichard van der Hoff2018-08-3016-54/+41
|\ \ \ \ \
| * | | | | Fix up testsRichard van der Hoff2018-08-283-6/+10
| * | | | | use abc.abstractpropertyRichard van der Hoff2018-08-281-5/+4
| * | | | | changelogRichard van der Hoff2018-08-281-0/+1
| * | | | | Make sure that we close db connections opened during initRichard van der Hoff2018-08-2812-48/+31
* | | | | | Merge pull request #3768 from krombel/fix_3445Erik Johnston2018-08-292-2/+3
|\ \ \ \ \ \
| * | | | | | changelogKrombel2018-08-292-1/+1
| * | | | | | fix #3445Krombel2018-08-292-2/+3
|/ / / / / /
* | | | | | Update CONTRIBUTING to clarify miscs & Markdown (#3730)Amber Brown2018-08-292-3/+5
* | | | | | don't return non-LL-member state in incremental sync state blocks (#3760)Matthew Hodgson2018-08-282-1/+9
|/ / / / /
* | | | | Merge pull request #3758 from matrix-org/erikj/admin_contact hhs-3Erik Johnston2018-08-248-13/+14
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contactErik Johnston2018-08-243-4/+5
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #3756 from matrix-org/erikj/fix_tags_server_noticesErik Johnston2018-08-243-4/+5
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2018-08-241-0/+1
| * | | | | | Fix checking if service notice room is already taggedErik Johnston2018-08-242-4/+4
|/ / / / / /
| * | | | | NewsfileErik Johnston2018-08-241-0/+1
| * | | | | Change admin_uri to admin_contact in config and errorsErik Johnston2018-08-247-13/+13
|/ / / / /
* | | | | Merge pull request #3755 from matrix-org/erikj/fix_server_notice_tags hhs-2Erik Johnston2018-08-243-4/+16
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2018-08-241-0/+1
| * | | | | 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-242-1/+2
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2018-08-241-0/+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-242-0/+5
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2018-08-241-0/+1
| * | | | | | 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-242-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | changelogRichard van der Hoff2018-08-241-0/+1
| * | | | | Pin to twisted 17.1 or laterRichard van der Hoff2018-08-241-1/+1
* | | | | | Merge pull request #3749 from matrix-org/erikj/add_trial_usersErik Johnston2018-08-248-5/+272
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | NewsfileErik Johnston2018-08-231-0/+1
| * | | | | Unit testsErik Johnston2018-08-232-3/+227
| * | | | | Implement trail usersErik Johnston2018-08-235-2/+44
|/ / / / /
* | | | | Merge pull request #3747 from matrix-org/erikj/fix_multiple_sends_noticeErik Johnston2018-08-233-1/+72
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2018-08-231-0/+1
| * | | | | Fix bug where we resent "limit exceeded" server noticesErik Johnston2018-08-232-1/+71
|/ / / / /
* | | | | Merge pull request #3734 from matrix-org/travis/worker-docsTravis Ralston2018-08-232-1/+2
|\ \ \ \ \
| * | | | | Create 3734.miscTravis Ralston2018-08-211-0/+1
| * | | | | Reference that the federation_reader needs the HTTP replication port setTravis Ralston2018-08-211-1/+1
* | | | | | Merge pull request #3746 from matrix-org/erikj/mau_fixupsErik Johnston2018-08-233-1/+3
|\ \ \ \ \ \
| * | | | | | NewsfileErik Johnston2018-08-231-0/+1
| * | | | | | Actually run the testsErik Johnston2018-08-231-0/+0
| * | | | | | Add missing yieldErik Johnston2018-08-231-1/+2
|/ / / / / /
* | | | | | Merge pull request #3680 from matrix-org/neilj/server_notices_on_blockingErik Johnston2018-08-2210-32/+408
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Erik Johnston2018-08-22116-764/+1624
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge branch 'master' into developRichard van der Hoff2018-08-223-4/+12
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Use recaptcha_ajax.js directly from GoogleRichard van der Hoff2018-08-222-196/+1
| * | | | | Merge tag 'v0.33.3'Richard van der Hoff2018-08-22200-3529/+5653
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | changelog for 0.33.3 v0.33.3 github/release-v0.33.3 release-v0.33.3Richard van der Hoff2018-08-222-1/+9
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-10 13:53:37 +0000