Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | 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 | |
| * | | | | | | | | Quick fix to ensure cache descriptors always return deferreds | Erik Johnston | 2019-10-28 | 4 | -6/+6 | |
* | | | | | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-29 | 3 | -5/+10 | |
|\ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | Add CI for synapse_port_db (#6140) | Brendan Abolivier | 2019-10-28 | 7 | -3/+196 | |
* | | | | | | | | | | Fix broken URL in docker/README.md (#6264) | Tobia De Koninck | 2019-10-28 | 1 | -1/+1 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge tag 'v1.5.0rc2' into develop | Richard van der Hoff | 2019-10-28 | 9 | -12/+46 | |
|\ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | Convert EventContext to attrs (#6218) | Richard van der Hoff | 2019-10-28 | 3 | -62/+46 | |
* | | | | | | | | | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keys | Hubert Chathi | 2019-10-25 | 4 | -0/+109 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | remove unneeded imports | Hubert Chathi | 2019-10-25 | 1 | -3/+1 | |
| * | | | | | | | | | | switch to using HomeserverTestCase | Hubert Chathi | 2019-10-25 | 1 | -19/+25 | |
| * | | | | | | | | | | remove some unnecessary lines | Hubert Chathi | 2019-10-24 | 1 | -5/+0 | |
| * | | | | | | | | | | add changelog | Hubert Chathi | 2019-10-24 | 1 | -0/+1 | |
| * | | | | | | | | | | delete keys when deleting backups | Hubert Chathi | 2019-10-24 | 3 | -0/+109 | |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-25 | 3 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
* \ \ \ \ \ \ \ \ \ \ | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-25 | 2 | -67/+68 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_logging | Erik Johnston | 2019-10-25 | 7 | -17/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Address codestyle concerns | Michael Kaye | 2019-10-24 | 3 | -5/+10 | |
| * | | | | | | | | | | | | Reduce impact of debug logging | Michael Kaye | 2019-10-24 | 1 | -0/+1 | |
| * | | | | | | | | | | | | Delay printf until logging is required. | Michael Kaye | 2019-10-24 | 2 | -9/+9 | |
| * | | | | | | | | | | | | use %r to __repr__ objects | Michael Kaye | 2019-10-24 | 3 | -4/+4 | |
| * | | | | | | | | | | | | Don't encode object as UTF-8 string if not needed. | Michael Kaye | 2019-10-24 | 1 | -2/+4 | |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #6250 from matrix-org/michaelkaye/make_user_stats_less_ver... | Erik Johnston | 2019-10-25 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add missing '.' | Michael Kaye | 2019-10-24 | 1 | -1/+1 | |
| * | | | | | | | | | | | Add changelog.d | Michael Kaye | 2019-10-24 | 1 | -0/+1 | |
| * | | | | | | | | | | | Make user/room stats log line less verbose. | Michael Kaye | 2019-10-24 | 1 | -1/+1 | |
|/ / / / / / / / / / / | ||||||
| | | | | | | * | | | | Review comments | Erik Johnston | 2019-10-30 | 6 | -19/+37 | |
| | | | | | | * | | | | Newsfile | Erik Johnston | 2019-10-23 | 1 | -0/+1 | |
| | | | | | | * | | | | Use new EventPersistenceStore | Erik Johnston | 2019-10-23 | 11 | -19/+44 | |
| | | | | | | * | | | | Add DataStores and Storage classes. | Erik Johnston | 2019-10-23 | 3 | -4/+34 | |
| | | | | | | * | | | | Move persist_events out from main data store. | Erik Johnston | 2019-10-23 | 2 | -634/+711 | |
| | | | | | | | * | | | black | Hubert Chathi | 2019-10-30 | 1 | -1/+3 | |
| | | | | | | | * | | | apply changes as a result of PR review | Hubert Chathi | 2019-10-30 | 2 | -55/+46 | |
| | | | | | | | * | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-24 | 350 | -4588/+5086 | |
| | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | ||||||
| | | | | | | | * | | | don't error if federation query doesn't have cross-signing keys | Hubert Chathi | 2019-10-24 | 1 | -7/+9 | |
| | | | | | | | * | | | move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works with wor... | Hubert Chathi | 2019-10-23 | 1 | -67/+67 | |
| | | | | | | | * | | | black | Hubert Chathi | 2019-10-22 | 1 | -1/+2 | |
| | | | | | | | * | | | vendor-prefix the EDU name until MSC1756 is merged into the spec | Hubert Chathi | 2019-10-22 | 2 | -2/+4 | |
| | | | | | | | * | | | fix unit test | Hubert Chathi | 2019-10-22 | 1 | -1/+3 | |
| | | | | | | | * | | | add news file | Hubert Chathi | 2019-10-22 | 1 | -0/+1 | |
| | | | | | | | * | | | update to work with newer code, and fix formatting | Hubert Chathi | 2019-10-22 | 3 | -6/+7 | |
| | | | | | | | * | | | add missing param | Hubert Chathi | 2019-10-22 | 1 | -1/+1 | |
| | | | | | | | * | | | make black happy | Hubert Chathi | 2019-10-22 | 2 | -27/+39 | |
| | | | | | | | * | | | don't crash if the user doesn't have cross-signing keys | Hubert Chathi | 2019-10-22 | 1 | -14/+25 | |
| | | | | | | | * | | | implement federation parts of cross-signing | Hubert Chathi | 2019-10-22 | 4 | -10/+179 | |
| | | | | | | | | * | | Apply suggestions from code review | Richard van der Hoff | 2019-11-05 | 2 | -1/+2 | |
| | | | | | | | | * | | Strip overlong OpenGraph data from url preview | Richard van der Hoff | 2019-11-05 | 3 | -1/+54 | |
| | | | | | | |_|/ / | | | | | | |/| | | | ||||||
| | | | | | * | | | | 1.5.0 v1.5.0 github/release-v1.5.0 release-v1.5.0 | Richard van der Hoff | 2019-10-29 | 4 | -9/+25 | |
| | | | | | * | | | | update ugrade notes | Richard van der Hoff | 2019-10-29 | 1 | -1/+11 | |
| | | | | | * | | | | Merge remote-tracking branch 'origin/master' into release-v1.5.0 | Richard van der Hoff | 2019-10-29 | 3 | -47/+7 | |
| | | | | |/| | | | | ||||||
| | | | | | * | | | | Update UPGRADE.rst | Richard van der Hoff | 2019-10-29 | 1 | -1/+1 | |
| | | | | | * | | | | Update UPGRADE.rst | Richard van der Hoff | 2019-10-29 | 1 | -1/+1 | |
| | | | | | * | | | | Clean up the AUTHORS file (#6215) | Richard van der Hoff | 2019-10-18 | 2 | -46/+6 | |
| | | | | * | | | | | Fix changelog name | Brendan Abolivier | 2019-10-29 | 1 | -0/+0 | |
| | | | |/ / / / / | ||||||
| | | | * | | | | | Merge pull request #6268 from matrix-org/erikj/case_insensitive_room_dir | Erik Johnston | 2019-10-29 | 3 | -5/+10 | |
| | | |/| | | | | | ||||||
| | | | * | | | | | Add comment as to why we're pinning black in tests | Erik Johnston | 2019-10-29 | 1 | -1/+1 | |
| | | | * | | | | | Pin black version | Erik Johnston | 2019-10-29 | 1 | -1/+1 | |
| | | | * | | | | | Newsfile | Erik Johnston | 2019-10-29 | 1 | -0/+1 | |
| | | | * | | | | | Make room directory search case insensitive | Erik Johnston | 2019-10-29 | 1 | -4/+8 | |
| | | |/ / / / / | ||||||
| | | * | | | | | 1.5.0rc2 v1.5.0rc2 | Richard van der Hoff | 2019-10-28 | 7 | -6/+19 | |
| | | * | | | | | Improve signature checking on some federation APIs (#6262) | Richard van der Hoff | 2019-10-28 | 4 | -7/+28 | |
| | |/ / / / / | ||||||
| | * | | | | | Merge pull request #6255 from matrix-org/erikj/stats_config | Erik Johnston | 2019-10-25 | 3 | -1/+6 | |
| |/| | | | | | ||||||
| | * | | | | | Fix tests | Erik Johnston | 2019-10-25 | 1 | -0/+2 | |
| | * | | | | | Newsfile | Erik Johnston | 2019-10-25 | 1 | -0/+1 | |
| | * | | | | | Remove repeated calls to config.stats_enabled. | Erik Johnston | 2019-10-25 | 1 | -1/+3 | |
| |/ / / / / |/| | | | | | ||||||
| * | | | | | Merge pull request #6256 from matrix-org/erikj/fix_e2e_workers | Erik Johnston | 2019-10-25 | 2 | -67/+68 | |
|/| | | | | | ||||||
| * | | | | | Newsfile | Erik Johnston | 2019-10-25 | 1 | -0/+1 | |
| * | | | | | Fix /keys/query API on workers. | Erik Johnston | 2019-10-25 | 1 | -67/+67 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #6248 from matrix-org/erikj/move_schema_files | Erik Johnston | 2019-10-24 | 3 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Newsfile | Erik Johnston | 2019-10-24 | 1 | -0/+1 | |
| * | | | | | Move schema delta files to the correct data store. | Erik Johnston | 2019-10-24 | 2 | -0/+0 | |
* | | | | | | Merge pull request #6247 from matrix-org/babolivier/port_db_column | Brendan Abolivier | 2019-10-24 | 2 | -0/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Changelog | Brendan Abolivier | 2019-10-24 | 1 | -0/+1 | |
| * | | | | | Add new boolean column to synapse_port_db | Brendan Abolivier | 2019-10-24 | 1 | -0/+1 | |
* | | | | | | Fix up changelog v1.5.0rc1 | Andrew Morgan | 2019-10-24 | 2 | -22/+27 | |
* | | | | | | 1.5.0rc1 | Andrew Morgan | 2019-10-24 | 63 | -65/+80 | |
|/ / / / / | ||||||
* | | | | | Option to suppress resource exceeded alerting (#6173) | Neil Johnson | 2019-10-24 | 8 | -47/+161 | |
* | | | | | Cleanup extra quotes from IDEs (#6236) | Andrew Morgan | 2019-10-23 | 4 | -5/+5 | |
* | | | | | Merge pull request #6243 from matrix-org/babolivier/port_db_fix_imports | Brendan Abolivier | 2019-10-23 | 2 | -11/+20 | |
|\ \ \ \ \ | ||||||
| * | | | | | Changelog | Brendan Abolivier | 2019-10-23 | 1 | -0/+1 | |
| * | | | | | Fix import paths in synapse_port_db | Brendan Abolivier | 2019-10-23 | 1 | -11/+19 | |
|/ / / / / | ||||||
* | / / / | Make synapse_port_db correctly create indexes (#6102) | Brendan Abolivier | 2019-10-23 | 2 | -52/+131 | |
| |/ / / |/| | | | ||||||
* | | | | Add config linting script that checks for bool casing (#6203) | Andrew Morgan | 2019-10-23 | 14 | -30/+49 | |
* | | | | Merge pull request #6231 from matrix-org/erikj/refactor_stores | Erik Johnston | 2019-10-23 | 269 | -4395/+4649 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2019-10-22 | 8 | -19/+783 | |
| |\ \ \ | |/ / / |/| | | | ||||||
* | | | | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2 | Hubert Chathi | 2019-10-22 | 5 | -14/+774 | |
|\ \ \ \ | ||||||
| * | | | | Add changelog entry | Hubert Chathi | 2019-10-18 | 1 | -0/+1 | |
| * | | | | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-10-18 | 354 | -5244/+9522 | |
| |\ \ \ \ | ||||||
| * | | | | | fix doc strings | Hubert Chathi | 2019-10-18 | 1 | -9/+13 | |
| * | | | | | make isort happy | Hubert Chathi | 2019-09-24 | 1 | -1/+0 | |
| * | | | | | add some comments | Hubert Chathi | 2019-09-24 | 1 | -2/+10 | |
| * | | | | | drop some logger lines to debug | Hubert Chathi | 2019-09-24 | 1 | -3/+3 | |
| * | | | | | make changes based on PR feedback | Hubert Chathi | 2019-09-24 | 2 | -118/+165 | |
| * | | | | | add function docs | Hubert Chathi | 2019-09-07 | 1 | -2/+24 | |
| * | | | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_sig_upload | Hubert Chathi | 2019-09-07 | 0 | -0/+0 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-09-07 | 61 | -583/+1486 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | use something that's the right type for user_id | Hubert Chathi | 2019-09-06 | 1 | -1/+1 | |
| * | | | | | | | run black | Hubert Chathi | 2019-09-06 | 1 | -24/+10 | |
| * | | | | | | | split out signature processing into separate functions | Hubert Chathi | 2019-09-06 | 1 | -195/+204 | |
| * | | | | | | | avoid modifying input parameter | Hubert Chathi | 2019-09-05 | 1 | -7/+7 | |
| * | | | | | | | fix test | Hubert Chathi | 2019-09-05 | 1 | -1/+3 | |
| * | | | | | | | update with newer coding style | Hubert Chathi | 2019-09-04 | 2 | -3/+3 | |
| * | | | | | | | add test | Hubert Chathi | 2019-09-04 | 1 | -0/+88 | |
| * | | | | | | | make isort happy | Hubert Chathi | 2019-09-04 | 1 | -0/+1 | |
| * | | | | | | | make black happy | Hubert Chathi | 2019-09-04 | 4 | -178/+141 | |
| * | | | | | | | allow uploading signatures of master key signed by devices | Hubert Chathi | 2019-09-04 | 4 | -85/+378 | |
| * | | | | | | | implement device signature uploading/fetching | Hubert Chathi | 2019-09-04 | 3 | -0/+338 | |
* | | | | | | | | Fix demo script on ipv6-supported boxes (#6229) | Andrew Morgan | 2019-10-22 | 2 | -2/+2 | |
* | | | | | | | | Update postgres.md (#6234) | Adrien Luxey | 2019-10-22 | 1 | -3/+7 | |
| | | | | * | | | Clean up prepare_database.py a bit and add comments | Erik Johnston | 2019-10-22 | 1 | -7/+30 | |
| | | | | * | | | Delete background_update table creation in main data_store | Erik Johnston | 2019-10-22 | 1 | -21/+0 | |
| | | | | * | | | Move README into synapse/storage/__init__.py | Erik Johnston | 2019-10-22 | 2 | -13/+12 | |
| | | | | * | | | Add a basic README to synapse.storage | Erik Johnston | 2019-10-22 | 2 | -0/+14 | |
| | | | | * | | | Fix postgres unit tests to use prepare_database | Erik Johnston | 2019-10-22 | 1 | -10/+2 | |
| | | | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2019-10-22 | 29 | -304/+707 | |
| | | | | |\ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
* | | | | | | | | Delete format_tap.py (#6219) | Andrew Morgan | 2019-10-19 | 2 | -48/+1 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Remove Auth.check method (#6217) | Richard van der Hoff | 2019-10-18 | 3 | -21/+6 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into develop | Hubert Chathi | 2019-10-18 | 15 | -21/+693 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 346 | -5021/+9505 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | add note about database upgrade | Hubert Chathi | 2019-10-18 | 1 | -1/+4 | |
| * | | | | | | | use the right function for when we're already in runInteraction | Hubert Chathi | 2019-10-18 | 1 | -4/+4 | |
| | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-09-07 | 61 | -583/+1486 | |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| * | | | | | | Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1 | Hubert Chathi | 2019-09-04 | 141 | -1713/+2808 | |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| | * | | | | | add user signature stream change cache to slaved device store | Hubert Chathi | 2019-09-04 | 1 | -0/+3 | |
| | * | | | | | Merge branch 'develop' into cross-signing_keys | Hubert Chathi | 2019-09-04 | 132 | -1703/+2168 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 207 | -1510/+4979 | |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-08-28 | 206 | -1438/+4695 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Cross-signing [1/4] -- hidden devices (#5759) | Hubert Chathi | 2019-08-12 | 4 | -10/+49 | |
| | | * | | | | | | black | Hubert Chathi | 2019-08-28 | 1 | -3/+1 | |
| | | * | | | | | | use stream ID generator instead of timestamp | Hubert Chathi | 2019-08-28 | 4 | -23/+23 | |
| | | * | | | | | | make isort happy | Hubert Chathi | 2019-08-21 | 1 | -1/+0 | |
| | | * | | | | | | apply PR review suggestions | Hubert Chathi | 2019-08-21 | 4 | -53/+46 | |
| | | * | | | | | | fix formatting | Hubert Chathi | 2019-08-01 | 2 | -2/+4 | |
| | | * | | | | | | add changelog | Hubert Chathi | 2019-08-01 | 1 | -0/+1 | |
| | | * | | | | | | make changes from PR review | Hubert Chathi | 2019-08-01 | 4 | -49/+75 | |
| | | * | | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-08-01 | 298 | -2145/+3414 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | don't need to return the hidden column any more | Hubert Chathi | 2019-08-01 | 1 | -1/+1 | |
| | | | * | | | | | | really fix queries to work with Postgres | Hubert Chathi | 2019-07-31 | 1 | -19/+11 | |
| | | | * | | | | | | PostgreSQL, Y U no like? | Hubert Chathi | 2019-07-31 | 1 | -3/+4 | |
| | | | * | | | | | | remove extra SQL query param | Hubert Chathi | 2019-07-31 | 1 | -1/+0 | |
| | | | * | | | | | | Merge branch 'develop' into cross-signing_hidden | Hubert Chathi | 2019-07-30 | 298 | -2125/+3402 | |
| | | | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-07-30 | 4 | -21/+18 | |
| | | |\| | | | | | | | ||||||
| | | | * | | | | | | | add changelog file | Hubert Chathi | 2019-07-30 | 1 | -0/+1 | |
| | | | * | | | | | | | apply changes from PR review | Hubert Chathi | 2019-07-30 | 3 | -20/+17 | |
| | | * | | | | | | | | allow uploading keys for cross-signing | Hubert Chathi | 2019-07-25 | 11 | -12/+621 | |
| | | |/ / / / / / / | ||||||
| | | * | | | | | | | allow devices to be marked as "hidden" | Hubert Chathi | 2019-07-24 | 2 | -16/+65 | |
* | | | | | | | | | | Merge pull request #6214 from matrix-org/rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 6 | -211/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 21 | -152/+212 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Fix logging config for the docker image (#6197) | Richard van der Hoff | 2019-10-18 | 3 | -3/+5 | |
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 46 | -223/+460 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | changelog | Richard van der Hoff | 2019-10-17 | 1 | -0/+1 | |
| * | | | | | | | | | | rip out some unreachable code | Richard van der Hoff | 2019-10-17 | 4 | -153/+0 | |
| * | | | | | | | | | | Remove dead check_auth script | Richard van der Hoff | 2019-10-11 | 1 | -58/+0 | |
| | | | | | | | | * | | Fix packaging | Erik Johnston | 2019-10-21 | 1 | -5/+5 | |
| | | | | | | | | * | | Newsfile | Erik Johnston | 2019-10-21 | 1 | -0/+1 | |
| | | | | | | | | * | | Fix schema management to work with multiple data stores. | Erik Johnston | 2019-10-21 | 1 | -41/+108 | |
| | | | | | | | | * | | Move storage classes into a main "data store". | Erik Johnston | 2019-10-21 | 266 | -4331/+4509 | |
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'master' into develop | Brendan Abolivier | 2019-10-18 | 5 | -30/+40 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge tag 'v1.4.1' | Brendan Abolivier | 2019-10-18 | 6 | -5/+91 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fix changelog v1.4.1 github/release-v1.4.1 release-v1.4.1 | Brendan Abolivier | 2019-10-18 | 1 | -1/+1 | |
| | * | | | | | | | | | 1.4.1 | Brendan Abolivier | 2019-10-18 | 3 | -1/+13 | |
| * | | | | | | | | | | Update docker-compose.yml for a static config file, and update traefik exampl... | przemas75 | 2019-10-18 | 2 | -29/+27 | |
* | | | | | | | | | | | Merge pull request #6196 from matrix-org/erikj/await | Erik Johnston | 2019-10-18 | 7 | -114/+114 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Port synapse/rest/client/_base.py to async/await | Erik Johnston | 2019-10-11 | 1 | -9/+5 | |
| * | | | | | | | | | | | Add maybe_awaitable and fix __init__ bugs | Erik Johnston | 2019-10-11 | 2 | -2/+34 | |
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-11 | 1 | -0/+1 | |
| * | | | | | | | | | | | Port synaps/rest/client/users.py to async/await | Erik Johnston | 2019-10-11 | 1 | -11/+7 | |
| * | | | | | | | | | | | Port synaps/rest/client/server_notice_servlet.py to async/await | Erik Johnston | 2019-10-11 | 1 | -6/+3 | |
| * | | | | | | | | | | | Port synaps/rest/client/media.py to async/await | Erik Johnston | 2019-10-11 | 1 | -16/+11 | |
| * | | | | | | | | | | | Port rest/admin/__init__.py to async/await | Erik Johnston | 2019-10-11 | 1 | -72/+55 | |
* | | | | | | | | | | | | Add missing BOOLEAN_COLUMNs to synapse_port_db (#6216) | Bart Noordervliet | 2019-10-18 | 2 | -0/+3 | |
* | | | | | | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212) | Erik Johnston | 2019-10-18 | 4 | -5/+50 | |
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Remove dead changelog file | Richard van der Hoff | 2019-10-17 | 1 | -1/+0 | |
* | | | | | | | | | | | Fix up changelogs | Richard van der Hoff | 2019-10-17 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge tag 'v1.4.1rc1' into develop | Richard van der Hoff | 2019-10-17 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | 1.4.1rc1 v1.4.1rc1 | Richard van der Hoff | 2019-10-17 | 3 | -2/+9 | |
| * | | | | | | | | | | Do the update as a background index | Erik Johnston | 2019-10-17 | 2 | -9/+51 | |
| * | | | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets | Erik Johnston | 2019-10-17 | 3 | -4/+29 | |
* | | | | | | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage | Hubert Chathi | 2019-10-11 | 4 | -18/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | expand on comment | Hubert Chathi | 2019-10-11 | 1 | -1/+2 | |
| * | | | | | | | | | | | make sure we actually return something | Hubert Chathi | 2019-10-10 | 2 | -2/+9 | |
| * | | | | | | | | | | | add changelog | Hubert Chathi | 2019-10-10 | 1 | -0/+1 | |
| * | | | | | | | | | | | make storage layer in charge of interpreting the device key data | Hubert Chathi | 2019-10-10 | 3 | -19/+15 | |
* | | | | | | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version | Hubert Chathi | 2019-10-11 | 4 | -19/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | change test name to be unique | Hubert Chathi | 2019-10-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | | add changelog | Hubert Chathi | 2019-10-09 | 1 | -0/+1 | |
| * | | | | | | | | | | | | make version optional in body of e2e backup version update | Hubert Chathi | 2019-10-09 | 3 | -19/+34 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #6195 from matrix-org/erikj/opentracing_preview_url | Erik Johnston | 2019-10-11 | 3 | -5/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-11 | 1 | -0/+1 | |
| * | | | | | | | | | | | Trace non-JSON APIs, /media, /key etc | Erik Johnston | 2019-10-11 | 2 | -5/+11 | |
* | | | | | | | | | | | | cas: support setting display name (#6114) | Valérian Rousset | 2019-10-11 | 4 | -1/+8 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Fix MAU reaping where reserved users are specified. (#6168) | Neil Johnson | 2019-10-11 | 4 | -51/+115 | |
* | | | | | | | | | | | Merge pull request #6156 from matrix-org/erikj/postgres_any | Erik Johnston | 2019-10-10 | 15 | -109/+190 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix SQLite take 2 | Erik Johnston | 2019-10-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | Fix SQLite | Erik Johnston | 2019-10-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | Remove add_in_list_sql_clause | Erik Johnston | 2019-10-10 | 4 | -34/+25 | |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/postgres_any | Erik Johnston | 2019-10-10 | 8 | -102/+236 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-10 | 1 | -0/+1 | |
| * | | | | | | | | | | | | Replace IN usage with helper funcs | Erik Johnston | 2019-10-10 | 11 | -97/+138 | |
| * | | | | | | | | | | | | Add helper funcs to use postgres ANY | Erik Johnston | 2019-10-10 | 1 | -8/+56 | |
* | | | | | | | | | | | | | Merge pull request #6186 from matrix-org/erikj/disable_sql_bytes | Erik Johnston | 2019-10-10 | 8 | -15/+65 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix postgres unit tests | Erik Johnston | 2019-10-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Fix store_url_cache using bytes | Erik Johnston | 2019-10-10 | 1 | -2/+2 | |
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq... | Erik Johnston | 2019-10-10 | 8 | -102/+236 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #6191 from matrix-org/rav/fix_packaging | Erik Johnston | 2019-10-10 | 2 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix python packaging | Richard van der Hoff | 2019-10-10 | 2 | -3/+2 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_inner | Erik Johnston | 2019-10-10 | 6 | -99/+234 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fixup comments | Erik Johnston | 2019-10-10 | 1 | -3/+3 | |
| * | | | | | | | | | | | Fix py3.5 | Erik Johnston | 2019-10-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | Fix py3.5 | Erik Johnston | 2019-10-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | sort | Erik Johnston | 2019-10-10 | 1 | -3/+1 | |
| * | | | | | | | | | | | Appease mypy | Erik Johnston | 2019-10-10 | 1 | -13/+18 | |
| * | | | | | | | | | | | Add coments | Erik Johnston | 2019-10-10 | 1 | -5/+25 | |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner | Erik Johnston | 2019-10-10 | 48 | -163/+556 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-10 | 1 | -0/+1 | |
| * | | | | | | | | | | | | Fix packaging | Erik Johnston | 2019-10-10 | 1 | -2/+4 | |
| * | | | | | | | | | | | | Log correct context | Erik Johnston | 2019-10-10 | 1 | -6/+6 | |
| * | | | | | | | | | | | | Test for sentinel commit | Erik Johnston | 2019-10-10 | 1 | -2/+19 | |
| * | | | | | | | | | | | | Move patch_inline_callbacks into synapse/ | Erik Johnston | 2019-10-10 | 3 | -4/+4 | |
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner | Erik Johnston | 2019-10-09 | 99 | -1106/+1795 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Update | Erik Johnston | 2019-09-27 | 1 | -8/+15 | |
| * | | | | | | | | | | | | Patch inlinecallbacks for log contexts | Erik Johnston | 2019-09-27 | 5 | -10/+95 | |
| | | | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq... | Erik Johnston | 2019-10-10 | 135 | -1692/+2474 | |
| | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Add domain validation when creating room with list of invitees (#6121) | werner291 | 2019-10-10 | 3 | -1/+13 | |
* | | | | | | | | | | | | | before fulfilling a group invite,check if user is already joined/invited (#3436) | Michael Telatynski | 2019-10-10 | 2 | -4/+17 | |
* | | | | | | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380) | krombel | 2019-10-10 | 4 | -23/+33 | |
* | | | | | | | | | | | | | Add snapcraft packaging information (#6084) | James | 2019-10-10 | 3 | -0/+24 | |
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Fix races in room stats (and other) updates. (#6187) | Richard van der Hoff | 2019-10-10 | 7 | -25/+63 | |
* | | | | | | | | | | | | Rewrite the user_filter migration again (#6184) | Richard van der Hoff | 2019-10-10 | 2 | -26/+33 | |
* | | | | | | | | | | | | Move tag/push rules room upgrade checking ealier (#6155) | Andrew Morgan | 2019-10-10 | 2 | -18/+45 | |
* | | | | | | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137) | Amber Brown | 2019-10-10 | 37 | -94/+415 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets | Erik Johnston | 2019-10-09 | 3 | -4/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Update changelog.d/6185.bugfix | Erik Johnston | 2019-10-09 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #6178 from matrix-org/babolivier/factor_out_bg_updates | Brendan Abolivier | 2019-10-09 | 10 | -605/+671 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix RegistrationStore | Brendan Abolivier | 2019-10-08 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Cleanup client_ips | Brendan Abolivier | 2019-10-08 | 1 | -7/+0 | |
| * | | | | | | | | | | | | Don't end up with 4 classes in registration | Brendan Abolivier | 2019-10-08 | 1 | -52/+50 | |
| * | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-10-07 | 1 | -0/+1 | |
| * | | | | | | | | | | | | Lint | Brendan Abolivier | 2019-10-07 | 3 | -3/+3 |