summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Add type hints to profile and base handlers. (#8609)Patrick Cloke2020-10-216-41/+72
* Consistently use wrap_as_background_task in more places (#8599)Patrick Cloke2020-10-205-30/+20
* Update mypy to 0.790, and move dependencies to extras (#8583)Jonathan de Jong2020-10-203-3/+4
* Remove some extraneous @unittest.INFOs on unit tests (#8592)Andrew Morgan2020-10-203-2/+1
* Cast errors generated during synapse_port_db to str (#8585)Andrew Morgan2020-10-202-2/+4
* Move schema file for as_device_stream (#8590)Will Hunt2020-10-202-3/+3
* Fix 'LruCache' object has no attribute '_on_resize' (#8591)Richard van der Hoff2020-10-193-2/+17
* Drop unused `device_max_stream_id` table (#8589)Vasilis Gerakaris2020-10-192-0/+2
* Fix mypy error: auth handler "checkpw" internal function type mismatch (#8569)Jonathan de Jong2020-10-193-4/+6
* Expose the experimental appservice login flow to clients. (#8504)Patrick Cloke2020-10-192-0/+3
* Add `DeferredCache.get_immediate` method (#8568)Richard van der Hoff2020-10-197-27/+53
* Include a simple message in email notifications that include encrypted conten...Patrick Cloke2020-10-199-75/+107
* Support running synmark on macOS. (#8578)Patrick Cloke2020-10-192-2/+6
* Start an opentracing span for background processes. (#8567)Erik Johnston2020-10-192-5/+7
* Replace DeferredCache with LruCache where possible (#8563)Richard van der Hoff2020-10-198-27/+30
* Pre-emptively fix synapse.storage.types.Connection for future mypy release (#...Jonathan de Jong2020-10-173-3/+4
* Fix synmark (#8571)Richard van der Hoff2020-10-162-1/+2
* Type annotations for LruCache (#8562)Richard van der Hoff2020-10-166-31/+95
|\
| * review commentsRichard van der Hoff2020-10-161-3/+8
| * Apply suggestions from code reviewRichard van der Hoff2020-10-162-2/+2
| * changelogRichard van der Hoff2020-10-161-0/+1
| * type annotations for LruCacheRichard van der Hoff2020-10-165-31/+89
* | Clean-up old transaction IDs on the background worker. (#8544)Patrick Cloke2020-10-162-1/+2
* | Add .venv* to .gitignore (#8566)Jonathan de Jong2020-10-162-0/+2
|/
* Make LruCache register its own metrics (#8561)Richard van der Hoff2020-10-168-62/+62
* Fix modifying events in `ThirdPartyRules` modules (#8564)Richard van der Hoff2020-10-163-2/+8
* Merge pull request #8535 from matrix-org/rav/third_party_events_updatesRichard van der Hoff2020-10-156-81/+118
|\
| * changelogRichard van der Hoff2020-10-131-0/+1
| * guard against accidental modificationRichard van der Hoff2020-10-133-3/+30
| * Allow ThirdPartyRules modules to replace event contentRichard van der Hoff2020-10-133-9/+75
| * Move third_party_rules check to event creation timeRichard van der Hoff2020-10-132-52/+13
| * Remove redundant calls to third_party_rules in `on_send_{join,leave}`Richard van der Hoff2020-10-131-19/+1
* | Solidify the HomeServer constructor. (#8515)Jonathan de Jong2020-10-157-25/+33
* | Send some ephemeral events to appservices (#8437)Will Hunt2020-10-1516-122/+563
* | Add option to scripts-dev/lint.sh to only lint files changed since the last g...Andrew Morgan2020-10-154-12/+90
* | Merge branch 'master' into developPatrick Cloke2020-10-154-2/+32
|\ \
| * | Additional tweaks. v1.21.2 github/release-v1.21.2 release-v1.21.2Patrick Cloke2020-10-151-3/+3
| * | Clarify authlib changes.Patrick Cloke2020-10-151-1/+3
| * | Fix typo.Patrick Cloke2020-10-151-1/+1
| * | Add additional release notes.Patrick Cloke2020-10-151-0/+13
| * | 1.21.2Patrick Cloke2020-10-154-2/+17
* | | Merge branch 'release-v1.21.2' into developPatrick Cloke2020-10-150-0/+0
|\| |
| * | Remove racey assertion in MultiWriterIDGenerator (#8530)Erik Johnston2020-10-152-7/+1
* | | Enable mypy for synapse.util.caches (#8547)Richard van der Hoff2020-10-155-10/+185
* | | Merge pull request #8548 from matrix-org/rav/deferred_cacheRichard van der Hoff2020-10-1512-374/+454
|\ \ \
| * | | changelogRichard van der Hoff2020-10-141-0/+1
| * | | Combine the two sets of DeferredCache testsRichard van der Hoff2020-10-142-74/+75
| * | | move DeferredCache into its own moduleRichard van der Hoff2020-10-1410-332/+367
| * | | Rename Cache->DeferredCacheRichard van der Hoff2020-10-148-25/+30
| * | | Add some more type annotations to CacheRichard van der Hoff2020-10-143-24/+62
| | |/ | |/|
* | | Include user agent in user daily visits table (#8503)Neil Johnson2020-10-153-3/+27
* | | Merge pull request #8537 from matrix-org/rav/simplify_locally_reject_inviteRichard van der Hoff2020-10-159-65/+56
|\ \ \
| * | | changelogRichard van der Hoff2020-10-131-0/+1
| * | | Simplify `_locally_reject_invite`Richard van der Hoff2020-10-136-57/+52
| * | | Remove redundant `token_id` parameter to create_eventRichard van der Hoff2020-10-134-8/+3
| |/ /
* | | Use autocommit mode for single statement DB functions. (#8542)Erik Johnston2020-10-145-70/+156
* | | Remove racey assertion in MultiWriterIDGenerator (#8530)Erik Johnston2020-10-142-7/+1
* | | Add note to manhole.md about bind_address when using with docker (#8526)Christopher May-Townsend2020-10-142-7/+40
* | | Update documentation on retention policies limits (#8529)Brendan Abolivier2020-10-142-12/+23
* | | Add basic tests for sync/pagination with vector clock tokens. (#8488)Erik Johnston2020-10-143-1/+249
* | | Fix not sending events over federation when using sharded event persisters (#...Erik Johnston2020-10-1410-21/+51
* | | Make sure a retention policy is a state event (#8527)Brendan Abolivier2020-10-143-0/+8
* | | Add correct M_BAD_JSON error code to /profile/{userId}/displayname (#8517)Aaron Raimist2020-10-142-1/+4
|/ /
* | Move additional tasks to the background worker, part 4 (#8513)Patrick Cloke2020-10-1311-221/+196
* | Fix message duplication if something goes wrong after persisting the event (#...Erik Johnston2020-10-1313-32/+481
* | Merge branch 'master' into developAndrew Morgan2020-10-134-2/+18
|\|
| * 1.21.1 v1.21.1 github/release-v1.21.1 release-v1.21.1Andrew Morgan2020-10-133-3/+13
| * Explicitly install test dependencies when building deb packages (#8523)Andrew Morgan2020-10-122-1/+7
* | Multi arch docker support: add arm/v7 and arm64 to our docker images (#7921)Christopher May-Townsend2020-10-122-8/+53
* | Merge branch 'master' into developAndrew Morgan2020-10-123-4/+25
|\|
| * Reverse proxies are not the only thing to change;be explicit w/ new endpoint v1.21.0 github/release-v1.21.0 release-v1.21.0Andrew Morgan2020-10-121-6/+7
| * Add deprecation warning for admin api under client api prefixesAndrew Morgan2020-10-121-0/+8
| * 1.21.0Andrew Morgan2020-10-123-1/+13
* | Make event persisters periodically announce position over replication. (#8499)Erik Johnston2020-10-129-34/+128
* | Docker: support passing additional commandline args to synapse (#8390)Samuel Philipp2020-10-113-18/+44
* | Clean-up some broken/unused code in the test framework (#8514)Patrick Cloke2020-10-093-70/+55
* | Fix threadsafety in ThreadedMemoryReactorClock (#8497)Richard van der Hoff2020-10-092-4/+33
* | Increase default max_upload_size from 10M to 50M (#8502)Mateusz Przybyłowicz2020-10-095-5/+6
* | Add type hints to response cache. (#8507)Patrick Cloke2020-10-099-34/+48
* | Allow modules to create and send events into rooms (#8479)Andrew Morgan2020-10-095-8/+157
* | Only send RDATA for instance local events. (#8496)Erik Johnston2020-10-096-25/+54
* | Move additional tasks to the background worker, part 3 (#8489)Patrick Cloke2020-10-098-282/+276
* | Remove the deprecated Handlers object (#8494)Patrick Cloke2020-10-0940-157/+116
* | Add type hints to some handlers (#8505)Patrick Cloke2020-10-0910-22/+60
* | Invalidate the cache when an olm fallback key is uploaded (#8501)Hubert Chathi2020-10-083-0/+25
* | Merge tag 'v1.21.0rc3' into developErik Johnston2020-10-084-3/+16
|\|
| * Update change log v1.21.0rc3Erik Johnston2020-10-081-1/+1
| * 1.21.0rc3Erik Johnston2020-10-084-3/+16
* | Add useful shields to readme (#8493)Mateusz Przybyłowicz2020-10-082-7/+24
* | Clarify error message when plugin config parsers raise an error (#8492)Richard van der Hoff2020-10-082-1/+2
* | Merge remote-tracking branch 'origin/release-v1.21.0' into developErik Johnston2020-10-072-0/+2
|\|
| * Reduce serialization errors in MultiWriterIdGen (#8456)Erik Johnston2020-10-077-5/+109
| * Add Ubuntu 20.10 (Groovy Gorilla) to build scripts. (#8475)Patrick Cloke2020-10-072-0/+2
* | Move additional tasks to the background worker (#8458)Patrick Cloke2020-10-078-197/+195
* | Include the configured log level in phone home stats. (#8477)Patrick Cloke2020-10-072-0/+8
* | Reduce serialization errors in MultiWriterIdGen (#8456)Erik Johnston2020-10-077-8/+112
* | Use vector clocks for room stream tokens. (#8439)Erik Johnston2020-10-074-42/+380
* | Add typing information to the device handler. (#8407)Patrick Cloke2020-10-074-38/+59
* | Fix returning incorrect prev_batch token in incremental sync (#8486)Erik Johnston2020-10-072-1/+7
* | unblacklist some tests (#8474)Richard van der Hoff2020-10-073-34/+1
* | Add support for MSC2697: Dehydrated devices (#8380)Hubert Chathi2020-10-079-21/+454
* | Merge pull request #8463 from matrix-org/rav/clean_up_event_handlingRichard van der Hoff2020-10-076-92/+83
|\ \
| * | update wordingRichard van der Hoff2020-10-071-2/+3
| * | changelogRichard van der Hoff2020-10-051-0/+1
| * | kill off `send_nonmember_event`Richard van der Hoff2020-10-054-53/+31
| * | pull up event.sender assertionRichard van der Hoff2020-10-052-4/+5
| * | Move shadow-ban check down into `handle_new_client_event`.Richard van der Hoff2020-10-051-8/+24
| * | De-duplicate duplicate handlingRichard van der Hoff2020-10-052-38/+32
* | | Combine `SpamCheckerApi` with the more generic `ModuleApi`. (#8464)Richard van der Hoff2020-10-0710-58/+51
* | | Remove docs/sphinx and related references (#8480)Andrew Morgan2020-10-0762-839/+1
* | | Add support for MSC2732: olm fallback keys (#8312)Hubert Chathi2020-10-068-1/+215
* | | Additional tests for third-party event rules (#8468)Richard van der Hoff2020-10-063-18/+79
* | | Merge pull request #8467 from matrix-org/rav/fix_3pevent_rulesRichard van der Hoff2020-10-063-2/+5
|\ \ \
| * | | Fix third-party event modules for `check_visibility_can_be_modified` checkRichard van der Hoff2020-10-053-2/+5
* | | | Don't bother responding to client requests that have already disconnected (#8...Andrew Morgan2020-10-063-0/+12
* | | | Update default room version to 6 (#8461)Richard van der Hoff2020-10-054-3/+13
|/ / /
* / / Ensure that event.redacts is the proper type before handling it (#8457)Patrick Cloke2020-10-052-0/+3
|/ /
* | Allow ThirdPartyEventRules modules to manipulate public room state (#8292)Andrew Morgan2020-10-058-19/+223
* | Remove stream ordering from Metadata dict (#8452)Richard van der Hoff2020-10-0513-33/+53
* | Update manhole documentation for async/await. (#8462)Patrick Cloke2020-10-052-2/+6
* | Do not assume that account data is of the correct form. (#8454)Patrick Cloke2020-10-056-21/+34
* | Add logging on startup/shutdown (#8448)Erik Johnston2020-10-0225-113/+152
* | Speed up unit tests when using PostgreSQL (#8450)Erik Johnston2020-10-023-1/+17
* | Allow background tasks to be run on a separate worker. (#8369)Patrick Cloke2020-10-0219-449/+537
* | Merge tag 'v1.21.0rc2' into developRichard van der Hoff2020-10-0214-141/+163
|\|
| * move #8444 to 'feature' v1.21.0rc2Richard van der Hoff2020-10-021-1/+5
| * linkify changelogRichard van der Hoff2020-10-021-1/+1
| * 1.21.0rc2Richard van der Hoff2020-10-021-1/+1
| * 1.21.0rc2Richard van der Hoff2020-10-027-6/+14
| * Fix bug in remote thumbnail search (#8438)Richard van der Hoff2020-10-022-20/+24
| * Fix DB query on startup for negative streams. (#8447)Erik Johnston2020-10-022-1/+2
| * Convert additional templates to Jinja (#8444)Patrick Cloke2020-10-029-116/+121
| * Fix malformed log line in new federation "catch up" logic (#8442)Richard van der Hoff2020-10-022-1/+2
| * Do not expose the experimental appservice login flow to clients. (#8440)Patrick Cloke2020-10-012-2/+1
* | Include a public_baseurl in configs generated by the demo script. (#8443)Patrick Cloke2020-10-022-0/+3
* | Add unit test for event persister sharding (#8433)Erik Johnston2020-10-028-27/+371
* | Add config option for always using "userinfo endpoint" for OIDC (#7658)BBBSnowball2020-10-016-15/+65
* | Merge tag 'v1.21.0rc1' into developRichard van der Hoff2020-10-0188-88/+103
|\|
| * update changelog v1.21.0rc1Richard van der Hoff2020-10-012-2/+1
| * fix a logging error in thumbnailer (#8435)Richard van der Hoff2020-10-012-1/+2
| * changelog fixesRichard van der Hoff2020-10-011-2/+1
| * fix version numberRichard van der Hoff2020-10-012-3/+3
| * 1.21.0Richard van der Hoff2020-10-0187-87/+103
* | Enable mypy checking for unreachable code and fix instances. (#8432)Patrick Cloke2020-10-0117-53/+38
|/
* Add prometheus metrics to track federation delays (#8430)Richard van der Hoff2020-10-018-6/+88
* Make token serializing/deserializing async (#8427)Erik Johnston2020-09-3017-59/+115
* Merge pull request #8425 from matrix-org/rav/extremity_metricsRichard van der Hoff2020-09-305-84/+144
|\
| * changelogRichard van der Hoff2020-09-301-0/+1
| * Add an improved "forward extremities" metricRichard van der Hoff2020-09-301-2/+25
| * Rewrite BucketCollectorRichard van der Hoff2020-09-303-71/+89
| * Fix _exposition.py to stop stripping samplesRichard van der Hoff2020-09-301-11/+29
* | Allow additional SSO properties to be passed to the client (#8413)Patrick Cloke2020-09-309-67/+278
|/
* Drop support for ancient prometheus_client (#8426)Richard van der Hoff2020-09-303-23/+8
* Merge pull request #8420 from matrix-org/rav/state_res_statsRichard van der Hoff2020-09-304-79/+199
|\
| * changelogRichard van der Hoff2020-09-291-0/+1
| * Report state res metrics to Prometheus and logRichard van der Hoff2020-09-291-20/+124
| * Move Measure calls into `resolve_events_with_store`Richard van der Hoff2020-09-291-32/+31
| * Expose a `get_resource_usage` method in `Measure`Richard van der Hoff2020-09-291-10/+21
| * Move `resolve_events_with_store` into StateResolutionHandlerRichard van der Hoff2020-09-292-50/+55
* | Various clean ups to room stream tokens. (#8423)Erik Johnston2020-09-2916-76/+96
* | Update description of server_name config option (#8415)Aaron Raimist2020-09-293-8/+35
|/
* Discard an empty upload_name before persisting an uploaded file (#7905)Will Hunt2020-09-293-3/+9
* Don't check whether a 3pid is allowed to register during password reset (#8414)Andrew Morgan2020-09-292-7/+1
|\
| * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/info-mainli...Andrew Morgan2020-09-2919-118/+404
| |\
| * | ChangelogAndrew Morgan2020-09-281-0/+1
| * | Don't check whether a 3pid is allowed to register during password resetAndrew Morgan2020-09-281-7/+0
* | | Don't table scan events on worker startup (#8419)Erik Johnston2020-09-293-1/+44
* | | Mypy fixes for `synapse.handlers.federation` (#8422)Richard van der Hoff2020-09-296-11/+19
| |/ |/|
* | Add support for running Complement against the local checkout (#8317)Andrew Morgan2020-09-292-0/+23
* | Filter out appservices from mau count (#8404)Will Hunt2020-09-293-2/+25
* | Only assert valid next_link params when provided (#8417)Andrew Morgan2020-09-293-6/+16
* | Add metrics to track success/otherwise of replication requests (#8406)Richard van der Hoff2020-09-292-12/+29
* | Fix handling of connection timeouts in outgoing http requests (#8400)Richard van der Hoff2020-09-299-98/+311
|/
* Add checks for postgres sequence consistency (#8402)Erik Johnston2020-09-288-6/+160
* Create a mechanism for marking tests "logcontext clean" (#8399)Richard van der Hoff2020-09-284-21/+41
* Add `ui_auth_sessions_ips` table to `synapse_port_db` ignore list (#8410)Dagfinn Ilmari Mannsåker2020-09-282-0/+2
* A pair of tiny cleanups in the federation request code. (#8401)Richard van der Hoff2020-09-283-3/+2
* typoMatthew Hodgson2020-09-281-1/+1
* Escape the error description on the sso_error template. (#8405)Patrick Cloke2020-09-252-1/+2
* Fix occasional "Re-starting finished log context" from keyring (#8398)Richard van der Hoff2020-09-253-90/+101
* Allow existing users to login via OpenID Connect. (#8345)Tdxdxoz2020-09-256-17/+76
* Fix schema delta for servers that have not backfilled (#8396)Erik Johnston2020-09-253-2/+9
* Merge branch 'master' into developAndrew Morgan2020-09-244-3/+25
|\
| * s/URLs/variables in changelog v1.20.1 github/release-v1.20.1 release-v1.20.1Andrew Morgan2020-09-241-1/+1
| * s/accidentally/incorrectly in changelogAndrew Morgan2020-09-241-1/+1
| * Update changelog wordingAndrew Morgan2020-09-241-1/+1
| * 1.20.1Andrew Morgan2020-09-245-3/+17
| * Mark the shadow_banned column as boolean in synapse_port_db. (#8386)Patrick Cloke2020-09-243-0/+2
| * Hotfix: disable autoescape by default when rendering Jinja2 templates (#8394)Andrew Morgan2020-09-243-3/+12
* | Fix MultiWriteIdGenerator's handling of restarts. (#8374)Erik Johnston2020-09-247-30/+274
* | Add type annotations to SimpleHttpClient (#8372)Richard van der Hoff2020-09-244-61/+143
* | Add new sequences to port DB script (#8387)Erik Johnston2020-09-242-0/+25
* | Add EventStreamPosition type (#8388)Erik Johnston2020-09-2411-57/+100
* | Mark the shadow_banned column as boolean in synapse_port_db. (#8386)Patrick Cloke2020-09-243-0/+2
* | Factor out `_send_dummy_event_for_room` (#8370)Richard van der Hoff2020-09-232-48/+55
* | Improve logging of state resolution (#8371)Richard van der Hoff2020-09-232-48/+17
* | Fix bug which caused failure on join with malformed membership events (#8385)Richard van der Hoff2020-09-232-3/+8
* | Use `async with` for ID gens (#8383)Erik Johnston2020-09-2315-105/+144
* | Don't push if an user account has expired (#8353)Mathieu Velten2020-09-234-5/+34
* | Fix missing null character check on guest_access room state (#8373)Andrew Morgan2020-09-232-0/+3
|\ \
| * | ChangelogAndrew Morgan2020-09-221-0/+1
| * | Fix missing null character check on guest_access room stateAndrew Morgan2020-09-221-0/+2
* | | Do not check lint/test dependencies at runtime. (#8377)Patrick Cloke2020-09-235-15/+25
* | | Add note to reverse_proxy.md about disabling Apache's mod_security2 (#8375)Julian Fietkau2020-09-232-0/+9
|/ /
* | Fixed a bug with reactivating users with the admin API (#8362)Dirk Klimpel2020-09-223-1/+16
* | Admin API for reported events (#8217)Dirk Klimpel2020-09-226-0/+697
* | Merge branch 'master' into developAndrew Morgan2020-09-223-3/+24
|\|
| * Fix wording of deprecation notice in changelog v1.20.0 github/release-v1.20.0 release-v1.20.0Andrew Morgan2020-09-221-5/+4
| * Deprecation warning for synapse admin api being accessible under /_matrixAndrew Morgan2020-09-221-1/+13
| * 1.20.0Andrew Morgan2020-09-223-3/+13
* | Create function to check for long names in devices (#8364)Dionysis Grigoropoulos2020-09-224-7/+38
* | Add a comment re #1691Richard van der Hoff2020-09-211-1/+5
* | Fix a bad merge from release-v1.20.0. (#8354)Patrick Cloke2020-09-182-1/+2
* | Merge tag 'v1.20.0rc5' into developPatrick Cloke2020-09-1810-28/+128
|\|
| * Add a note about including the changes from 1.19.3. v1.20.0rc5Patrick Cloke2020-09-181-0/+2
| * Tweak wording in the changelog.Patrick Cloke2020-09-181-2/+2
| * 1.20.0rc5Patrick Cloke2020-09-186-5/+23
| * Merge tag 'v1.19.3' into release-v1.20.0Patrick Cloke2020-09-183-5/+18
| |\
| | * 1.19.3 v1.19.3 github/release-v1.19.3 release-v1.19.3Andrew Morgan2020-09-184-2/+16
| | * Use _check_sigs_and_hash_and_fetch to validate backfill requests (#8350)Andrew Morgan2020-09-182-5/+4
| * | Intelligently select extremities used in backfill. (#8349)Erik Johnston2020-09-184-20/+67
| * | Add flags to /versions about whether new rooms are encrypted by default. (#8343)Patrick Cloke2020-09-182-0/+20
* | | Admin API for querying rooms where a user is a member (#8306)Dirk Klimpel2020-09-185-2/+160
* | | Catch-up after Federation Outage (bonus): Catch-up on Synapse Startup (#8322)reivilibre2020-09-1810-5/+218
* | | Simplify super() calls to Python 3 syntax. (#8344)Patrick Cloke2020-09-18133-281/+272
* | | Allow appservice users to /login (#8320)Will Hunt2020-09-183-11/+173
* | | Update test logging to be able to accept braces (#8335)Jonathan de Jong2020-09-182-2/+2
* | | Merge remote-tracking branch 'origin/release-v1.20.0' into developErik Johnston2020-09-184-17/+54
|\| |
| * | Fix ratelimiting for federation `/send` requests. (#8342)Erik Johnston2020-09-184-17/+54
| * | blacklist MSC2753 sytests until it's implemented in synapse (#8285)Matthew Hodgson2020-09-172-0/+9
* | | Move lint dependencies to extras_require (#8330)Jonathan de Jong2020-09-174-12/+10
* | | Remove obsolete __future__ imports (#8337)Jonathan de Jong2020-09-1719-40/+2
* | | Use admin_patterns for all admin APIs. (#8331)Patrick Cloke2020-09-177-26/+20
* | | Fix a potential bug of UnboundLocalError (#8329)Jonathan de Jong2020-09-172-5/+9
* | | Switch metaclass initialization to python 3-compatible syntax (#8326)Jonathan de Jong2020-09-168-26/+16
* | | Merge tag 'v1.20.0rc4' into developPatrick Cloke2020-09-163-2/+25
|\| |
| * | 1.20.0rc4 v1.20.0rc4Patrick Cloke2020-09-162-1/+8
| * | Merge remote-tracking branch 'origin/master' into release-v1.20.0Patrick Cloke2020-09-163-2/+17
| |\|
| * | Merge branch 'erikj/fix_origin_check' into release-v1.20.0Erik Johnston2020-09-162-3/+5
| |\ \
* | \ \ Merge branch 'master' into developErik Johnston2020-09-160-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | 1.19.2 v1.19.2 github/release-v1.19.2 release-v1.19.2Erik Johnston2020-09-164-2/+18
| * | | Merge branch 'erikj/fix_origin_check' into release-v1.19.2Erik Johnston2020-09-162-3/+5
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'erikj/fix_origin_check' into developErik Johnston2020-09-162-3/+5
|\ \ \ \ | | |/ / | |/| |
| * | | NewsfileErik Johnston2020-09-161-0/+1
| * | | Don't assume that an event has an origin fieldErik Johnston2020-09-161-3/+4
| |/ /
* | | Catch-up after Federation Outage (split, 4): catch-up loop (#8272)reivilibre2020-09-155-5/+338
* | | Use slots in attrs classes where possible (#8296)Patrick Cloke2020-09-1422-50/+33
* | | Fix typos in comments.Patrick Cloke2020-09-145-6/+6
* | | Add the topic and avatar to the room details admin API (#8305)Tulir Asokan2020-09-144-1/+9
* | | Improve SAML error messages (#8248)Patrick Cloke2020-09-149-185/+178
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-25 22:27:52 +0000