summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
| * | | | | | | 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_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)Richard van der Hoff2019-11-073-2/+3
* | | | | | | | | 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)V024602019-11-072-11/+38
* | | | | | | | | 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
| | * | | | | | | | 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 ...Richard van der Hoff2019-11-067-103/+285
* | | | | | | | | | 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_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_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_titleRichard van der Hoff2019-11-053-1/+55
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'develop' into rav/url_preview_limit_titleRichard van der Hoff2019-11-05231-1824/+4529
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
* | | | / / / / / Improve documentation for EventContext fields (#6319)Richard van der Hoff2019-11-053-26/+69
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Remove the psutil dependency (#6318)Amber Brown2019-11-055-83/+146
| |_|/ / / / / |/| | | | | |
* | | | | | | document the REPLICATE command a bit better (#6305)Richard van der Hoff2019-11-045-10/+110
| |_|/ / / / |/| | | | |
* | | | | | 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_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)Jason Robinson2019-11-023-0/+13
* | | | | | | | 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 Morgan2019-11-013-3/+4
* | | | | | | | 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 Morgan2019-11-015-30/+92
* | | | | | | | 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
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | 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)Will Hunt2019-10-312-1/+4
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Update black to 19.10b0 (#6304)Amber Brown2019-11-0141-166/+191
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | 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)Travis Ralston2019-10-313-1/+65
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Update email section of INSTALL.md about account_threepid_delegates (#6272)Andrew Morgan2019-10-302-7/+10
| * | | | | | | Clarify environment variable usage when running in Docker (#6181)Anton Lazarev2019-10-301-2/+3
* | | | | | | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-3165-149/+164
* | | | | | | | fix delete_existing for _persist_events (#6300)Richard van der Hoff2019-10-303-5/+3
| |/ / / / / / |/| | | | | |
| | | * | | | 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
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
* | | | | | | 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
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | 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)Yash Jipkate2019-10-302-3/+4
* | | | | | | | | 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 Morgan2019-10-303-3/+3
* | | | | | | | | 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 Morgan2019-10-303-2/+3
* | | | | | | | Remove redundant arguments to CI's flake8 (#6277)Andrew Morgan2019-10-302-1/+2
* | | | | | | | 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_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_asyncErik Johnston2019-10-307-44/+27
|\ \ \ \ \ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-30 21:49:31 +0000