Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Raise an error if someone tries to use the log_file config option (#6626) | Richard van der Hoff | 2020-01-03 | 2 | -3/+16 |
* | Remove unused, undocumented "content repo" resource (#6628) | Richard van der Hoff | 2020-01-03 | 6 | -123/+2 |
* | Kill off redundant SynapseRequestFactory (#6619) | Richard van der Hoff | 2020-01-03 | 1 | -15/+3 |
* | Reduce the reconnect time when replication fails. (#6617) | Richard van der Hoff | 2020-01-03 | 1 | -1/+2 |
* | Merge branch 'master' into develop | Richard van der Hoff | 2019-12-31 | 2 | -16/+38 |
|\ | |||||
| * | 1.7.3 v1.7.3 github/release-v1.7.3 release-v1.7.3 | Richard van der Hoff | 2019-12-31 | 1 | -1/+1 |
| * | Hacks to work around #6605 (#6608) | Richard van der Hoff | 2019-12-31 | 1 | -15/+37 |
* | | Merge branch 'master' into develop | Richard van der Hoff | 2019-12-20 | 2 | -2/+5 |
|\| | |||||
| * | 1.7.2 v1.7.2 github/release-v1.7.2 release-v1.7.2 | Richard van der Hoff | 2019-12-20 | 1 | -1/+1 |
| * | Backport fixes to sqlite upgrade from develop (#6578) | Richard van der Hoff | 2019-12-20 | 1 | -1/+9 |
| * | Fix exceptions when attempting to backfill (#6576) | Richard van der Hoff | 2019-12-20 | 1 | -1/+4 |
* | | Split state groups into a separate data store (#6296) | Erik Johnston | 2019-12-20 | 24 | -1162/+1152 |
* | | Change EventContext to use the Storage class (#6564) | Erik Johnston | 2019-12-20 | 13 | -39/+49 |
* | | Explode on duplicate delta file names. (#6565) | Erik Johnston | 2019-12-19 | 1 | -0/+18 |
* | | Port some admin handlers to async/await (#6559) | Erik Johnston | 2019-12-19 | 3 | -56/+45 |
* | | Improve diagnostics on database upgrade failure (#6570) | Richard van der Hoff | 2019-12-19 | 2 | -8/+6 |
* | | Fix sdnotify with acme enabled (#6571) | Richard van der Hoff | 2019-12-19 | 1 | -3/+7 |
* | | Add an export_signing_key script (#6546) | Richard van der Hoff | 2019-12-19 | 1 | -8/+15 |
* | | Clean up startup for the pusher (#6558) | Richard van der Hoff | 2019-12-18 | 4 | -43/+37 |
* | | Add delta file to fix missing default table data (#6555) | Andrew Morgan | 2019-12-18 | 3 | -15/+23 |
* | | Add database config class (#6513) | Erik Johnston | 2019-12-18 | 9 | -73/+160 |
* | | Merge branch 'master' into develop | Richard van der Hoff | 2019-12-18 | 1 | -1/+1 |
|\| | |||||
| * | 1.7.1 | Richard van der Hoff | 2019-12-18 | 1 | -1/+1 |
* | | Merge release-v1.7.1 into develop | Richard van der Hoff | 2019-12-18 | 4 | -10/+16 |
|\| | |||||
| * | Fix bug where we added duplicate event IDs as auth_events (#6560) | Erik Johnston | 2019-12-17 | 1 | -7/+8 |
| * | Add auth events as per spec. (#6556) | Erik Johnston | 2019-12-16 | 1 | -67/+34 |
| * | Merge pull request #6553 from matrix-org/babolivier/fix-context-filter | Brendan Abolivier | 2019-12-16 | 2 | -3/+7 |
| |\ | |||||
| | * | Incorporate review | Brendan Abolivier | 2019-12-16 | 1 | -1/+1 |
| | * | Update the documentation of the filtering function | Brendan Abolivier | 2019-12-16 | 1 | -1/+2 |
| | * | Use the filtered version of an event when responding to /context requests for... | Brendan Abolivier | 2019-12-16 | 1 | -1/+4 |
| * | | Exclude rejected state events when calculating state at backwards extrems (#6... | Richard van der Hoff | 2019-12-16 | 1 | -1/+1 |
| * | | Persist auth/state events at backwards extremities when we fetch them (#6526) | Richard van der Hoff | 2019-12-16 | 2 | -165/+82 |
| * | | sanity-checking for events used in state res (#6531) | Richard van der Hoff | 2019-12-16 | 4 | -43/+124 |
| * | | Sanity-check room ids in event auth (#6530) | Richard van der Hoff | 2019-12-16 | 1 | -0/+12 |
| * | | Check the room_id of events when fetching room state/auth (#6524) | Richard van der Hoff | 2019-12-16 | 1 | -24/+54 |
| * | | Add `include_event_in_state` to _get_state_for_room (#6521) | Richard van der Hoff | 2019-12-16 | 1 | -18/+21 |
| * | | Move get_state methods into FederationHandler (#6503) | Richard van der Hoff | 2019-12-16 | 2 | -86/+106 |
| * | | Refactor get_events_from_store_or_dest to return a dict (#6501) | Richard van der Hoff | 2019-12-16 | 1 | -29/+15 |
| |/ | |||||
* | | Remove unused `get_pagination_rows` methods. (#6557) | Erik Johnston | 2019-12-17 | 3 | -18/+0 |
* | | Add auth events as per spec. (#6556) | Erik Johnston | 2019-12-16 | 1 | -67/+34 |
* | | Add option to allow profile queries without sharing a room (#6523) | Will Hunt | 2019-12-16 | 2 | -1/+18 |
* | | Exclude rejected state events when calculating state at backwards extrems (#6... | Richard van der Hoff | 2019-12-16 | 1 | -1/+1 |
* | | Persist auth/state events at backwards extremities when we fetch them (#6526) | Richard van der Hoff | 2019-12-16 | 2 | -169/+82 |
* | | Automatically delete empty groups/communities (#6453) | Werner Sembach | 2019-12-16 | 2 | -0/+34 |
* | | sanity-checking for events used in state res (#6531) | Richard van der Hoff | 2019-12-13 | 4 | -43/+124 |
* | | Sanity-check room ids in event auth (#6530) | Richard van der Hoff | 2019-12-13 | 1 | -0/+12 |
* | | Merge pull request #6537 from matrix-org/erikj/bump_mypy_version | Erik Johnston | 2019-12-13 | 6 | -6/+11 |
|\ \ | |||||
| * | | Bump version of mypy | Erik Johnston | 2019-12-12 | 6 | -6/+11 |
* | | | Merge branch 'master' into develop | Erik Johnston | 2019-12-13 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | 1.7.0 | Erik Johnston | 2019-12-13 | 1 | -1/+1 |
* | | | Merge pull request #6496 from matrix-org/erikj/initial_sync_asnyc | Erik Johnston | 2019-12-13 | 1 | -52/+44 |
|\ \ \ | |||||
| * \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/initial_sy... | Erik Johnston | 2019-12-11 | 70 | -693/+1121 |
| |\ \ \ | |||||
| * | | | | Port synapse.handlers.initial_sync to async/await | Erik Johnston | 2019-12-09 | 1 | -52/+44 |
* | | | | | look up cross-signing keys from the DB in bulk (#6486) | Hubert Chathi | 2019-12-12 | 3 | -13/+241 |
* | | | | | Fix redacted events being returned in search results ordered by "recent" (#6522) | Andrew Morgan | 2019-12-12 | 1 | -3/+8 |
| |_|_|/ |/| | | | |||||
* | | | | Check the room_id of events when fetching room state/auth (#6524) | Richard van der Hoff | 2019-12-12 | 1 | -23/+51 |
* | | | | Merge pull request #6511 from matrix-org/erikj/remove_db_config_from_apps | Erik Johnston | 2019-12-12 | 13 | -62/+12 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Add new config param to docstring and add types | Erik Johnston | 2019-12-11 | 1 | -1/+3 |
| * | | | Remove database config parsing from apps. | Erik Johnston | 2019-12-10 | 13 | -62/+10 |
* | | | | Add `include_event_in_state` to _get_state_for_room (#6521) | Richard van der Hoff | 2019-12-11 | 1 | -22/+28 |
* | | | | Merge pull request #6517 from matrix-org/rav/event_auth/13 | Richard van der Hoff | 2019-12-11 | 2 | -98/+88 |
|\ \ \ \ | |||||
| * | | | | convert to async: FederationHandler._process_received_pdu | Richard van der Hoff | 2019-12-11 | 1 | -11/+10 |
| * | | | | convert to async: FederationHandler._get_state_for_room | Richard van der Hoff | 2019-12-11 | 1 | -21/+21 |
| * | | | | convert to async: FederationHandler.on_receive_pdu | Richard van der Hoff | 2019-12-11 | 1 | -27/+22 |
| * | | | | Convert federation backfill to async | Richard van der Hoff | 2019-12-11 | 2 | -39/+35 |
* | | | | | Merge pull request #6504 from matrix-org/erikj/account_validity_async_await | Erik Johnston | 2019-12-11 | 2 | -55/+45 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Port handlers.account_validity to async/await. | Erik Johnston | 2019-12-10 | 2 | -47/+41 |
| * | | | | Port handlers.account_data to async/await. | Erik Johnston | 2019-12-10 | 1 | -9/+5 |
| |/ / / | |||||
* | | | | Clean up some logging (#6515) | Richard van der Hoff | 2019-12-11 | 1 | -18/+19 |
* | | | | Merge tag 'v1.7.0rc2' into develop | Erik Johnston | 2019-12-11 | 4 | -8/+18 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | 1.7.0rc2 v1.7.0rc2 | Erik Johnston | 2019-12-11 | 1 | -1/+1 |
| * | | | Back out change preventing setting null avatar URLs | Erik Johnston | 2019-12-11 | 1 | -6/+6 |
| * | | | Merge branch 'erikj/fix_sqlite_7' of github.com:matrix-org/synapse into relea... | Erik Johnston | 2019-12-11 | 6 | -14/+49 |
| |\ \ \ | |||||
| * | | | | Give the server config to the RoomWorkerStore | Brendan Abolivier | 2019-12-10 | 1 | -0/+5 |
| * | | | | Make the PusherSlaveStore inherit from the slave RoomStore | Brendan Abolivier | 2019-12-10 | 1 | -1/+6 |
* | | | | | Prevent redacted events from appearing in message search (#6377) | Andrew Morgan | 2019-12-11 | 5 | -43/+77 |
* | | | | | Add dev script to generate full SQL schema files (#6394) | Andrew Morgan | 2019-12-11 | 2 | -19/+13 |
* | | | | | Prevent message search in upgraded rooms we're not in (#6385) | Andrew Morgan | 2019-12-11 | 3 | -16/+40 |
* | | | | | Merge pull request #6349 from matrix-org/babolivier/msc1802 | Brendan Abolivier | 2019-12-11 | 4 | -28/+140 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' into babolivier/msc1802 | Brendan Abolivier | 2019-12-05 | 147 | -2521/+3950 |
| |\ \ \ \ \ | |||||
| * | | | | | | Lint | Brendan Abolivier | 2019-11-11 | 1 | -3/+2 |
| * | | | | | | Lint | Brendan Abolivier | 2019-11-11 | 1 | -3/+1 |
| * | | | | | | Fix prefix for v2/send_leave | Brendan Abolivier | 2019-11-11 | 1 | -0/+2 |
| * | | | | | | Add server-side support to the v2 API | Brendan Abolivier | 2019-11-11 | 2 | -14/+33 |
| * | | | | | | Implement v2 API for send_leave | Brendan Abolivier | 2019-11-11 | 2 | -5/+56 |
| * | | | | | | Add missing yield | Brendan Abolivier | 2019-11-11 | 1 | -1/+1 |
| * | | | | | | Implement v2 API for send_join | Brendan Abolivier | 2019-11-11 | 2 | -8/+51 |
* | | | | | | | Move get_state methods into FederationHandler (#6503) | Richard van der Hoff | 2019-12-10 | 2 | -86/+106 |
* | | | | | | | Allow SAML username provider plugins (#6411) | Andrew Morgan | 2019-12-10 | 2 | -88/+296 |
* | | | | | | | Merge pull request #6510 from matrix-org/erikj/phone_home_stats_db | Erik Johnston | 2019-12-10 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Phone home stats DB reporting should not assume a single DB. | Erik Johnston | 2019-12-10 | 1 | -2/+4 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Fix race which caused deleted devices to reappear (#6514) | Richard van der Hoff | 2019-12-10 | 1 | -3/+5 |
* | | | | | | | Refactor get_events_from_store_or_dest to return a dict (#6501) | Richard van der Hoff | 2019-12-10 | 1 | -29/+15 |
* | | | | | | | Remove redundant code from event authorisation implementation. (#6502) | Richard van der Hoff | 2019-12-10 | 1 | -6/+2 |
* | | | | | | | Merge pull request #6505 from matrix-org/erikj/make_deferred_yiedable | Erik Johnston | 2019-12-10 | 1 | -1/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update comment | Erik Johnston | 2019-12-10 | 1 | -2/+4 |
| * | | | | | | | Fix make_deferred_yieldable to work with coroutines | Erik Johnston | 2019-12-10 | 1 | -1/+8 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #6499 from matrix-org/erikj/fix_sqlite_7 | Erik Johnston | 2019-12-10 | 5 | -11/+41 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Drop unused index | Erik Johnston | 2019-12-10 | 4 | -13/+18 |
| * | | | | | | Convert _censor_redactions to async since it awaits on coroutines | Erik Johnston | 2019-12-10 | 1 | -11/+9 |
| * | | | | | | Only start censor background job after indices are created | Erik Johnston | 2019-12-10 | 2 | -2/+9 |
| * | | | | | | Fix support for SQLite 3.7. | Erik Johnston | 2019-12-09 | 3 | -2/+22 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #6506 from matrix-org/erikj/remove_snapshot_cache | Erik Johnston | 2019-12-10 | 2 | -105/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | |||||
| * | | | | Remove SnapshotCache in favour of ResponseCache | Erik Johnston | 2019-12-09 | 2 | -105/+8 |
* | | | | | Merge tag 'v1.7.0rc1' into develop | Neil Johnson | 2019-12-09 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | 1.7.0rc1 v1.7.0rc1 | Neil Johnson | 2019-12-09 | 1 | -1/+1 |
* | | | | | Better errors regarding changing avatar_url (#6497) | Andrew Morgan | 2019-12-09 | 1 | -3/+8 |
|/ / / / | |||||
* | | | | Back out perf regression from get_cross_signing_keys_from_cache. (#6494) | Neil Johnson | 2019-12-09 | 1 | -30/+8 |
* | | | | Merge pull request #6487 from matrix-org/erikj/pass_in_db | Erik Johnston | 2019-12-09 | 46 | -183/+214 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix comment | Erik Johnston | 2019-12-09 | 1 | -1/+1 |
| * | | | Fix port db script | Erik Johnston | 2019-12-06 | 1 | -1/+1 |
| * | | | Move start up DB checks to main data store. | Erik Johnston | 2019-12-06 | 2 | -18/+12 |
| * | | | Pass Database into the data store | Erik Johnston | 2019-12-06 | 5 | -28/+24 |
| * | | | Move are_all_users_on_domain checks to main data store. | Erik Johnston | 2019-12-06 | 3 | -24/+24 |
| * | | | Change DataStores to accept 'database' param. | Erik Johnston | 2019-12-06 | 40 | -112/+153 |
* | | | | Merge pull request #6493 from matrix-org/erikj/invite_state_config | Erik Johnston | 2019-12-09 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Pull out room_invite_state_types config option once. | Erik Johnston | 2019-12-09 | 1 | -1/+3 |
| |/ / / | |||||
* | | | | Fix inaccurate per-block metrics (#6491) | Richard van der Hoff | 2019-12-09 | 1 | -42/+18 |
* | | | | Remove fallback for missing /federation/v1/state_ids API (#6488) | Richard van der Hoff | 2019-12-09 | 2 | -96/+17 |
* | | | | Merge pull request #6484 from matrix-org/erikj/port_sync_handler | Erik Johnston | 2019-12-09 | 7 | -177/+164 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fixup functions to consistently return deferreds | Erik Johnston | 2019-12-06 | 4 | -7/+7 |
| * | | | Port SyncHandler to async/await | Erik Johnston | 2019-12-05 | 4 | -173/+160 |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_datab... | Erik Johnston | 2019-12-06 | 41 | -817/+675 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925) | Manuel Stahl | 2019-12-05 | 6 | -109/+114 |
| |/ / | |||||
| * | | Port rest.client.v2 | Erik Johnston | 2019-12-05 | 23 | -505/+361 |
| * | | Port rest/v1 to async/await | Erik Johnston | 2019-12-05 | 11 | -167/+118 |
| * | | Stronger typing in the federation handler (#6480) | Richard van der Hoff | 2019-12-05 | 1 | -24/+57 |
| * | | Sanity-check the rooms of auth events before pulling them in. (#6472) | Richard van der Hoff | 2019-12-05 | 1 | -9/+25 |
* | | | Remove unused var | Erik Johnston | 2019-12-06 | 1 | -2/+0 |
* | | | Move background update handling out of store | Erik Johnston | 2019-12-05 | 19 | -148/+165 |
* | | | Comments | Erik Johnston | 2019-12-05 | 3 | -5/+16 |
* | | | Move DB pool and helper functions into dedicated Database class | Erik Johnston | 2019-12-05 | 47 | -2195/+2274 |
|/ / | |||||
* | | Merge pull request #6464 from matrix-org/erikj/make_public_sql_base | Erik Johnston | 2019-12-05 | 46 | -519/+512 |
|\ \ | |||||
| * | | Remove underscore from SQLBaseStore functions | Erik Johnston | 2019-12-04 | 44 | -501/+493 |
| * | | Don't call SQLBaseStore methods from outside stores | Erik Johnston | 2019-12-04 | 4 | -19/+20 |
* | | | Merge pull request #6470 from matrix-org/babolivier/port_db_ci_failure | Brendan Abolivier | 2019-12-04 | 1 | -2/+10 |
|\ \ \ | |||||
| * | | | Fix background updates for synapse_port_db | Brendan Abolivier | 2019-12-04 | 1 | -2/+10 |
| |/ / | |||||
* / / | get rid of (most of) have_events from _update_auth_events_and_context_for_aut... | Richard van der Hoff | 2019-12-04 | 2 | -72/+24 |
|/ / | |||||
* | | Merge pull request #6454 from matrix-org/erikj/clean_base_Store | Erik Johnston | 2019-12-04 | 8 | -192/+221 |
|\ \ | |||||
| * | | Revert "Move get_user_count_txn out of base store" | Erik Johnston | 2019-12-04 | 2 | -12/+12 |
| * | | _CURRENT_STATE_CACHE_NAME is public | Erik Johnston | 2019-12-04 | 2 | -5/+5 |
| * | | Move get_user_count_txn out of base store | Erik Johnston | 2019-12-04 | 2 | -12/+12 |
| * | | Move cache invalidation to main data store | Erik Johnston | 2019-12-04 | 6 | -113/+143 |
| * | | Move event fetch vars to EventWorkStore | Erik Johnston | 2019-12-04 | 4 | -14/+15 |
| * | | Move account validity bg updates to registration store | Erik Johnston | 2019-12-04 | 2 | -66/+64 |
* | | | Merge pull request #6441 from syamgk/fix-parameter-mismatch | Erik Johnston | 2019-12-04 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Issue #6406 Fix parameter mismatch | Syam G Krishnan | 2019-12-04 | 1 | -1/+1 |
* | | | | Merge pull request #6329 from matrix-org/babolivier/context_filters | Brendan Abolivier | 2019-12-04 | 5 | -3/+23 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Merge branch 'develop' into babolivier/context_filters | Brendan Abolivier | 2019-12-04 | 87 | -1315/+3016 |
| |\ \ \ | |||||
| * | | | | Incorporate review | Brendan Abolivier | 2019-12-04 | 1 | -2/+1 |
| * | | | | Also filter state events | Brendan Abolivier | 2019-11-06 | 1 | -1/+7 |
| * | | | | Only filter if a filter was provided | Brendan Abolivier | 2019-11-05 | 1 | -4/+6 |
| * | | | | Update copyright | Brendan Abolivier | 2019-11-05 | 1 | -1/+2 |
| * | | | | Update copyrights | Brendan Abolivier | 2019-11-05 | 4 | -1/+11 |
| * | | | | Filter events_before and events_after in /context requests | Brendan Abolivier | 2019-11-05 | 1 | -2/+4 |
* | | | | | Merge pull request #6451 from matrix-org/uhoreg/cross_signing_signatures_index | Erik Johnston | 2019-12-04 | 2 | -1/+24 |
|\ \ \ \ \ | |||||
| * | | | | | apply changes from review | Hubert Chathi | 2019-12-03 | 1 | -1/+2 |
| * | | | | | make cross signing signature index non-unique | Hubert Chathi | 2019-12-02 | 2 | -1/+23 |
* | | | | | | privacy by default for room dir (#6355) | Neil Johnson | 2019-12-04 | 1 | -12/+14 |
* | | | | | | Fix exception when a cross-signed device is deleted (#6462) | Richard van der Hoff | 2019-12-04 | 1 | -4/+19 |
* | | | | | | Add ephemeral messages support (MSC2228) (#6409) | Brendan Abolivier | 2019-12-03 | 6 | -7/+277 |
| |_|/ / / |/| | | | | |||||
* | | | | | Add benchmarks for structured logging performance (#6266) | Amber Brown | 2019-12-03 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Transfer power level state events on room upgrade (#6237) | Andrew Morgan | 2019-12-02 | 1 | -5/+31 |
* | | | | Fix: Pillow error when uploading RGBA image (#3325) (#6241) | Filip Štědronský | 2019-12-02 | 1 | -1/+4 |
| |/ / |/| | | |||||
* | | | Add User-Interactive Auth to /account/3pid/add (#6119) | Andrew Morgan | 2019-11-29 | 1 | -0/+5 |
* | | | Merge pull request #6434 from matrix-org/erikj/msc2367_membership_reasons | Erik Johnston | 2019-11-29 | 5 | -10/+21 |
|\ \ \ | |||||
| * | | | Propagate reason in remotely rejected invites | Erik Johnston | 2019-11-28 | 4 | -9/+20 |
| * | | | MSC2367 Allow reason field on all member events | Erik Johnston | 2019-11-28 | 1 | -1/+1 |
* | | | | Merge pull request #6436 from matrix-org/babolivier/fix-state-retrieval | Brendan Abolivier | 2019-11-29 | 2 | -9/+19 |
|\ \ \ \ | |||||
| * | | | | Lint | Brendan Abolivier | 2019-11-28 | 1 | -4/+8 |
| * | | | | Discard retention policies when retrieving state | Brendan Abolivier | 2019-11-28 | 2 | -9/+15 |
| |/ / / | |||||
* | | | | Merge branch 'master' into develop | Andrew Morgan | 2019-11-28 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | 1.6.1 v1.6.1 github/release-v1.6.1 release-v1.6.1 | Andrew Morgan | 2019-11-28 | 1 | -1/+1 |
| * | | | Remove local threepids on account deactivation (#6426) | Andrew Morgan | 2019-11-28 | 2 | -0/+16 |
| * | | | Fix startup error when http proxy is defined. (#6421) | Richard van der Hoff | 2019-11-27 | 2 | -4/+4 |
* | | | | Remove local threepids on account deactivation (#6426) | Andrew Morgan | 2019-11-28 | 2 | -0/+16 |
* | | | | Clarifications for the email configuration settings. (#6423) | Richard van der Hoff | 2019-11-28 | 1 | -1/+16 |
* | | | | Implementation of MSC2314 (#6176) | Amber Brown | 2019-11-28 | 2 | -12/+20 |
* | | | | add etag and count to key backup endpoints (#5858) | Hubert Chathi | 2019-11-27 | 4 | -120/+261 |
* | | | | Merge pull request #6358 from matrix-org/babolivier/message_retention | Brendan Abolivier | 2019-11-27 | 10 | -8/+698 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into babolivier/message_retention | Brendan Abolivier | 2019-11-26 | 72 | -1202/+2058 |
| |\ \ \ \ | |||||
| * | | | | | Fix worker mode | Brendan Abolivier | 2019-11-19 | 1 | -56/+56 |
| * | | | | | Fix 3PID invite exchange | Brendan Abolivier | 2019-11-19 | 1 | -1/+1 |
| * | | | | | Lint again | Brendan Abolivier | 2019-11-19 | 1 | -1/+1 |
| * | | | | | Lint again | Brendan Abolivier | 2019-11-19 | 1 | -1/+1 |
| * | | | | | Lint | Brendan Abolivier | 2019-11-19 | 3 | -51/+54 |
| * | | | | | Don't apply retention policy based filtering on state events | Brendan Abolivier | 2019-11-06 | 1 | -6/+9 |
| * | | | | | Implement per-room message retention policies | Brendan Abolivier | 2019-11-04 | 10 | -6/+690 |
* | | | | | | Remove assertion and provide a clear warning on startup for missing public_ba... | Andrew Morgan | 2019-11-26 | 2 | -0/+9 |
* | | | | | | Merge pull request #6343 from matrix-org/rav/event_auth/4 | Richard van der Hoff | 2019-11-26 | 1 | -37/+44 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove confusing fixme | Richard van der Hoff | 2019-11-26 | 1 | -6/+0 |
| * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/4 | Richard van der Hoff | 2019-11-18 | 21 | -42/+52 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Use get_events_as_list rather than lots of calls to get_event | Richard van der Hoff | 2019-11-08 | 1 | -16/+8 |
| * | | | | | | | Update some docstrings and comments | Richard van der Hoff | 2019-11-08 | 1 | -8/+31 |
| * | | | | | | | Simplify _update_auth_events_and_context_for_auth | Richard van der Hoff | 2019-11-08 | 1 | -11/+9 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Fix startup error when http proxy is defined. (#6421) | Richard van der Hoff | 2019-11-26 | 2 | -4/+4 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Don't construct a set | Erik Johnston | 2019-11-26 | 1 | -6/+3 |
* | | | | | | Fix find_next_generated_user_id_localpart | Erik Johnston | 2019-11-26 | 1 | -10/+7 |
* | | | | | | Merge branch 'master' into develop | Andrew Morgan | 2019-11-26 | 2 | -2/+2 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | 1.6.0 v1.6.0 github/release-v1.6.0 release-v1.6.0 | Andrew Morgan | 2019-11-26 | 1 | -1/+1 |
| * | | | | | Fix phone home stats (#6418) | Erik Johnston | 2019-11-26 | 1 | -1/+1 |
* | | | | | | Prevent account_data content from being sent over TCP replication (#6333) | Andrew Morgan | 2019-11-26 | 2 | -7/+6 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/fix_account... | Andrew Morgan | 2019-11-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | lint | Andrew Morgan | 2019-11-08 | 1 | -2/+1 |
| * | | | | | | | Remove content from being sent for account data rdata stream | Andrew Morgan | 2019-11-08 | 2 | -6/+6 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #6332 from matrix-org/erikj/query_devices_fix | Erik Johnston | 2019-11-26 | 3 | -4/+98 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixup docs | Erik Johnston | 2019-11-26 | 1 | -1/+5 |
| * | | | | | | | Fix caching devices for remote servers in worker. | Erik Johnston | 2019-11-05 | 3 | -4/+94 |
* | | | | | | | | Make sure that we close cursors before returning from a query (#6408) | Richard van der Hoff | 2019-11-25 | 2 | -10/+43 |
* | | | | | | | | Merge tag 'v1.6.0rc2' into develop | Richard van der Hoff | 2019-11-25 | 2 | -19/+26 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | 1.6.0rc2 v1.6.0rc2 | Richard van der Hoff | 2019-11-25 | 1 | -1/+1 |
| * | | | | | | | Fix exceptions from background database update for event labels. (#6407) | Richard van der Hoff | 2019-11-25 | 1 | -18/+25 |
* | | | | | | | | Improve the performance of structured logging (#6322) | Amber Brown | 2019-11-26 | 2 | -30/+90 |
* | | | | | | | | Clean up newline quote marks around the codebase (#6362) | Andrew Morgan | 2019-11-21 | 25 | -46/+42 |
|/ / / / / / / | |||||
* | | | | | | | 1.6.0rc1 v1.6.0rc1 | Andrew Morgan | 2019-11-20 | 1 | -1/+1 |
* | | | | | | | Move admin endpoints into separate files (#6308) | Manuel Stahl | 2019-11-20 | 4 | -555/+621 |
* | | | | | | | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanups | Brendan Abolivier | 2019-11-20 | 2 | -70/+125 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Lint | Brendan Abolivier | 2019-11-20 | 1 | -1/+3 |
| * | | | | | | Apply suggestions from code review | Erik Johnston | 2019-11-18 | 2 | -3/+3 |
| * | | | | | | Add failed auth ratelimiting to UIA | Erik Johnston | 2019-11-06 | 1 | -1/+32 |
| * | | | | | | Only do `rc_login` ratelimiting on succesful login. | Erik Johnston | 2019-11-06 | 2 | -72/+94 |
| |/ / / / / | |||||
* | | | | | | Replace UPDATE with UPSERT on device_max_stream_id table (#6363) | Andrew Morgan | 2019-11-15 | 1 | -2/+15 |
* | | | | | | Fix guest -> real account upgrade with account validity enabled (#6359) | Andrew Morgan | 2019-11-14 | 1 | -6/+3 |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_... | Andrew Morgan | 2019-11-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 | Brendan Abolivier | 2019-11-14 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Set room version default to 5 | Neil Johnson | 2019-10-19 | 1 | -1/+1 |
* | | | | | | A couple more instances | Andrew Morgan | 2019-11-12 | 2 | -2/+2 |
* | | | | | | Replace instance variations of homeserver with correct case/spacing | Andrew Morgan | 2019-11-12 | 18 | -31/+31 |
|/ / / / / | |||||
* | | | | | Merge pull request #6340 from matrix-org/babolivier/pagination_query | Brendan Abolivier | 2019-11-08 | 1 | -8/+32 |
|\ \ \ \ \ | |||||
| * | | | | | Incorporate review | Brendan Abolivier | 2019-11-08 | 1 | -12/+12 |
| * | | | | | Lint | Brendan Abolivier | 2019-11-07 | 1 | -2/+2 |
| * | | | | | Only join on event_labels if we're filtering on labels | Brendan Abolivier | 2019-11-07 | 1 | -9/+24 |
| * | | | | | Handle lack of filter | Brendan Abolivier | 2019-11-07 | 1 | -5/+3 |
| * | | | | | Fix the SQL SELECT query in _paginate_room_events_txn | Brendan Abolivier | 2019-11-07 | 1 | -2/+13 |
* | | | | | | Merge pull request #6295 from matrix-org/erikj/split_purge_history | Erik Johnston | 2019-11-08 | 5 | -174/+323 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Move type annotation into docstring | Erik Johnston | 2019-11-08 | 1 | -3/+3 |
| * | | | | | | Fix deleting state groups during room purge. | Erik Johnston | 2019-11-06 | 1 | -13/+14 |
| * | | | | | | Use correct type annotation | Erik Johnston | 2019-11-06 | 1 | -2/+2 |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg... | Erik Johnston | 2019-11-05 | 3 | -83/+94 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Change to not require a state_groups.room_id index. | Erik Johnston | 2019-11-04 | 4 | -53/+45 |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg... | Erik Johnston | 2019-11-04 | 64 | -336/+1288 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix up comment | Erik Johnston | 2019-11-01 | 1 | -2/+1 |
| * | | | | | | | Update log line to lie a little less | Erik Johnston | 2019-10-31 | 1 | -1/+1 |
| * | | | | | | | Add state_groups.room_id index | Erik Johnston | 2019-10-31 | 2 | -0/+24 |
| * | | | | | | | Docstrings | Erik Johnston | 2019-10-31 | 1 | -3/+11 |
| * | | | | | | | Fix purge room API | Erik Johnston | 2019-10-31 | 1 | -5/+8 |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg... | Erik Johnston | 2019-10-31 | 79 | -218/+562 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Split purge API into events vs state | Erik Johnston | 2019-10-30 | 5 | -177/+300 |
* | | | | | | | | | Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_update | Brendan Abolivier | 2019-11-07 | 2 | -0/+80 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update synapse/storage/data_stores/main/events_bg_updates.py | Brendan Abolivier | 2019-11-07 | 1 | -1/+1 |