summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* 1.7.2 v1.7.2 github/release-v1.7.2 release-v1.7.2Richard van der Hoff2019-12-205-3/+19
* Backport fixes to sqlite upgrade from develop (#6578)Richard van der Hoff2019-12-202-1/+10
* Fix exceptions when attempting to backfill (#6576)Richard van der Hoff2019-12-202-1/+5
* too many parens v1.7.1 github/release-v1.7.1 release-v1.7.1Richard van der Hoff2019-12-181-1/+1
* 1.7.1Richard van der Hoff2019-12-1814-15/+25
* Fix bug where we added duplicate event IDs as auth_events (#6560)Erik Johnston2019-12-172-7/+9
* Add auth events as per spec. (#6556)Erik Johnston2019-12-162-67/+35
* Merge pull request #6553 from matrix-org/babolivier/fix-context-filterBrendan Abolivier2019-12-164-3/+135
|\
| * Merge branch 'babolivier/fix-context-filter' of github.com:matrix-org/synapse...Brendan Abolivier2019-12-161-1/+1
| |\
| | * Update changelog.d/6553.bugfixBrendan Abolivier2019-12-161-1/+1
| * | Incorporate reviewBrendan Abolivier2019-12-162-6/+1
| |/
| * LintBrendan Abolivier2019-12-161-2/+1
| * Add test caseBrendan Abolivier2019-12-161-0/+133
| * ChangelogBrendan Abolivier2019-12-161-0/+1
| * Update the documentation of the filtering functionBrendan Abolivier2019-12-161-1/+2
| * Use the filtered version of an event when responding to /context requests for...Brendan Abolivier2019-12-161-1/+4
* | Exclude rejected state events when calculating state at backwards extrems (#6...Richard van der Hoff2019-12-162-1/+2
* | Persist auth/state events at backwards extremities when we fetch them (#6526)Richard van der Hoff2019-12-163-165/+83
* | sanity-checking for events used in state res (#6531)Richard van der Hoff2019-12-166-43/+128
* | Sanity-check room ids in event auth (#6530)Richard van der Hoff2019-12-162-0/+14
* | Check the room_id of events when fetching room state/auth (#6524)Richard van der Hoff2019-12-162-24/+56
* | Add `include_event_in_state` to _get_state_for_room (#6521)Richard van der Hoff2019-12-162-18/+22
* | Move get_state methods into FederationHandler (#6503)Richard van der Hoff2019-12-163-86/+107
* | Refactor get_events_from_store_or_dest to return a dict (#6501)Richard van der Hoff2019-12-162-29/+16
|/
* More rewording of changelog. v1.7.0 github/release-v1.7.0 release-v1.7.0Erik Johnston2019-12-131-1/+1
* Reword changelogErik Johnston2019-12-131-2/+2
* Add deprecation notesErik Johnston2019-12-131-1/+7
* 1.7.0Erik Johnston2019-12-133-1/+13
* 1.7.0rc2 v1.7.0rc2Erik Johnston2019-12-116-5/+12
* Back out change preventing setting null avatar URLsErik Johnston2019-12-112-7/+7
* Merge branch 'erikj/fix_sqlite_7' of github.com:matrix-org/synapse into relea...Erik Johnston2019-12-118-14/+51
|\
| * Drop unused indexErik Johnston2019-12-104-13/+18
| * Convert _censor_redactions to async since it awaits on coroutinesErik Johnston2019-12-101-11/+9
| * Only start censor background job after indices are createdErik Johnston2019-12-102-2/+9
| * NewsfileErik Johnston2019-12-091-0/+1
| * Fix support for SQLite 3.7.Erik Johnston2019-12-093-2/+22
| * Merge tag 'v1.7.0rc1' into developNeil Johnson2019-12-0955-54/+80
| |\
| * | Better errors regarding changing avatar_url (#6497)Andrew Morgan2019-12-092-3/+9
* | | Fixup changelogsBrendan Abolivier2019-12-102-2/+2
* | | Merge pull request #6509 from matrix-org/babolivier/fix-room-store-configErik Johnston2019-12-102-0/+6
|\ \ \
| * | | ChangelogBrendan Abolivier2019-12-101-0/+1
| * | | Give the server config to the RoomWorkerStoreBrendan Abolivier2019-12-101-0/+5
|/ / /
* | | Merge pull request #6507 from matrix-org/babolivier/pusher-room-storeErik Johnston2019-12-102-1/+7
|\ \ \
| * | | ChangelogBrendan Abolivier2019-12-101-0/+1
| * | | Make the PusherSlaveStore inherit from the slave RoomStoreBrendan Abolivier2019-12-101-1/+6
|/ / /
* | | Fix erroneous reference for new room directory defaults.Neil Johnson2019-12-101-1/+1
* | | Update CHANGES.mdNeil Johnson2019-12-091-11/+5
| |/ |/|
* | 1.7.0rc1 v1.7.0rc1Neil Johnson2019-12-0955-54/+79
* | Systemd documentation (#6490)Clifford Garwood II2019-12-092-1/+2
|/
* Back out perf regression from get_cross_signing_keys_from_cache. (#6494)Neil Johnson2019-12-094-30/+20
* Merge pull request #6487 from matrix-org/erikj/pass_in_dbErik Johnston2019-12-0956-244/+242
|\
| * Fix commentErik Johnston2019-12-091-1/+1
| * Fix port db scriptErik Johnston2019-12-064-37/+5
| * NewsfileErik Johnston2019-12-061-0/+1
| * Fixup testsErik Johnston2019-12-066-23/+20
| * Move start up DB checks to main data store.Erik Johnston2019-12-062-18/+12
| * Pass Database into the data storeErik Johnston2019-12-065-28/+24
| * Move are_all_users_on_domain checks to main data store.Erik Johnston2019-12-063-24/+24
| * Change DataStores to accept 'database' param.Erik Johnston2019-12-0641-114/+156
* | Merge pull request #6493 from matrix-org/erikj/invite_state_configErik Johnston2019-12-092-1/+4
|\ \
| * | NewsfileErik Johnston2019-12-091-0/+1
| * | Pull out room_invite_state_types config option once.Erik Johnston2019-12-091-1/+3
| |/
* | Fix inaccurate per-block metrics (#6491)Richard van der Hoff2019-12-092-42/+19
* | Remove fallback for missing /federation/v1/state_ids API (#6488)Richard van der Hoff2019-12-093-96/+18
* | Merge pull request #6484 from matrix-org/erikj/port_sync_handlerErik Johnston2019-12-0912-202/+208
|\ \ | |/ |/|
| * Fixup functions to consistently return deferredsErik Johnston2019-12-066-14/+28
| * NewsfileErik Johnston2019-12-051-0/+1
| * Port SyncHandler to async/awaitErik Johnston2019-12-056-191/+182
* | Merge pull request #6469 from matrix-org/erikj/make_database_classErik Johnston2019-12-0668-2514/+2685
|\ \
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_datab...Erik Johnston2019-12-0656-823/+766
| |\ \ | |/ / |/| |
* | | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925)Manuel Stahl2019-12-059-109/+161
| |/ |/|
* | Merge pull request #6483 from matrix-org/erikj/port_rest_v2Erik Johnston2019-12-0524-505/+362
|\ \
| * | NewsfileErik Johnston2019-12-051-0/+1
| * | Port rest.client.v2Erik Johnston2019-12-0523-505/+361
|/ /
* | Merge pull request #6482 from matrix-org/erikj/port_rest_v1Erik Johnston2019-12-0515-169/+134
|\ \
| * | NewsfileErik Johnston2019-12-051-0/+1
| * | Fixup testsErik Johnston2019-12-053-2/+15
| * | Port rest/v1 to async/awaitErik Johnston2019-12-0511-167/+118
* | | Merge branch 'master' of github.com:matrix-org/synapse into developAndrew Morgan2019-12-053-2/+23
|\ \ \
| * | | Modify systemd unit file reference to align with installation instruction (#6...Clifford Garwood II2019-12-053-2/+23
* | | | Revert "Modify systemd unit file reference to align with installation instruc...Andrew Morgan2019-12-053-23/+2
* | | | Modify systemd unit file reference to align with installation instruction (#6...Clifford Garwood II2019-12-053-2/+23
| |/ / |/| |
* | | Stronger typing in the federation handler (#6480)Richard van der Hoff2019-12-052-24/+58
* | | Sanity-check the rooms of auth events before pulling them in. (#6472)Richard van der Hoff2019-12-052-9/+26
| | * Remove unused varErik Johnston2019-12-063-4/+2
| | * Fix DB scriptsErik Johnston2019-12-052-15/+16
| | * NewsfileErik Johnston2019-12-051-0/+1
| | * Move background update handling out of storeErik Johnston2019-12-0527-200/+281
| | * CommentsErik Johnston2019-12-053-5/+16
| | * Move DB pool and helper functions into dedicated Database classErik Johnston2019-12-0562-2295/+2377
| |/ |/|
* | Merge pull request #6464 from matrix-org/erikj/make_public_sql_baseErik Johnston2019-12-0559-576/+570
|\ \
| * | NewsfileErik Johnston2019-12-041-0/+1
| * | Remove underscore from SQLBaseStore functionsErik Johnston2019-12-0456-558/+550
| * | Don't call SQLBaseStore methods from outside storesErik Johnston2019-12-044-19/+20
* | | Merge pull request #6470 from matrix-org/babolivier/port_db_ci_failureBrendan Abolivier2019-12-043-2/+14
|\ \ \
| * | | Fix background updates for synapse_port_dbBrendan Abolivier2019-12-042-2/+12
| * | | ChangelogBrendan Abolivier2019-12-041-0/+1
| * | | Make synapse_port_db exit with a non-0 code if something failedBrendan Abolivier2019-12-041-0/+1
| |/ /
* / / get rid of (most of) have_events from _update_auth_events_and_context_for_aut...Richard van der Hoff2019-12-043-72/+25
|/ /
* | Merge pull request #6454 from matrix-org/erikj/clean_base_StoreErik Johnston2019-12-049-192/+222
|\ \
| * | Revert "Move get_user_count_txn out of base store"Erik Johnston2019-12-042-12/+12
| * | _CURRENT_STATE_CACHE_NAME is publicErik Johnston2019-12-042-5/+5
| * | Move get_user_count_txn out of base storeErik Johnston2019-12-042-12/+12
| * | NewsfileErik Johnston2019-12-041-0/+1
| * | Move cache invalidation to main data storeErik Johnston2019-12-046-113/+143
| * | Move event fetch vars to EventWorkStoreErik Johnston2019-12-044-14/+15
| * | Move account validity bg updates to registration storeErik Johnston2019-12-042-66/+64
* | | Merge pull request #6441 from syamgk/fix-parameter-mismatchErik Johnston2019-12-042-1/+2
|\ \ \
| * | | Add changelog fileSyam G Krishnan2019-12-041-0/+1
| * | | Issue #6406 Fix parameter mismatchSyam G Krishnan2019-12-041-1/+1
* | | | Merge pull request #6329 from matrix-org/babolivier/context_filtersBrendan Abolivier2019-12-0410-103/+408
|\ \ \ \
| * | | | Un-remove room purge testBrendan Abolivier2019-12-041-0/+72
| * | | | Merge branch 'babolivier/context_filters' of github.com:matrix-org/synapse in...Brendan Abolivier2019-12-041-1/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-11-26125-1166/+2323
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-04189-1451/+4493
| |\ \ \ \ \ \
| * | | | | | | Incorporate reviewBrendan Abolivier2019-12-043-3/+2
| | |/ / / / / | |/| | | | |
| * | | | | | Format changelogBrendan Abolivier2019-11-201-1/+1
| * | | | | | Update changelog since this isn't going to be featured in 1.6.0Brendan Abolivier2019-11-201-1/+1
| * | | | | | Also filter state eventsBrendan Abolivier2019-11-061-1/+7
| * | | | | | Only filter if a filter was providedBrendan Abolivier2019-11-051-4/+6
| * | | | | | Update copyrightBrendan Abolivier2019-11-051-1/+2
| * | | | | | LintBrendan Abolivier2019-11-051-30/+41
| * | | | | | Update copyrightsBrendan Abolivier2019-11-058-2/+21
| * | | | | | ChangelogBrendan Abolivier2019-11-051-0/+1
| * | | | | | Add tests for /searchBrendan Abolivier2019-11-051-44/+143
| * | | | | | Merge labels tests for /context and /messagesBrendan Abolivier2019-11-051-146/+130
| * | | | | | Add test caseBrendan Abolivier2019-11-051-0/+182
| * | | | | | Filter events_before and events_after in /context requestsBrendan Abolivier2019-11-051-2/+4
* | | | | | | Markdownification and other fixes to CONTRIBUTING (#6461)Andrew Morgan2019-12-044-210/+215
* | | | | | | Fix error when using synapse_port_db on a vanilla synapse db (#6449)Andrew Morgan2019-12-042-1/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Update changelog.d/6449.bugfixAndrew Morgan2019-12-041-1/+1
| * | | | | | Add changelogAndrew Morgan2019-12-021-0/+1
| * | | | | | Fix error when using synapse_port_db on a vanilla synapse dbAndrew Morgan2019-12-021-1/+4
* | | | | | | Merge pull request #6451 from matrix-org/uhoreg/cross_signing_signatures_indexErik Johnston2019-12-043-1/+25
|\ \ \ \ \ \ \
| * | | | | | | apply changes from reviewHubert Chathi2019-12-032-2/+3
| * | | | | | | add changelogHubert Chathi2019-12-021-0/+1
| * | | | | | | make cross signing signature index non-uniqueHubert Chathi2019-12-022-1/+23
| |/ / / / / /
* | | | | | | privacy by default for room dir (#6355)Neil Johnson2019-12-045-18/+91
* | | | | | | Fix exception when a cross-signed device is deleted (#6462)Richard van der Hoff2019-12-042-4/+20
* | | | | | | Add ephemeral messages support (MSC2228) (#6409)Brendan Abolivier2019-12-038-7/+379
* | | | | | | write some docs for the quarantine_media api (#6458)Richard van der Hoff2019-12-032-0/+18
| |_|/ / / / |/| | | | |
* | | | | | Add benchmarks for structured logging performance (#6266)Amber Brown2019-12-037-0/+294
|/ / / / /
* | | | | Transfer power level state events on room upgrade (#6237)Andrew Morgan2019-12-022-5/+32
* | | | | Use python3 packages for Ubuntu (#6443)Andrew Morgan2019-12-022-2/+3
* | | | | Fix: Pillow error when uploading RGBA image (#3325) (#6241)Filip Štědronský2019-12-022-1/+5
| |_|/ / |/| | |
* | | | Add User-Interactive Auth to /account/3pid/add (#6119)Andrew Morgan2019-11-292-0/+6
* | | | Merge pull request #6434 from matrix-org/erikj/msc2367_membership_reasonsErik Johnston2019-11-297-10/+162
|\ \ \ \
| * | | | NewsfileErik Johnston2019-11-281-0/+1
| * | | | Add testsErik Johnston2019-11-281-0/+140
| * | | | Propagate reason in remotely rejected invitesErik Johnston2019-11-284-9/+20
| * | | | MSC2367 Allow reason field on all member eventsErik Johnston2019-11-281-1/+1
* | | | | Merge pull request #6436 from matrix-org/babolivier/fix-state-retrievalBrendan Abolivier2019-11-293-9/+20
|\ \ \ \ \
| * | | | | LintBrendan Abolivier2019-11-281-4/+8
| * | | | | ChangelogBrendan Abolivier2019-11-281-0/+1
| * | | | | Discard retention policies when retrieving stateBrendan Abolivier2019-11-282-9/+15
| |/ / / /
* | | | | blacklist more testsRichard van der Hoff2019-11-281-0/+7
* | | | | Merge branch 'master' into developAndrew Morgan2019-11-283-1/+22
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | 1.6.1 v1.6.1 github/release-v1.6.1 release-v1.6.1Andrew Morgan2019-11-285-3/+22
| * | | Remove local threepids on account deactivation (#6426)Andrew Morgan2019-11-283-0/+17
| * | | Fix startup error when http proxy is defined. (#6421)Richard van der Hoff2019-11-273-4/+5
* | | | Remove local threepids on account deactivation (#6426)Andrew Morgan2019-11-283-0/+17
* | | | Clarifications for the email configuration settings. (#6423)Richard van der Hoff2019-11-283-2/+33
* | | | Implementation of MSC2314 (#6176)Amber Brown2019-11-2813-65/+174
* | | | add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-277-124/+297
* | | | Add more tests to the worker blacklist (#6429)Richard van der Hoff2019-11-272-0/+30
* | | | Merge pull request #6358 from matrix-org/babolivier/message_retentionBrendan Abolivier2019-11-2713-8/+1055
|\ \ \ \
| * \ \ \ Merge branch 'develop' into babolivier/message_retentionBrendan Abolivier2019-11-26138-1274/+2600
| |\ \ \ \
| * | | | | Don't restrict the tests to v1 roomsBrendan Abolivier2019-11-261-2/+0
| * | | | | Fix worker modeBrendan Abolivier2019-11-191-56/+56
| * | | | | Fix 3PID invite exchangeBrendan Abolivier2019-11-191-1/+1
| * | | | | Lint againBrendan Abolivier2019-11-191-1/+1
| * | | | | Lint againBrendan Abolivier2019-11-192-11/+3
| * | | | | LintBrendan Abolivier2019-11-194-101/+77
| * | | | | Don't apply retention policy based filtering on state eventsBrendan Abolivier2019-11-062-6/+19
| * | | | | Implement per-room message retention policiesBrendan Abolivier2019-11-0413-6/+1074
* | | | | | clean up buildkite outputRichard van der Hoff2019-11-261-1/+3
* | | | | | Remove assertion and provide a clear warning on startup for missing public_ba...Andrew Morgan2019-11-264-0/+11
* | | | | | Merge pull request #6343 from matrix-org/rav/event_auth/4Richard van der Hoff2019-11-262-37/+45
|\ \ \ \ \ \
| * | | | | | remove confusing fixmeRichard van der Hoff2019-11-261-6/+0
| * | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/4Richard van der Hoff2019-11-1830-47/+85
| |\ \ \ \ \ \
| * | | | | | | newsfileRichard van der Hoff2019-11-081-0/+1
| * | | | | | | Use get_events_as_list rather than lots of calls to get_eventRichard van der Hoff2019-11-081-16/+8
| * | | | | | | Update some docstrings and commentsRichard van der Hoff2019-11-081-8/+31
| * | | | | | | Simplify _update_auth_events_and_context_for_authRichard van der Hoff2019-11-081-11/+9
* | | | | | | | Fix startup error when http proxy is defined. (#6421)Richard van der Hoff2019-11-263-4/+5
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #6420 from matrix-org/erikj/fix_find_next_generated_user_i...Erik Johnston2019-11-262-12/+7
|\ \ \ \ \ \ \
| * | | | | | | Don't construct a setErik Johnston2019-11-261-6/+3
| * | | | | | | NewsfileErik Johnston2019-11-261-0/+1
| * | | | | | | Fix find_next_generated_user_id_localpartErik Johnston2019-11-261-10/+7
|/ / / / / / /
* | | | | | | Merge branch 'master' into developAndrew Morgan2019-11-264-2/+17
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | 1.6.0 v1.6.0 github/release-v1.6.0 release-v1.6.0Andrew Morgan2019-11-264-2/+16
| * | | | | | Fix phone home stats (#6418)Erik Johnston2019-11-262-1/+2
* | | | | | | Prevent account_data content from being sent over TCP replication (#6333)Andrew Morgan2019-11-263-7/+7
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into anoa/fix_account...Andrew Morgan2019-11-145-2/+6
| |\ \ \ \ \ \ \
| * | | | | | | | lintAndrew Morgan2019-11-081-2/+1
| * | | | | | | | Add changelogAndrew Morgan2019-11-081-0/+1
| * | | | | | | | Remove content from being sent for account data rdata streamAndrew Morgan2019-11-082-6/+6
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #6332 from matrix-org/erikj/query_devices_fixErik Johnston2019-11-264-4/+99
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fixup docsErik Johnston2019-11-262-2/+6
| * | | | | | | NewsfileErik Johnston2019-11-051-0/+1
| * | | | | | | Fix caching devices for remote servers in worker.Erik Johnston2019-11-053-4/+94
* | | | | | | | Make sure that we close cursors before returning from a query (#6408)Richard van der Hoff2019-11-253-10/+44
* | | | | | | | Merge tag 'v1.6.0rc2' into developRichard van der Hoff2019-11-253-19/+35
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | 1.6.0rc2 v1.6.0rc2Richard van der Hoff2019-11-253-2/+10
| * | | | | | | Fix exceptions from background database update for event labels. (#6407)Richard van der Hoff2019-11-252-18/+26
* | | | | | | | Improve the performance of structured logging (#6322)Amber Brown2019-11-264-30/+93
* | | | | | | | Merge pull request #6392 from matrix-org/babolivier/fix-1623Brendan Abolivier2019-11-252-0/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | LintBrendan Abolivier2019-11-201-6/+8
| * | | | | | | | ChangelogBrendan Abolivier2019-11-201-0/+1
| * | | | | | | | Test if a purge can make /messages return 500 responsesBrendan Abolivier2019-11-201-0/+72
* | | | | | | | | Add working build command for docker image (#6390)Andrew Morgan2019-11-232-0/+13
* | | | | | | | | Fix link to user_dir_populate.sql in the user directory docs (#6388)Aaron Raimist2019-11-212-2/+2
* | | | | | | | | Clean up newline quote marks around the codebase (#6362)Andrew Morgan2019-11-2126-46/+43
* | | | | | | | | update macOS installation instructionsMatthew Hodgson2019-11-201-2/+10
| |/ / / / / / / |/| | | | | | |
* | | | | | | | 1.6.0rc1 v1.6.0rc1Andrew Morgan2019-11-2062-61/+75
* | | | | | | | Docker: Change permissions for data dir before attempting to write to it (#6389)Andrew Morgan2019-11-202-3/+4
* | | | | | | | Move admin endpoints into separate files (#6308)Manuel Stahl2019-11-205-555/+622
* | | | | | | | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanupsBrendan Abolivier2019-11-203-70/+126
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | LintBrendan Abolivier2019-11-201-1/+3
| * | | | | | | Apply suggestions from code reviewErik Johnston2019-11-182-3/+3
| * | | | | | | NewsfileErik Johnston2019-11-061-0/+1
| * | | | | | | Add failed auth ratelimiting to UIAErik Johnston2019-11-061-1/+32
| * | | | | | | Only do `rc_login` ratelimiting on succesful login.Erik Johnston2019-11-062-72/+94
| | |/ / / / / | |/| | | | |
* | | | | | | Replace UPDATE with UPSERT on device_max_stream_id table (#6363)Andrew Morgan2019-11-152-2/+16
* | | | | | | Add optional python dependencies to snap packaging (#6317)James2019-11-142-0/+21
* | | | | | | Fix guest -> real account upgrade with account validity enabled (#6359)Andrew Morgan2019-11-142-6/+4
* | | | | | | Replace instance variations of homeserver with correct case/spacing (#6357)Andrew Morgan2019-11-1421-37/+38
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_...Andrew Morgan2019-11-145-2/+6
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5Brendan Abolivier2019-11-143-2/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Set room version default to 5Neil Johnson2019-10-193-2/+3
* | | | | | | Blacklist PurgeRoomTestCase (#6361)Andrew Morgan2019-11-132-0/+3
| |_|_|/ / / |/| | | | |
| | * | | | sample configAndrew Morgan2019-11-121-4/+4
| | * | | | Add changelogAndrew Morgan2019-11-121-0/+1
| | * | | | A couple more instancesAndrew Morgan2019-11-122-2/+2
| | * | | | Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-1218-31/+31
| |/ / / / |/| | | |
* | | | | Merge pull request #6340 from matrix-org/babolivier/pagination_queryBrendan Abolivier2019-11-082-8/+33
|\ \ \ \ \
| * | | | | Incorporate reviewBrendan Abolivier2019-11-081-12/+12
| * | | | | LintBrendan Abolivier2019-11-071-2/+2
| * | | | | Only join on event_labels if we're filtering on labelsBrendan Abolivier2019-11-071-9/+24
| * | | | | Handle lack of filterBrendan Abolivier2019-11-071-5/+3
| * | | | | ChangelogBrendan Abolivier2019-11-071-0/+1
| * | | | | Fix the SQL SELECT query in _paginate_room_events_txnBrendan Abolivier2019-11-071-2/+13
* | | | | | Merge pull request #6295 from matrix-org/erikj/split_purge_historyErik Johnston2019-11-088-182/+335
|\ \ \ \ \ \
| * | | | | | Move type annotation into docstringErik Johnston2019-11-081-3/+3
| * | | | | | Fix deleting state groups during room purge.Erik Johnston2019-11-062-14/+17
| * | | | | | Use correct type annotationErik Johnston2019-11-061-2/+2
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-11-055-83/+146
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Change to not require a state_groups.room_id index.Erik Johnston2019-11-044-53/+45
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-11-0496-369/+2050
| |\ \ \ \ \ \
| * | | | | | | Fix up commentErik Johnston2019-11-011-2/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-09 23:43:36 +0000