Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | * | | | | | | | 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 |
| | | | | |_|/ / / / | | | | |/| | | | | | |||||
| | | * / | | | | | | Make user/room stats log line less verbose. | Michael Kaye | 2019-10-24 | 1 | -1/+1 |
| | | |/ / / / / / | |||||
| | * | | | | | | | Review comments | Erik Johnston | 2019-10-30 | 4 | -13/+28 |
| | * | | | | | | | Use new EventPersistenceStore | Erik Johnston | 2019-10-23 | 3 | -3/+12 |
| | * | | | | | | | 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 | 277 | -4434/+4751 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | 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 |
| * | | | | | | | | 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 | 1 | -1/+1 |
* | | | | | | | | | Strip overlong OpenGraph data from url preview | Richard van der Hoff | 2019-11-05 | 1 | -1/+19 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | 1.5.0 v1.5.0 github/release-v1.5.0 release-v1.5.0 | Richard van der Hoff | 2019-10-29 | 1 | -1/+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 | 1 | -1/+1 |
* | | | | | | Improve signature checking on some federation APIs (#6262) | Richard van der Hoff | 2019-10-28 | 3 | -7/+27 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #6255 from matrix-org/erikj/stats_config | Erik Johnston | 2019-10-25 | 1 | -1/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Remove repeated calls to config.stats_enabled. | Erik Johnston | 2019-10-25 | 1 | -1/+3 |
| | |/ / | |/| | | |||||
* / | | | Fix /keys/query API on workers. | Erik Johnston | 2019-10-25 | 1 | -67/+67 |
|/ / / | |||||
* | | | Move schema delta files to the correct data store. | Erik Johnston | 2019-10-24 | 2 | -0/+0 |
* | | | 1.5.0rc1 | Andrew Morgan | 2019-10-24 | 1 | -1/+1 |
* | | | Option to suppress resource exceeded alerting (#6173) | Neil Johnson | 2019-10-24 | 4 | -43/+96 |
* | | | Cleanup extra quotes from IDEs (#6236) | Andrew Morgan | 2019-10-23 | 1 | -2/+1 |
| |/ |/| | |||||
* | | Add config linting script that checks for bool casing (#6203) | Andrew Morgan | 2019-10-23 | 9 | -15/+22 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2019-10-22 | 3 | -13/+479 |
|\| | |||||
| * | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2 | Hubert Chathi | 2019-10-22 | 3 | -13/+479 |
| |\ | |||||
| | * | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-10-18 | 152 | -2508/+5409 |
| | |\ | |||||
| | * | | 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 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-09-07 | 36 | -510/+1219 |
| | |\ \ | |||||
| | * | | | 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 |
| | * | | | update with newer coding style | Hubert Chathi | 2019-09-04 | 2 | -3/+3 |
| | * | | | make black happy | Hubert Chathi | 2019-09-04 | 3 | -93/+79 |
| | * | | | allow uploading signatures of master key signed by devices | Hubert Chathi | 2019-09-04 | 3 | -84/+152 |
| | * | | | implement device signature uploading/fetching | Hubert Chathi | 2019-09-04 | 3 | -0/+338 |
* | | | | | 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 | 1 | -0/+13 |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2019-10-22 | 19 | -198/+631 |
|\| | | | | |||||
| * | | | | Remove Auth.check method (#6217) | Richard van der Hoff | 2019-10-18 | 2 | -21/+5 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into develop | Hubert Chathi | 2019-10-18 | 12 | -21/+623 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 149 | -2344/+5400 |
| | |\ \ \ | |||||
| | * | | | | 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 | 36 | -510/+1219 |
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | |||||
| | * | | | 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 | 96 | -1261/+1463 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 98 | -1378/+3636 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-08-28 | 85 | -1304/+3405 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Cross-signing [1/4] -- hidden devices (#5759) | Hubert Chathi | 2019-08-12 | 3 | -10/+48 |
| | * | | | | | | 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 |
| | * | | | | | | 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 | 187 | -1954/+2779 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | 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 | 187 | -1934/+2767 |
| | | |\ \ \ \ \ \ | |||||
| | * | | | | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-07-30 | 3 | -21/+17 |
| | |\| | | | | | | | |||||
| | | * | | | | | | | apply changes from PR review | Hubert Chathi | 2019-07-30 | 3 | -20/+17 |
| | * | | | | | | | | allow uploading keys for cross-signing | Hubert Chathi | 2019-07-25 | 10 | -12/+558 |
| | |/ / / / / / / | |||||
| | * | | | | | | | allow devices to be marked as "hidden" | Hubert Chathi | 2019-07-24 | 2 | -16/+65 |
| * | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 9 | -122/+125 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix logging config for the docker image (#6197) | Richard van der Hoff | 2019-10-18 | 1 | -3/+2 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 29 | -187/+354 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | rip out some unreachable code | Richard van der Hoff | 2019-10-17 | 4 | -153/+0 |
* | | | | | | | | | | 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 | 261 | -4324/+4500 |
| |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' into develop | Brendan Abolivier | 2019-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 1.4.1 | Brendan Abolivier | 2019-10-18 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #6196 from matrix-org/erikj/await | Erik Johnston | 2019-10-18 | 6 | -114/+113 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 |
| * | | | | | | | | | | 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 |
* | | | | | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212) | Erik Johnston | 2019-10-18 | 1 | -4/+9 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge tag 'v1.4.1rc1' into develop | Richard van der Hoff | 2019-10-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | 1.4.1rc1 v1.4.1rc1 | Richard van der Hoff | 2019-10-17 | 1 | -1/+1 |
| * | | | | | | | | | 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 | 2 | -4/+28 |
* | | | | | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage | Hubert Chathi | 2019-10-11 | 2 | -12/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 |
| * | | | | | | | | | | make storage layer in charge of interpreting the device key data | Hubert Chathi | 2019-10-10 | 2 | -13/+9 |
* | | | | | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version | Hubert Chathi | 2019-10-11 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | make version optional in body of e2e backup version update | Hubert Chathi | 2019-10-09 | 2 | -3/+3 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #6195 from matrix-org/erikj/opentracing_preview_url | Erik Johnston | 2019-10-11 | 2 | -5/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | 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 | 2 | -1/+6 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Fix MAU reaping where reserved users are specified. (#6168) | Neil Johnson | 2019-10-11 | 2 | -42/+65 |
* | | | | | | | | | | Merge pull request #6156 from matrix-org/erikj/postgres_any | Erik Johnston | 2019-10-10 | 14 | -109/+189 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 | 3 | -3/+231 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | 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 |
* | | | | | | | | | | | 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 | 3 | -3/+231 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_inner | Erik Johnston | 2019-10-10 | 3 | -3/+231 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | 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 | 39 | -146/+521 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | 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 | 2 | -1/+180 |
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner | Erik Johnston | 2019-10-09 | 62 | -1041/+1507 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Patch inlinecallbacks for log contexts | Erik Johnston | 2019-09-27 | 4 | -6/+13 |
* | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq... | Erik Johnston | 2019-10-10 | 88 | -1620/+2239 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add domain validation when creating room with list of invitees (#6121) | werner291 | 2019-10-10 | 1 | -1/+3 |
| * | | | | | | | | | | | before fulfilling a group invite,check if user is already joined/invited (#3436) | Michael Telatynski | 2019-10-10 | 1 | -4/+16 |
| * | | | | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380) | krombel | 2019-10-10 | 2 | -22/+31 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Fix races in room stats (and other) updates. (#6187) | Richard van der Hoff | 2019-10-10 | 4 | -23/+60 |
| * | | | | | | | | | | Rewrite the user_filter migration again (#6184) | Richard van der Hoff | 2019-10-10 | 1 | -26/+32 |
| * | | | | | | | | | | Move tag/push rules room upgrade checking ealier (#6155) | Andrew Morgan | 2019-10-10 | 1 | -18/+44 |
| * | | | | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137) | Amber Brown | 2019-10-10 | 33 | -79/+385 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets | Erik Johnston | 2019-10-09 | 2 | -4/+28 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #6178 from matrix-org/babolivier/factor_out_bg_updates | Brendan Abolivier | 2019-10-09 | 9 | -605/+670 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | 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 |
| | * | | | | | | | | | | Lint | Brendan Abolivier | 2019-10-07 | 3 | -3/+3 |
| | * | | | | | | | | | | Move roommember's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -108/+114 |
| | * | | | | | | | | | | Move user_directory's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -84/+94 |
| | * | | | | | | | | | | Move state's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -190/+204 |
| | * | | | | | | | | | | Move search's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -25/+31 |
| | * | | | | | | | | | | Move registration's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -95/+103 |