Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | | | | | | Update synapse/storage/data_stores/main/events_bg_updates.py | Brendan Abolivier | 2019-11-07 | 1 | -1/+1 |
| * | | | | | | | | | Copy results | Brendan Abolivier | 2019-11-07 | 1 | -1/+3 |
| * | | | | | | | | | Revert "Back to using cursor_to_dict" | Brendan Abolivier | 2019-11-07 | 1 | -9/+9 |
| * | | | | | | | | | Back to using cursor_to_dict | Brendan Abolivier | 2019-11-07 | 1 | -9/+9 |
| * | | | | | | | | | Initialise value before looping | Brendan Abolivier | 2019-11-07 | 1 | -4/+8 |
| * | | | | | | | | | Incorporate review | Brendan Abolivier | 2019-11-07 | 1 | -14/+9 |
| * | | | | | | | | | Fix field name | Brendan Abolivier | 2019-11-06 | 1 | -1/+1 |
| * | | | | | | | | | Update insert | Brendan Abolivier | 2019-11-06 | 1 | -1/+6 |
| * | | | | | | | | | Merge branch 'develop' into babolivier/msc2326_bg_update | Brendan Abolivier | 2019-11-04 | 6 | -92/+189 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Print out the actual number of affected rows | Brendan Abolivier | 2019-11-04 | 1 | -4/+4 |
| * | | | | | | | | | Correctly order results | Brendan Abolivier | 2019-11-04 | 1 | -5/+5 |
| * | | | | | | | | | TODO | Brendan Abolivier | 2019-11-04 | 1 | -0/+2 |
| * | | | | | | | | | Fix exit condition | Brendan Abolivier | 2019-11-04 | 1 | -1/+3 |
| * | | | | | | | | | Lint | Brendan Abolivier | 2019-11-04 | 1 | -6/+3 |
| * | | | | | | | | | Don't try to process events we already have a label for | Brendan Abolivier | 2019-11-04 | 1 | -1/+2 |
| * | | | | | | | | | Use a sensible default value for labels | Brendan Abolivier | 2019-11-04 | 1 | -1/+1 |
| * | | | | | | | | | Use the right format for rows | Brendan Abolivier | 2019-11-04 | 1 | -1/+1 |
| * | | | | | | | | | MSC2326: Add background update to take previous events into account | Brendan Abolivier | 2019-11-04 | 2 | -0/+72 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groups | Andrew Morgan | 2019-11-07 | 3 | -1/+29 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrad... | Andrew Morgan | 2019-11-04 | 3 | -83/+94 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Re-add docstring, with caveats detailed | Andrew Morgan | 2019-11-04 | 3 | -3/+7 |
| * | | | | | | | | | Transfer upgraded rooms on groups | Andrew Morgan | 2019-11-04 | 2 | -0/+24 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Fix LruCache callback deduplication (#6213) | V02460 | 2019-11-07 | 1 | -11/+37 |
* | | | | | | | | | Make numeric user_id checker start at @0, and don't ratelimit on checking (#6... | Andrew Morgan | 2019-11-06 | 3 | -21/+39 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | raise exception after multiple failures | Andrew Morgan | 2019-11-06 | 1 | -3/+10 |
| * | | | | | | | | | Address review comments | Andrew Morgan | 2019-11-06 | 2 | -13/+13 |
| * | | | | | | | | | Don't forget to ratelimit calls outside of RegistrationHandler | Andrew Morgan | 2019-11-06 | 2 | -2/+4 |
| * | | | | | | | | | Numeric ID checker now checks @0, don't ratelimit on checking | Andrew Morgan | 2019-11-06 | 2 | -20/+29 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-11-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | 1.5.1 v1.5.1 | Richard van der Hoff | 2019-11-06 | 1 | -1/+1 |
* | | | | | | | | | Fix bug which caused rejected events to be stored with the wrong room state ... | Richard van der Hoff | 2019-11-06 | 4 | -92/+108 |
* | | | | | | | | | Add some checks that we aren't using state from rejected events (#6330) | Richard van der Hoff | 2019-11-05 | 2 | -6/+49 |
* | | | | | | | | | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_stats | Erik Johnston | 2019-11-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix phone home stats | Erik Johnston | 2019-11-05 | 1 | -2/+2 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2 | Richard van der Hoff | 2019-11-05 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Fix exception when OpenGraph tag values are ints | Richard van der Hoff | 2019-11-05 | 1 | -1/+2 |
* | | | | | | | | | Merge branch 'develop' into rav/url_preview_limit_title | Richard van der Hoff | 2019-11-05 | 143 | -1693/+3109 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | |||||
| * | / / / / / | Improve documentation for EventContext fields (#6319) | Richard van der Hoff | 2019-11-05 | 2 | -26/+68 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Remove the psutil dependency (#6318) | Amber Brown | 2019-11-05 | 3 | -83/+94 |
| |/ / / / / | |||||
| * / / / / | document the REPLICATE command a bit better (#6305) | Richard van der Hoff | 2019-11-04 | 3 | -9/+95 |
| |/ / / / | |||||
| * | | | | Merge pull request #6301 from matrix-org/babolivier/msc2326 | Brendan Abolivier | 2019-11-01 | 6 | -4/+98 |
| |\ \ \ \ | |||||
| | * | | | | Incorporate review | Brendan Abolivier | 2019-11-01 | 4 | -3/+9 |
| | * | | | | Update synapse/storage/data_stores/main/schema/delta/56/event_labels.sql | Brendan Abolivier | 2019-11-01 | 1 | -1/+1 |
| | * | | | | Add more data to the event_labels table and fix the indexes | Brendan Abolivier | 2019-11-01 | 3 | -5/+21 |
| | * | | | | Add unstable feature flag | Brendan Abolivier | 2019-11-01 | 1 | -0/+3 |
| | * | | | | Lint | Brendan Abolivier | 2019-11-01 | 2 | -1/+2 |
| | * | | | | Incorporate review | Brendan Abolivier | 2019-11-01 | 3 | -5/+18 |
| | * | | | | Lint | Brendan Abolivier | 2019-10-30 | 1 | -7/+1 |
| | * | | | | Add more integration testing | Brendan Abolivier | 2019-10-30 | 1 | -1/+1 |
| | * | | | | Add unit tests | Brendan Abolivier | 2019-10-30 | 1 | -1/+1 |
| | * | | | | Add index on label | Brendan Abolivier | 2019-10-30 | 1 | -1/+3 |
| | * | | | | Implement filtering | Brendan Abolivier | 2019-10-30 | 2 | -2/+20 |
| | * | | | | Store labels for new events | Brendan Abolivier | 2019-10-30 | 2 | -1/+22 |
| | * | | | | Add database table for keeping track of labels on events | Brendan Abolivier | 2019-10-29 | 1 | -0/+20 |
| * | | | | | Factor out an _AsyncEventContextImpl (#6298) | Richard van der Hoff | 2019-11-01 | 2 | -84/+61 |
| * | | | | | Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schema | Hubert Chathi | 2019-11-01 | 1 | -0/+42 |
| |\ \ \ \ \ | |||||
| | * | | | | | fix hidden field in devices table for older sqlite | Hubert Chathi | 2019-10-31 | 1 | -0/+42 |
| * | | | | | | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 10 | -6/+429 |
| * | | | | | | Remove last usages of deprecated logging.warn method (#6314) | Andrew Morgan | 2019-11-01 | 2 | -3/+3 |
| * | | | | | | Depublish a room from the public rooms list when it is upgraded (#6232) | Andrew Morgan | 2019-11-01 | 4 | -30/+91 |
| * | | | | | | Update synapse/storage/data_stores/main/devices.py | Hubert Chathi | 2019-10-31 | 1 | -1/+1 |
| * | | | | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-31 | 108 | -380/+803 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notify | Hubert Chathi | 2019-10-31 | 5 | -3/+58 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify | Hubert Chathi | 2019-10-31 | 103 | -376/+742 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | clean up code a bit | Hubert Chathi | 2019-10-31 | 1 | -5/+9 |
| | | * | | | | | | make user signatures a separate stream | Hubert Chathi | 2019-10-30 | 5 | -14/+50 |
| | | * | | | | | | Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify | Hubert Chathi | 2019-10-30 | 43 | -1142/+1234 |
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | |||||
| | | * | | | | | | make notification of signatures work with workers | Hubert Chathi | 2019-10-24 | 3 | -2/+17 |
| | * | | | | | | | rstrip slashes from url on appservice (#6306) | Will Hunt | 2019-10-31 | 1 | -1/+3 |
| | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | Update black to 19.10b0 (#6304) | Amber Brown | 2019-11-01 | 37 | -158/+179 |
| | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storage | Erik Johnston | 2019-10-31 | 19 | -66/+338 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Apply suggestions from code review | Erik Johnston | 2019-10-31 | 1 | -1/+2 |
| | | * | | | | | Port to use state storage | Erik Johnston | 2019-10-30 | 16 | -65/+102 |
| | | * | | | | | Add StateGroupStorage interface | Erik Johnston | 2019-10-30 | 3 | -1/+235 |
| | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Expose some homeserver functionality to spam checkers (#6259) | Travis Ralston | 2019-10-31 | 2 | -1/+64 |
| | * | | | | | Fix /purge_room API. | Erik Johnston | 2019-10-31 | 1 | -1/+0 |
| | * | | | | | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2019-10-31 | 62 | -145/+159 |
| | * | | | | | fix delete_existing for _persist_events (#6300) | Richard van der Hoff | 2019-10-30 | 2 | -5/+2 |
| | |/ / / / | |||||
| * | | | | | rename get_devices_by_remote to get_device_updates_by_remote | Hubert Chathi | 2019-10-30 | 2 | -6/+6 |
| * | | | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-30 | 42 | -1075/+1167 |
| |\| | | | | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_... | Erik Johnston | 2019-10-30 | 45 | -542/+555 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptor | Erik Johnston | 2019-10-30 | 1 | -4/+5 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Clarify docstring | Erik Johnston | 2019-10-30 | 1 | -0/+4 |
| | | | * | | | | Make ObservableDeferred.observe() always return deferred. | Erik Johnston | 2019-10-30 | 1 | -5/+2 |
| | | * | | | | | Fix log line that was printing undefined value (#6278) | Andrew Morgan | 2019-10-30 | 1 | -1/+1 |
| | | * | | | | | Fix small typo in comment (#6269) | Andrew Morgan | 2019-10-30 | 1 | -1/+1 |
| | | |/ / / / | |||||
| | | * | | | | Fix typo in domain name in account_threepid_delegates config option (#6273) | Andrew Morgan | 2019-10-30 | 1 | -1/+1 |
| | | * | | | | Handle FileNotFound error in checking git repository version (#6284) | Andrew Morgan | 2019-10-30 | 1 | -4/+6 |
| | | * | | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_await | Erik Johnston | 2019-10-30 | 6 | -53/+32 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge branch 'erikj/federation_server_async_await' of github.com:matrix-org/s... | Erik Johnston | 2019-10-29 | 1 | -1/+1 |
| | | | |\ \ \ \ | |||||
| | | | * | | | | | Port receipt and read markers to async/wait | Erik Johnston | 2019-10-29 | 6 | -53/+32 |
| | | * | | | | | | Merge pull request #6274 from matrix-org/erikj/replication_async | Erik Johnston | 2019-10-30 | 6 | -44/+26 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replicatio... | Erik Johnston | 2019-10-29 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | | | |||||
| | | | * | | | | | | Port replication http server endpoints to async/await | Erik Johnston | 2019-10-29 | 6 | -44/+26 |
| | | * | | | | | | | Merge pull request #6275 from matrix-org/erikj/port_rest_events | Erik Johnston | 2019-10-30 | 1 | -94/+72 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/port_rest_... | Erik Johnston | 2019-10-29 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | | | |||||
| | | | * | | | | | | | Port room rest handlers to async/await | Erik Johnston | 2019-10-29 | 1 | -94/+72 |
| | | | | |/ / / / / | | | | |/| | | | | | |||||
| | | * | | | | | | | Don't return coroutines | Erik Johnston | 2019-10-29 | 1 | -6/+6 |
| | | | |_|_|/ / / | | | |/| | | | | | |||||
| | | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation... | Erik Johnston | 2019-10-29 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| / / / | | | | |_|/ / / | | | |/| | | | | |||||
| | | | * | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-10-29 | 1 | -1/+1 |
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | * | | | | | Make concurrently_execute work with async/await | Erik Johnston | 2019-10-29 | 1 | -4/+3 |
| | | * | | | | | Port federation_server to async/await | Erik Johnston | 2019-10-29 | 1 | -118/+87 |
| | | |/ / / / | |||||
| | | * | | | | Merge pull request #6263 from matrix-org/erikj/caches_return_deferreds | Erik Johnston | 2019-10-29 | 3 | -7/+6 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Update docstring | Erik Johnston | 2019-10-29 | 1 | -3/+2 |
| | | | * | | | | Quick fix to ensure cache descriptors always return deferreds | Erik Johnston | 2019-10-28 | 3 | -4/+4 |
| | | * | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-29 | 1 | -4/+8 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Add CI for synapse_port_db (#6140) | Brendan Abolivier | 2019-10-28 | 1 | -3/+6 |
| | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | Merge tag 'v1.5.0rc2' into develop | Richard van der Hoff | 2019-10-28 | 4 | -8/+28 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Convert EventContext to attrs (#6218) | Richard van der Hoff | 2019-10-28 | 2 | -62/+45 |
| | | * | | | | | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keys | Hubert Chathi | 2019-10-25 | 2 | -0/+33 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | delete keys when deleting backups | Hubert Chathi | 2019-10-24 | 2 | -0/+33 |
| | | | | |_|_|/ / | | | | |/| | | | | |||||
| | | * | | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-25 | 1 | -1/+3 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-25 | 1 | -67/+67 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_logging | Erik Johnston | 2019-10-25 | 6 | -17/+24 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Address codestyle concerns | Michael Kaye | 2019-10-24 | 3 | -5/+10 |