Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | 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 | 3 | -9/+20 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Lint | Brendan Abolivier | 2019-11-28 | 1 | -4/+8 | |
| * | | | | | | | Changelog | Brendan Abolivier | 2019-11-28 | 1 | -0/+1 | |
| * | | | | | | | Discard retention policies when retrieving state | Brendan Abolivier | 2019-11-28 | 2 | -9/+15 | |
| |/ / / / / / | ||||||
* | | | | | | | blacklist more tests | Richard van der Hoff | 2019-11-28 | 1 | -0/+7 | |
* | | | | | | | Merge branch 'master' into develop | Andrew Morgan | 2019-11-28 | 3 | -1/+22 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | ||||||
| * | | | | | 1.6.1 v1.6.1 github/release-v1.6.1 release-v1.6.1 | Andrew Morgan | 2019-11-28 | 5 | -3/+22 | |
| * | | | | | Remove local threepids on account deactivation (#6426) | Andrew Morgan | 2019-11-28 | 3 | -0/+17 | |
| * | | | | | Fix startup error when http proxy is defined. (#6421) | Richard van der Hoff | 2019-11-27 | 3 | -4/+5 | |
* | | | | | | Remove local threepids on account deactivation (#6426) | Andrew Morgan | 2019-11-28 | 3 | -0/+17 | |
* | | | | | | Clarifications for the email configuration settings. (#6423) | Richard van der Hoff | 2019-11-28 | 3 | -2/+33 | |
* | | | | | | Implementation of MSC2314 (#6176) | Amber Brown | 2019-11-28 | 13 | -65/+174 | |
* | | | | | | add etag and count to key backup endpoints (#5858) | Hubert Chathi | 2019-11-27 | 7 | -124/+297 | |
* | | | | | | Add more tests to the worker blacklist (#6429) | Richard van der Hoff | 2019-11-27 | 2 | -0/+30 | |
* | | | | | | Merge pull request #6358 from matrix-org/babolivier/message_retention | Brendan Abolivier | 2019-11-27 | 13 | -8/+1055 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'develop' into babolivier/message_retention | Brendan Abolivier | 2019-11-26 | 138 | -1274/+2600 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Don't restrict the tests to v1 rooms | Brendan Abolivier | 2019-11-26 | 1 | -2/+0 | |
| * | | | | | | | 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 | 2 | -11/+3 | |
| * | | | | | | | Lint | Brendan Abolivier | 2019-11-19 | 4 | -101/+77 | |
| * | | | | | | | Don't apply retention policy based filtering on state events | Brendan Abolivier | 2019-11-06 | 2 | -6/+19 | |
| * | | | | | | | Implement per-room message retention policies | Brendan Abolivier | 2019-11-04 | 13 | -6/+1074 | |
* | | | | | | | | clean up buildkite output | Richard van der Hoff | 2019-11-26 | 1 | -1/+3 | |
* | | | | | | | | Remove assertion and provide a clear warning on startup for missing public_ba... | Andrew Morgan | 2019-11-26 | 4 | -0/+11 | |
* | | | | | | | | Merge pull request #6343 from matrix-org/rav/event_auth/4 | Richard van der Hoff | 2019-11-26 | 2 | -37/+45 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | 30 | -47/+85 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | newsfile | Richard van der Hoff | 2019-11-08 | 1 | -0/+1 | |
| * | | | | | | | | | 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 | 3 | -4/+5 | |
| |_|_|/ / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #6420 from matrix-org/erikj/fix_find_next_generated_user_i... | Erik Johnston | 2019-11-26 | 2 | -12/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Don't construct a set | Erik Johnston | 2019-11-26 | 1 | -6/+3 | |
| * | | | | | | | | Newsfile | Erik Johnston | 2019-11-26 | 1 | -0/+1 | |
| * | | | | | | | | 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 | 4 | -2/+17 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | 1.6.0 v1.6.0 github/release-v1.6.0 release-v1.6.0 | Andrew Morgan | 2019-11-26 | 4 | -2/+16 | |
| * | | | | | | | Fix phone home stats (#6418) | Erik Johnston | 2019-11-26 | 2 | -1/+2 | |
* | | | | | | | | Prevent account_data content from being sent over TCP replication (#6333) | Andrew Morgan | 2019-11-26 | 3 | -7/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/fix_account... | Andrew Morgan | 2019-11-14 | 5 | -2/+6 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | lint | Andrew Morgan | 2019-11-08 | 1 | -2/+1 | |
| * | | | | | | | | | Add changelog | Andrew Morgan | 2019-11-08 | 1 | -0/+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 | 4 | -4/+99 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | ||||||
| * | | | | | | | | Fixup docs | Erik Johnston | 2019-11-26 | 2 | -2/+6 | |
| * | | | | | | | | Newsfile | Erik Johnston | 2019-11-05 | 1 | -0/+1 | |
| * | | | | | | | | 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 | 3 | -10/+44 | |
* | | | | | | | | | Merge tag 'v1.6.0rc2' into develop | Richard van der Hoff | 2019-11-25 | 3 | -19/+35 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | 1.6.0rc2 v1.6.0rc2 | Richard van der Hoff | 2019-11-25 | 3 | -2/+10 | |
| * | | | | | | | | Fix exceptions from background database update for event labels. (#6407) | Richard van der Hoff | 2019-11-25 | 2 | -18/+26 | |
* | | | | | | | | | Improve the performance of structured logging (#6322) | Amber Brown | 2019-11-26 | 4 | -30/+93 | |
* | | | | | | | | | Merge pull request #6392 from matrix-org/babolivier/fix-1623 | Brendan Abolivier | 2019-11-25 | 2 | -0/+75 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Lint | Brendan Abolivier | 2019-11-20 | 1 | -6/+8 | |
| * | | | | | | | | | Changelog | Brendan Abolivier | 2019-11-20 | 1 | -0/+1 | |
| * | | | | | | | | | Test if a purge can make /messages return 500 responses | Brendan Abolivier | 2019-11-20 | 1 | -0/+72 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Add working build command for docker image (#6390) | Andrew Morgan | 2019-11-23 | 2 | -0/+13 | |
* | | | | | | | | | Fix link to user_dir_populate.sql in the user directory docs (#6388) | Aaron Raimist | 2019-11-21 | 2 | -2/+2 | |
* | | | | | | | | | Clean up newline quote marks around the codebase (#6362) | Andrew Morgan | 2019-11-21 | 26 | -46/+43 | |
* | | | | | | | | | update macOS installation instructions | Matthew Hodgson | 2019-11-20 | 1 | -2/+10 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | 1.6.0rc1 v1.6.0rc1 | Andrew Morgan | 2019-11-20 | 62 | -61/+75 | |
* | | | | | | | | Docker: Change permissions for data dir before attempting to write to it (#6389) | Andrew Morgan | 2019-11-20 | 2 | -3/+4 | |
* | | | | | | | | Move admin endpoints into separate files (#6308) | Manuel Stahl | 2019-11-20 | 5 | -555/+622 | |
* | | | | | | | | Merge pull request #6335 from matrix-org/erikj/rc_login_cleanups | Brendan Abolivier | 2019-11-20 | 3 | -70/+126 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Lint | Brendan Abolivier | 2019-11-20 | 1 | -1/+3 | |
| * | | | | | | | Apply suggestions from code review | Erik Johnston | 2019-11-18 | 2 | -3/+3 | |
| * | | | | | | | Newsfile | Erik Johnston | 2019-11-06 | 1 | -0/+1 | |
| * | | | | | | | 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 | 2 | -2/+16 | |
* | | | | | | | Add optional python dependencies to snap packaging (#6317) | James | 2019-11-14 | 2 | -0/+21 | |
* | | | | | | | Fix guest -> real account upgrade with account validity enabled (#6359) | Andrew Morgan | 2019-11-14 | 2 | -6/+4 | |
* | | | | | | | Replace instance variations of homeserver with correct case/spacing (#6357) | Andrew Morgan | 2019-11-14 | 21 | -37/+38 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_... | Andrew Morgan | 2019-11-14 | 5 | -2/+6 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 | Brendan Abolivier | 2019-11-14 | 3 | -2/+3 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Set room version default to 5 | Neil Johnson | 2019-10-19 | 3 | -2/+3 | |
* | | | | | | | Blacklist PurgeRoomTestCase (#6361) | Andrew Morgan | 2019-11-13 | 2 | -0/+3 | |
| |_|_|/ / / |/| | | | | | ||||||
| | * | | | | sample config | Andrew Morgan | 2019-11-12 | 1 | -4/+4 | |
| | * | | | | Add changelog | Andrew Morgan | 2019-11-12 | 1 | -0/+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 | 2 | -8/+33 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | |
| * | | | | | Changelog | Brendan Abolivier | 2019-11-07 | 1 | -0/+1 | |
| * | | | | | 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 | 8 | -182/+335 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 | 2 | -14/+17 | |
| * | | | | | | 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 | 5 | -83/+146 | |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||||
| * | | | | | | 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 | 96 | -369/+2050 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | 94 | -282/+781 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Newsfile | Erik Johnston | 2019-10-30 | 1 | -0/+1 | |
| * | | | | | | | | Split purge API into events vs state | Erik Johnston | 2019-10-30 | 6 | -184/+308 | |
* | | | | | | | | | Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_update | Brendan Abolivier | 2019-11-07 | 3 | -0/+81 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | |
| * | | | | | | | | | Update changelog | Brendan Abolivier | 2019-11-05 | 1 | -1/+1 | |
| * | | | | | | | | | Merge branch 'develop' into babolivier/msc2326_bg_update | Brendan Abolivier | 2019-11-04 | 10 | -93/+256 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | 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 | |
| * | | | | | | | | | Changelog | Brendan Abolivier | 2019-11-04 | 1 | -0/+1 | |
| * | | | | | | | | | 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 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Python 3.8 for tox (#6341) | Richard van der Hoff | 2019-11-07 | 3 | -2/+3 | |
* | | | | | | | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groups | Andrew Morgan | 2019-11-07 | 4 | -1/+30 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrad... | Andrew Morgan | 2019-11-04 | 5 | -83/+146 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Re-add docstring, with caveats detailed | Andrew Morgan | 2019-11-04 | 3 | -3/+7 | |
| * | | | | | | | | | Transfer upgraded rooms on groups | Andrew Morgan | 2019-11-04 | 3 | -0/+25 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | tweak changelog | Richard van der Hoff | 2019-11-07 | 1 | -1/+1 | |
* | | | | | | | | | Fix LruCache callback deduplication (#6213) | V02460 | 2019-11-07 | 2 | -11/+38 | |
* | | | | | | | | | Make numeric user_id checker start at @0, and don't ratelimit on checking (#6... | Andrew Morgan | 2019-11-06 | 4 | -21/+40 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | raise exception after multiple failures | Andrew Morgan | 2019-11-06 | 1 | -3/+10 | |
| * | | | | | | | | | Address review comments | Andrew Morgan | 2019-11-06 | 2 | -13/+13 | |
| * | | | | | | | | | Add changelog | Andrew Morgan | 2019-11-06 | 1 | -0/+1 | |
| * | | | | | | | | | 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 | 6 | -3/+18 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'release-v1.5.1' | Richard van der Hoff | 2019-11-06 | 6 | -2/+73 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | build debs for eoan and bullseye github/release-v1.5.1 release-v1.5.1 | Richard van der Hoff | 2019-11-06 | 1 | -0/+2 | |
| | * | | | | | | | | 1.5.1 v1.5.1 | Richard van der Hoff | 2019-11-06 | 5 | -3/+16 | |
* | | | | | | | | | | Fix bug which caused rejected events to be stored with the wrong room state ... | Richard van der Hoff | 2019-11-06 | 7 | -103/+285 | |
* | | | | | | | | | | Add some checks that we aren't using state from rejected events (#6330) | Richard van der Hoff | 2019-11-05 | 3 | -6/+50 | |
* | | | | | | | | | | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_stats | Erik Johnston | 2019-11-05 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-11-05 | 1 | -0/+1 | |
| * | | | | | | | | | | 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 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Fix exception when OpenGraph tag values are ints | Richard van der Hoff | 2019-11-05 | 2 | -1/+3 | |
* | | | | | | | | | | Merge pull request #6331 from matrix-org/rav/url_preview_limit_title | Richard van der Hoff | 2019-11-05 | 3 | -1/+55 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'develop' into rav/url_preview_limit_title | Richard van der Hoff | 2019-11-05 | 231 | -1824/+4529 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | ||||||
* | | | / / / / / | Improve documentation for EventContext fields (#6319) | Richard van der Hoff | 2019-11-05 | 3 | -26/+69 | |
| |_|_|/ / / / / |/| | | | | | | | ||||||
* | | | | | | | | Remove the psutil dependency (#6318) | Amber Brown | 2019-11-05 | 5 | -83/+146 | |
| |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | document the REPLICATE command a bit better (#6305) | Richard van der Hoff | 2019-11-04 | 5 | -10/+110 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #6301 from matrix-org/babolivier/msc2326 | Brendan Abolivier | 2019-11-01 | 11 | -9/+396 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Incorporate review | Brendan Abolivier | 2019-11-01 | 7 | -15/+21 | |
| * | | | | | | 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 | 7 | -21/+34 | |
| * | | | | | | Lint | Brendan Abolivier | 2019-10-30 | 4 | -50/+35 | |
| * | | | | | | Changelog | Brendan Abolivier | 2019-10-30 | 1 | -0/+1 | |
| * | | | | | | Add integration tests for /messages | Brendan Abolivier | 2019-10-30 | 1 | -1/+101 | |
| * | | | | | | Add more integration testing | Brendan Abolivier | 2019-10-30 | 2 | -7/+40 | |
| * | | | | | | Add integration tests for sync | Brendan Abolivier | 2019-10-30 | 2 | -5/+122 | |
| * | | | | | | Add unit tests | Brendan Abolivier | 2019-10-30 | 2 | -1/+52 | |
| * | | | | | | 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 | 4 | -85/+65 | |
* | | | | | | | Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schema | Hubert Chathi | 2019-11-01 | 2 | -0/+43 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | add changelog | Hubert Chathi | 2019-10-31 | 1 | -0/+1 | |
| * | | | | | | | fix hidden field in devices table for older sqlite | Hubert Chathi | 2019-10-31 | 1 | -0/+42 | |
* | | | | | | | | Add contributer docs for using the provided linters script (#6164) | Jason Robinson | 2019-11-02 | 3 | -0/+13 | |
* | | | | | | | | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 16 | -12/+812 | |
* | | | | | | | | Remove last usages of deprecated logging.warn method (#6314) | Andrew Morgan | 2019-11-01 | 3 | -3/+4 | |
* | | | | | | | | Document lint.sh & allow application to specified files only (#6312) | Neil Pilgrim | 2019-11-01 | 3 | -3/+20 | |
* | | | | | | | | Depublish a room from the public rooms list when it is upgraded (#6232) | Andrew Morgan | 2019-11-01 | 5 | -30/+92 | |
* | | | | | | | | Merge pull request #5727 from matrix-org/uhoreg/e2e_cross-signing2-part3 | Hubert Chathi | 2019-10-31 | 7 | -47/+241 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | 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 | 129 | -452/+1036 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notify | Hubert Chathi | 2019-10-31 | 6 | -3/+59 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify | Hubert Chathi | 2019-10-31 | 122 | -448/+973 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | 95 | -1233/+1682 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | add changelog | Hubert Chathi | 2019-10-24 | 1 | -0/+1 | |
| * | | | | | | | | | 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 | 2 | -1/+4 | |
| |_|/ / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Update black to 19.10b0 (#6304) | Amber Brown | 2019-11-01 | 41 | -166/+191 | |
| |_|_|_|_|_|/ / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storage | Erik Johnston | 2019-10-31 | 23 | -116/+453 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Apply suggestions from code review | Erik Johnston | 2019-10-31 | 1 | -1/+2 | |
| * | | | | | | | | Newsfile | Erik Johnston | 2019-10-30 | 1 | -0/+1 | |
| * | | | | | | | | Port to use state storage | Erik Johnston | 2019-10-30 | 19 | -115/+216 | |
| * | | | | | | | | Add StateGroupStorage interface | Erik Johnston | 2019-10-30 | 3 | -1/+235 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Expose some homeserver functionality to spam checkers (#6259) | Travis Ralston | 2019-10-31 | 3 | -1/+65 | |
* | | | | | | | | Merge pull request #6307 from matrix-org/erikj/fix_purge_room | Erik Johnston | 2019-10-31 | 4 | -2/+84 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Newsfile | Erik Johnston | 2019-10-31 | 1 | -0/+1 | |
| * | | | | | | | | Add unit test for /purge_room API | Erik Johnston | 2019-10-31 | 2 | -1/+83 | |
| * | | | | | | | | Fix /purge_room API. | Erik Johnston | 2019-10-31 | 1 | -1/+0 | |
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2019-10-31 | 3 | -9/+13 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | ||||||
| * | | | | | | | Update email section of INSTALL.md about account_threepid_delegates (#6272) | Andrew Morgan | 2019-10-30 | 2 | -7/+10 | |
| * | | | | | | | Clarify environment variable usage when running in Docker (#6181) | Anton Lazarev | 2019-10-30 | 1 | -2/+3 | |
* | | | | | | | | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2019-10-31 | 65 | -149/+164 | |
* | | | | | | | | fix delete_existing for _persist_events (#6300) | Richard van der Hoff | 2019-10-30 | 3 | -5/+3 | |
| |/ / / / / / |/| | | | | | | ||||||
| | | * | | | | rename get_devices_by_remote to get_device_updates_by_remote | Hubert Chathi | 2019-10-30 | 4 | -14/+14 | |
| | | * | | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-30 | 94 | -1166/+1615 | |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #6240 from matrix-org/erikj/split_out_persistence_store | Erik Johnston | 2019-10-30 | 18 | -667/+818 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_... | Erik Johnston | 2019-10-30 | 146 | -722/+1245 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptor | Erik Johnston | 2019-10-30 | 4 | -7/+9 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Clarify docstring | Erik Johnston | 2019-10-30 | 1 | -0/+4 | |
| * | | | | | | | | Newsfile | Erik Johnston | 2019-10-30 | 1 | -0/+1 | |
| * | | | | | | | | Make ObservableDeferred.observe() always return deferred. | Erik Johnston | 2019-10-30 | 3 | -8/+5 | |
* | | | | | | | | | Modify doc to update Google ReCaptcha terms (#6257) | Yash Jipkate | 2019-10-30 | 2 | -3/+4 | |
* | | | | | | | | | Fix log line that was printing undefined value (#6278) | Andrew Morgan | 2019-10-30 | 2 | -1/+2 | |
* | | | | | | | | | Update CI to run isort on scripts and scripts-dev (#6270) | Andrew Morgan | 2019-10-30 | 3 | -3/+3 | |
* | | | | | | | | | Fix small typo in comment (#6269) | Andrew Morgan | 2019-10-30 | 2 | -1/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Fix typo in domain name in account_threepid_delegates config option (#6273) | Andrew Morgan | 2019-10-30 | 3 | -2/+3 | |
* | | | | | | | | Remove redundant arguments to CI's flake8 (#6277) | Andrew Morgan | 2019-10-30 | 2 | -1/+2 | |
* | | | | | | | | Handle FileNotFound error in checking git repository version (#6284) | Andrew Morgan | 2019-10-30 | 2 | -4/+7 | |
* | | | | | | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_await | Erik Johnston | 2019-10-30 | 7 | -53/+33 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'erikj/federation_server_async_await' of github.com:matrix-org/s... | Erik Johnston | 2019-10-29 | 13 | -62/+96 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Newsfile | Erik Johnston | 2019-10-29 | 1 | -0/+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 | 7 | -44/+27 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replicatio... | Erik Johnston | 2019-10-29 | 12 | -61/+95 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-29 | 1 | -0/+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 | 2 | -94/+73 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/port_rest_... | Erik Johnston | 2019-10-29 | 12 | -61/+95 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-29 | 1 | -0/+1 | |
| * | | | | | | | | | | | Port room rest handlers to async/await | Erik Johnston | 2019-10-29 | 1 | -94/+72 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #6279 from matrix-org/erikj/federation_server_async_await | Erik Johnston | 2019-10-30 | 4 | -128/+100 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | 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 | 13 | -62/+96 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Fix CI for synapse_port_db (#6276) | Brendan Abolivier | 2019-10-29 | 5 | -4/+52 | |
* | | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-10-29 | 7 | -57/+43 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'babolivier/changelog-name' into develop | Brendan Abolivier | 2019-10-29 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| | | * | | | | | | Make concurrently_execute work with async/await | Erik Johnston | 2019-10-29 | 1 | -4/+3 | |
| | | * | | | | | | Newsfile | Erik Johnston | 2019-10-29 | 1 | -0/+1 | |
| | | * | | | | | | Port federation_server to async/await | Erik Johnston | 2019-10-29 | 2 | -118/+90 | |
| |_|/ / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #6263 from matrix-org/erikj/caches_return_deferreds | Erik Johnston | 2019-10-29 | 5 | -9/+9 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update docstring | Erik Johnston | 2019-10-29 | 1 | -3/+2 | |
| * | | | | | | | | Newsfile | Erik Johnston | 2019-10-28 | 1 | -0/+1 |