summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Replace instance variations of homeserver with correct case/spacing (#6357)Andrew Morgan2020-03-1821-37/+38
|\
| * 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
| | |\ | | |/ | |/|
| | * 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 #6220 from matrix-org/neilj/set_room_version_default_to_5Andrew Morgan2020-03-183-2/+3
|\| |
| * | 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 Morgan2020-03-182-0/+3
|\| | |
| * | | Blacklist PurgeRoomTestCase (#6361)Andrew Morgan2019-11-132-0/+3
| | |/ | |/|
* | | Merge pull request #6340 from matrix-org/babolivier/pagination_queryAndrew Morgan2020-03-182-8/+33
|\| |
| * | 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_historyAndrew Morgan2020-03-188-182/+335
|\| | |
| * | | 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
| | * | | | | Update log line to lie a little lessErik Johnston2019-10-311-1/+1
| | * | | | | Add state_groups.room_id indexErik Johnston2019-10-312-0/+24
| | * | | | | DocstringsErik Johnston2019-10-311-3/+11
| | * | | | | Fix purge room APIErik Johnston2019-10-311-5/+8
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-10-3194-282/+781
| | |\ \ \ \ \
| | * | | | | | NewsfileErik Johnston2019-10-301-0/+1
| | * | | | | | Split purge API into events vs stateErik Johnston2019-10-306-184/+308
* | | | | | | | Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_updateAndrew Morgan2020-03-183-0/+81
|\| | | | | | |
| * | | | | | | Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_updateBrendan Abolivier2019-11-073-0/+81
| |\ \ \ \ \ \ \
| | * | | | | | | Update synapse/storage/data_stores/main/events_bg_updates.pyBrendan Abolivier2019-11-071-1/+1
| | * | | | | | | Update synapse/storage/data_stores/main/events_bg_updates.pyBrendan Abolivier2019-11-071-1/+1
| | * | | | | | | Copy resultsBrendan Abolivier2019-11-071-1/+3
| | * | | | | | | Revert "Back to using cursor_to_dict"Brendan Abolivier2019-11-071-9/+9
| | * | | | | | | Back to using cursor_to_dictBrendan Abolivier2019-11-071-9/+9
| | * | | | | | | Initialise value before loopingBrendan Abolivier2019-11-071-4/+8
| | * | | | | | | Incorporate reviewBrendan Abolivier2019-11-071-14/+9
| | * | | | | | | Fix field nameBrendan Abolivier2019-11-061-1/+1
| | * | | | | | | Update insertBrendan Abolivier2019-11-061-1/+6
| | * | | | | | | Update changelogBrendan Abolivier2019-11-051-1/+1
| | * | | | | | | Merge branch 'develop' into babolivier/msc2326_bg_updateBrendan Abolivier2019-11-0410-93/+256
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Print out the actual number of affected rowsBrendan Abolivier2019-11-041-4/+4
| | * | | | | | | Correctly order resultsBrendan Abolivier2019-11-041-5/+5
| | * | | | | | | TODOBrendan Abolivier2019-11-041-0/+2
| | * | | | | | | Fix exit conditionBrendan Abolivier2019-11-041-1/+3
| | * | | | | | | LintBrendan Abolivier2019-11-041-6/+3
| | * | | | | | | ChangelogBrendan Abolivier2019-11-041-0/+1
| | * | | | | | | Don't try to process events we already have a label forBrendan Abolivier2019-11-041-1/+2
| | * | | | | | | Use a sensible default value for labelsBrendan Abolivier2019-11-041-1/+1
| | * | | | | | | Use the right format for rowsBrendan Abolivier2019-11-041-1/+1
| | * | | | | | | MSC2326: Add background update to take previous events into accountBrendan Abolivier2019-11-042-0/+72
* | | | | | | | | Python 3.8 for tox (#6341)Andrew Morgan2020-03-183-2/+3
|\| | | | | | | |
| * | | | | | | | Python 3.8 for tox (#6341)Richard van der Hoff2019-11-073-2/+3
* | | | | | | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groupsAndrew Morgan2020-03-185-2/+31
|\| | | | | | | |
| * | | | | | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groupsAndrew Morgan2019-11-074-1/+30
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrad...Andrew Morgan2019-11-045-83/+146
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Re-add docstring, with caveats detailedAndrew Morgan2019-11-043-3/+7
| | * | | | | | | | Transfer upgraded rooms on groupsAndrew Morgan2019-11-043-0/+25
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | tweak changelogRichard van der Hoff2019-11-071-1/+1
* | | | | | | | | Fix LruCache callback deduplication (#6213)Andrew Morgan2020-03-182-11/+38
|\| | | | | | | |
| * | | | | | | | Fix LruCache callback deduplication (#6213)V024602019-11-072-11/+38
* | | | | | | | | Make numeric user_id checker start at @0, and don't ratelimit on checking (#6...Andrew Morgan2020-03-185-21/+41
|\| | | | | | | |
| * | | | | | | | Make numeric user_id checker start at @0, and don't ratelimit on checking (#6...Andrew Morgan2019-11-064-21/+40
| |\ \ \ \ \ \ \ \
| | * | | | | | | | raise exception after multiple failuresAndrew Morgan2019-11-061-3/+10
| | * | | | | | | | Address review commentsAndrew Morgan2019-11-062-13/+13
| | * | | | | | | | Add changelogAndrew Morgan2019-11-061-0/+1
| | * | | | | | | | Don't forget to ratelimit calls outside of RegistrationHandlerAndrew Morgan2019-11-062-2/+4
| | * | | | | | | | Numeric ID checker now checks @0, don't ratelimit on checkingAndrew Morgan2019-11-062-20/+29
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into developRichard van der Hoff2019-11-066-3/+18
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'release-v1.5.1'Richard van der Hoff2019-11-066-2/+73
| | |\ \ \ \ \ \ \
| | | * | | | | | | build debs for eoan and bullseye github/release-v1.5.1 release-v1.5.1Richard van der Hoff2019-11-061-0/+2
* | | | | | | | | | Merge commit 'feafd98ac' into dinsic-release-v1.5.xAndrew Morgan2020-03-165-3/+16
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | 1.5.1 v1.5.1Richard van der Hoff2019-11-065-3/+16
* | | | | | | | | | Fix bug which caused rejected events to be stored with the wrong room state ...Andrew Morgan2020-03-167-103/+285
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix bug which caused rejected events to be stored with the wrong room state ...Richard van der Hoff2019-11-067-103/+285
* | | | | | | | | | Add some checks that we aren't using state from rejected events (#6330)Andrew Morgan2020-03-163-6/+50
|\| | | | | | | | |
| * | | | | | | | | Add some checks that we aren't using state from rejected events (#6330)Richard van der Hoff2019-11-053-6/+50
* | | | | | | | | | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_statsAndrew Morgan2020-03-162-2/+3
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_statsErik Johnston2019-11-052-2/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | NewsfileErik Johnston2019-11-051-0/+1
| | * | | | | | | | | Fix phone home statsErik Johnston2019-11-051-2/+2
* | | | | | | | | | | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2Andrew Morgan2020-03-162-1/+3
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2Richard van der Hoff2019-11-052-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Fix exception when OpenGraph tag values are intsRichard van der Hoff2019-11-052-1/+3
* | | | | | | | | | | Merge pull request #6331 from matrix-org/rav/url_preview_limit_titleAndrew Morgan2020-03-163-1/+55
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #6331 from matrix-org/rav/url_preview_limit_titleRichard van der Hoff2019-11-053-1/+55
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'develop' into rav/url_preview_limit_titleRichard van der Hoff2019-11-05231-1824/+4529
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / /
| | * | | | | | | | Apply suggestions from code reviewRichard van der Hoff2019-11-052-1/+2
| | * | | | | | | | Strip overlong OpenGraph data from url previewRichard van der Hoff2019-11-053-1/+54
* | | | | | | | | | Improve documentation for EventContext fields (#6319)Andrew Morgan2020-03-163-26/+69
|\| | | | | | | | |
| * | | | | | | | | Improve documentation for EventContext fields (#6319)Richard van der Hoff2019-11-053-26/+69
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Remove the psutil dependency (#6318)Andrew Morgan2020-03-165-83/+146
|\| | | | | | | |
| * | | | | | | | Remove the psutil dependency (#6318)Amber Brown2019-11-055-83/+146
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | document the REPLICATE command a bit better (#6305)Andrew Morgan2020-03-165-10/+110
|\| | | | | | |
| * | | | | | | document the REPLICATE command a bit better (#6305)Richard van der Hoff2019-11-045-10/+110
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #6301 from matrix-org/babolivier/msc2326Andrew Morgan2020-03-1615-94/+461
|\| | | | | |
| * | | | | | Merge pull request #6301 from matrix-org/babolivier/msc2326Brendan Abolivier2019-11-0111-9/+396
| |\ \ \ \ \ \
| | * | | | | | Incorporate reviewBrendan Abolivier2019-11-017-15/+21
| | * | | | | | Update synapse/storage/data_stores/main/schema/delta/56/event_labels.sqlBrendan Abolivier2019-11-011-1/+1
| | * | | | | | Add more data to the event_labels table and fix the indexesBrendan Abolivier2019-11-013-5/+21
| | * | | | | | Add unstable feature flagBrendan Abolivier2019-11-011-0/+3
| | * | | | | | LintBrendan Abolivier2019-11-012-1/+2
| | * | | | | | Incorporate reviewBrendan Abolivier2019-11-017-21/+34
| | * | | | | | LintBrendan Abolivier2019-10-304-50/+35
| | * | | | | | ChangelogBrendan Abolivier2019-10-301-0/+1
| | * | | | | | Add integration tests for /messagesBrendan Abolivier2019-10-301-1/+101
| | * | | | | | Add more integration testingBrendan Abolivier2019-10-302-7/+40
| | * | | | | | Add integration tests for syncBrendan Abolivier2019-10-302-5/+122
| | * | | | | | Add unit testsBrendan Abolivier2019-10-302-1/+52
| | * | | | | | Add index on labelBrendan Abolivier2019-10-301-1/+3
| | * | | | | | Implement filteringBrendan Abolivier2019-10-302-2/+20
| | * | | | | | Store labels for new eventsBrendan Abolivier2019-10-302-1/+22
| | * | | | | | Add database table for keeping track of labels on eventsBrendan Abolivier2019-10-291-0/+20
| * | | | | | | Factor out an _AsyncEventContextImpl (#6298)Richard van der Hoff2019-11-014-85/+65
* | | | | | | | Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schemaAndrew Morgan2020-03-162-0/+43
|\| | | | | | |
| * | | | | | | Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schemaHubert Chathi2019-11-012-0/+43
| |\ \ \ \ \ \ \
| | * | | | | | | add changelogHubert Chathi2019-10-311-0/+1
| | * | | | | | | fix hidden field in devices table for older sqliteHubert Chathi2019-10-311-0/+42
* | | | | | | | | Add contributer docs for using the provided linters script (#6164)Andrew Morgan2020-03-163-0/+13
|\| | | | | | | |
| * | | | | | | | Add contributer docs for using the provided linters script (#6164)Jason Robinson2019-11-023-0/+13
* | | | | | | | | Support for routing outbound HTTP requests via a proxy (#6239)Andrew Morgan2020-03-162-1/+2
|\| | | | | | | |
| * | | | | | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-0116-12/+812
* | | | | | | | | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2020-03-163-3/+4
|\| | | | | | | |
| * | | | | | | | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2019-11-013-3/+4
* | | | | | | | | Document lint.sh & allow application to specified files only (#6312)Andrew Morgan2020-03-163-3/+20
|\| | | | | | | |
| * | | | | | | | Document lint.sh & allow application to specified files only (#6312)Neil Pilgrim2019-11-013-3/+20
* | | | | | | | | Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2020-03-165-30/+92
|\| | | | | | | |
| * | | | | | | | Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2019-11-015-30/+92
* | | | | | | | | Merge pull request #5727 from matrix-org/uhoreg/e2e_cross-signing2-part3Andrew Morgan2020-03-167-47/+241
|\| | | | | | | |
| * | | | | | | | Merge pull request #5727 from matrix-org/uhoreg/e2e_cross-signing2-part3Hubert Chathi2019-10-317-47/+241
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Update synapse/storage/data_stores/main/devices.pyHubert Chathi2019-10-311-1/+1
| | * | | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-31129-452/+1036
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | rename get_devices_by_remote to get_device_updates_by_remoteHubert Chathi2019-10-304-14/+14
| | * | | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-3094-1166/+1615
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | blackHubert Chathi2019-10-301-1/+3
| | * | | | | | | apply changes as a result of PR reviewHubert Chathi2019-10-302-55/+46
| | * | | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-24350-4588/+5086
| | |\ \ \ \ \ \ \
| | * | | | | | | | don't error if federation query doesn't have cross-signing keysHubert Chathi2019-10-241-7/+9
| | * | | | | | | | move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works with wor...Hubert Chathi2019-10-231-67/+67
| | * | | | | | | | blackHubert Chathi2019-10-221-1/+2
| | * | | | | | | | vendor-prefix the EDU name until MSC1756 is merged into the specHubert Chathi2019-10-222-2/+4
| | * | | | | | | | fix unit testHubert Chathi2019-10-221-1/+3
| | * | | | | | | | add news fileHubert Chathi2019-10-221-0/+1
| | * | | | | | | | update to work with newer code, and fix formattingHubert Chathi2019-10-223-6/+7
| | * | | | | | | | add missing paramHubert Chathi2019-10-221-1/+1
| | * | | | | | | | make black happyHubert Chathi2019-10-222-27/+39
| | * | | | | | | | don't crash if the user doesn't have cross-signing keysHubert Chathi2019-10-221-14/+25
| | * | | | | | | | implement federation parts of cross-signingHubert Chathi2019-10-224-10/+179
* | | | | | | | | | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notifyAndrew Morgan2020-03-166-3/+59
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-316-3/+59
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-31122-448/+973
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | clean up code a bitHubert Chathi2019-10-311-5/+9
| | * | | | | | | | | | make user signatures a separate streamHubert Chathi2019-10-305-14/+50
| | * | | | | | | | | | Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-3095-1233/+1682
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | add changelogHubert Chathi2019-10-241-0/+1
| | * | | | | | | | | | make notification of signatures work with workersHubert Chathi2019-10-243-2/+17
| | | |_|_|/ / / / / / | | |/| | | | | | | |
* | | | | | | | | | | rstrip slashes from url on appservice (#6306)Andrew Morgan2020-03-162-1/+4
|\| | | | | | | | | |
| * | | | | | | | | | rstrip slashes from url on appservice (#6306)Will Hunt2019-10-312-1/+4
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Update black to 19.10b0 (#6304)Andrew Morgan2020-03-1641-166/+191
|\| | | | | | | | |
| * | | | | | | | | Update black to 19.10b0 (#6304)Amber Brown2019-11-0141-166/+191
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storageAndrew Morgan2020-03-1624-119/+457
|\| | | | | | | |
| * | | | | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storageErik Johnston2019-10-3123-116/+453
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Apply suggestions from code review Erik Johnston2019-10-311-1/+2
| | * | | | | | | | NewsfileErik Johnston2019-10-301-0/+1
| | * | | | | | | | Port to use state storageErik Johnston2019-10-3019-115/+216
| | * | | | | | | | Add StateGroupStorage interfaceErik Johnston2019-10-303-1/+235
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Expose some homeserver functionality to spam checkers (#6259)Andrew Morgan2020-03-163-1/+65
|\| | | | | | | |
| * | | | | | | | Expose some homeserver functionality to spam checkers (#6259)Travis Ralston2019-10-313-1/+65
* | | | | | | | | Merge pull request #6307 from matrix-org/erikj/fix_purge_roomAndrew Morgan2020-03-164-2/+84
|\| | | | | | | |
| * | | | | | | | Merge pull request #6307 from matrix-org/erikj/fix_purge_roomErik Johnston2019-10-314-2/+84
| |\ \ \ \ \ \ \ \
| | * | | | | | | | NewsfileErik Johnston2019-10-311-0/+1
| | * | | | | | | | Add unit test for /purge_room APIErik Johnston2019-10-312-1/+83
| | * | | | | | | | Fix /purge_room API.Erik Johnston2019-10-311-1/+0
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-10-313-9/+13
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2020-03-1665-149/+164
|\| | | | | | | |
| * | | | | | | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-3165-149/+164
* | | | | | | | | fix delete_existing for _persist_events (#6300)Andrew Morgan2020-03-163-5/+3
|\| | | | | | | |
| * | | | | | | | fix delete_existing for _persist_events (#6300)Richard van der Hoff2019-10-303-5/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #6240 from matrix-org/erikj/split_out_persistence_storeAndrew Morgan2020-03-1618-667/+818
|\| | | | | | |
| * | | | | | | Merge pull request #6240 from matrix-org/erikj/split_out_persistence_storeErik Johnston2019-10-3018-667/+818
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_...Erik Johnston2019-10-30146-722/+1245
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Review commentsErik Johnston2019-10-306-19/+37
| | * | | | | | | NewsfileErik Johnston2019-10-231-0/+1
| | * | | | | | | Use new EventPersistenceStoreErik Johnston2019-10-2311-19/+44
| | * | | | | | | Add DataStores and Storage classes.Erik Johnston2019-10-233-4/+34
| | * | | | | | | Move persist_events out from main data store.Erik Johnston2019-10-232-634/+711
* | | | | | | | | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptorAndrew Morgan2020-03-164-7/+9
|\| | | | | | | |
| * | | | | | | | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptorErik Johnston2019-10-304-7/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Clarify docstringErik Johnston2019-10-301-0/+4
| | * | | | | | | | NewsfileErik Johnston2019-10-301-0/+1
| | * | | | | | | | Make ObservableDeferred.observe() always return deferred.Erik Johnston2019-10-303-8/+5
* | | | | | | | | | Modify doc to update Google ReCaptcha terms (#6257)Andrew Morgan2020-03-162-3/+4
|\| | | | | | | | |
| * | | | | | | | | Modify doc to update Google ReCaptcha terms (#6257)Yash Jipkate2019-10-302-3/+4
* | | | | | | | | | Update email section of INSTALL.md about account_threepid_delegates (#6272)Andrew Morgan2020-03-162-7/+10
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Update email section of INSTALL.md about account_threepid_delegates (#6272)Andrew Morgan2019-10-302-7/+10
* | | | | | | | | | Fix log line that was printing undefined value (#6278)Andrew Morgan2020-03-162-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix log line that was printing undefined value (#6278)Andrew Morgan2019-10-302-1/+2
* | | | | | | | | | Update CI to run isort on scripts and scripts-dev (#6270)Andrew Morgan2020-03-163-3/+3
|\| | | | | | | | |
| * | | | | | | | | Update CI to run isort on scripts and scripts-dev (#6270)Andrew Morgan2019-10-303-3/+3
* | | | | | | | | | Fix small typo in comment (#6269)Andrew Morgan2020-03-162-1/+2
|\| | | | | | | | |
| * | | | | | | | | Fix small typo in comment (#6269)Andrew Morgan2019-10-302-1/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2020-03-163-2/+3
|\| | | | | | | |
| * | | | | | | | Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2019-10-303-2/+3
* | | | | | | | | Remove redundant arguments to CI's flake8 (#6277)Andrew Morgan2020-03-162-1/+2
|\| | | | | | | |
| * | | | | | | | Remove redundant arguments to CI's flake8 (#6277)Andrew Morgan2019-10-302-1/+2
* | | | | | | | | Handle FileNotFound error in checking git repository version (#6284)Andrew Morgan2020-03-162-4/+7
|\| | | | | | | |
| * | | | | | | | Handle FileNotFound error in checking git repository version (#6284)Andrew Morgan2019-10-302-4/+7
* | | | | | | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitAndrew Morgan2020-03-167-53/+33
|\| | | | | | | |
| * | | | | | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitErik Johnston2019-10-307-53/+33
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'erikj/federation_server_async_await' of github.com:matrix-org/s...Erik Johnston2019-10-2913-62/+96
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | NewsfileErik Johnston2019-10-291-0/+1
| | * | | | | | | | | Port receipt and read markers to async/waitErik Johnston2019-10-296-53/+32
* | | | | | | | | | | Merge pull request #6274 from matrix-org/erikj/replication_asyncAndrew Morgan2020-03-167-44/+27
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #6274 from matrix-org/erikj/replication_asyncErik Johnston2019-10-307-44/+27
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replicatio...Erik Johnston2019-10-2912-61/+95
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | * | | | | | | | | | NewsfileErik Johnston2019-10-291-0/+1
| | * | | | | | | | | | Port replication http server endpoints to async/awaitErik Johnston2019-10-296-44/+26
* | | | | | | | | | | | Merge pull request #6275 from matrix-org/erikj/port_rest_eventsAndrew Morgan2020-03-162-94/+73
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #6275 from matrix-org/erikj/port_rest_eventsErik Johnston2019-10-302-94/+73
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/port_rest_...Erik Johnston2019-10-2912-61/+95
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | NewsfileErik Johnston2019-10-291-0/+1
| | * | | | | | | | | | | Port room rest handlers to async/awaitErik Johnston2019-10-291-94/+72
| | | |/ / / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge pull request #6279 from matrix-org/erikj/federation_server_async_awaitAndrew Morgan2020-03-164-128/+100
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #6279 from matrix-org/erikj/federation_server_async_awaitErik Johnston2019-10-304-128/+100
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Don't return coroutinesErik Johnston2019-10-291-6/+6
| | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation...Erik Johnston2019-10-2913-62/+96
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Make concurrently_execute work with async/awaitErik Johnston2019-10-291-4/+3
| | * | | | | | | | NewsfileErik Johnston2019-10-291-0/+1
| | * | | | | | | | Port federation_server to async/awaitErik Johnston2019-10-292-118/+90
| | |/ / / / / / /
* | | | | | | | | Clarify environment variable usage when running in Docker (#6181)Andrew Morgan2020-03-161-2/+3
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Clarify environment variable usage when running in Docker (#6181)Anton Lazarev2019-10-301-2/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Fix CI for synapse_port_db (#6276)Andrew Morgan2020-03-165-4/+52
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Fix CI for synapse_port_db (#6276)Brendan Abolivier2019-10-295-4/+52
| * | | | | | | Merge branch 'master' into developRichard van der Hoff2019-10-297-57/+43
| |\| | | | | |
| * | | | | | | Merge branch 'babolivier/changelog-name' into developBrendan Abolivier2019-10-291-0/+0
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
* | | | | | | | 1.5.0Andrew Morgan2020-03-165-11/+37
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | 1.5.0 v1.5.0 github/release-v1.5.0 release-v1.5.0Richard van der Hoff2019-10-294-9/+25
| * | | | | | | update ugrade notesRichard van der Hoff2019-10-291-1/+11
| * | | | | | | Merge remote-tracking branch 'origin/master' into release-v1.5.0Richard van der Hoff2019-10-293-47/+7
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Update UPGRADE.rstRichard van der Hoff2019-10-291-1/+1
| | * | | | | | Update UPGRADE.rstRichard van der Hoff2019-10-291-1/+1
| * | | | | | | Fix changelog nameBrendan Abolivier2019-10-291-0/+0
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-01-27 09:27:54 +0000