summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Lint againBrendan Abolivier2019-11-191-1/+1
* Lint againBrendan Abolivier2019-11-192-11/+3
* LintBrendan Abolivier2019-11-194-101/+77
* Don't apply retention policy based filtering on state eventsBrendan Abolivier2019-11-062-6/+19
* Implement per-room message retention policiesBrendan Abolivier2019-11-0413-6/+1074
* Merge pull request #6301 from matrix-org/babolivier/msc2326Brendan Abolivier2019-11-0111-9/+396
|\
| * Incorporate reviewBrendan Abolivier2019-11-017-15/+21
| * Update synapse/storage/data_stores/main/schema/delta/56/event_labels.sqlBrendan Abolivier2019-11-011-1/+1
| * Add more data to the event_labels table and fix the indexesBrendan Abolivier2019-11-013-5/+21
| * Add unstable feature flagBrendan Abolivier2019-11-011-0/+3
| * LintBrendan Abolivier2019-11-012-1/+2
| * Incorporate reviewBrendan Abolivier2019-11-017-21/+34
| * LintBrendan Abolivier2019-10-304-50/+35
| * ChangelogBrendan Abolivier2019-10-301-0/+1
| * Add integration tests for /messagesBrendan Abolivier2019-10-301-1/+101
| * Add more integration testingBrendan Abolivier2019-10-302-7/+40
| * Add integration tests for syncBrendan Abolivier2019-10-302-5/+122
| * Add unit testsBrendan Abolivier2019-10-302-1/+52
| * Add index on labelBrendan Abolivier2019-10-301-1/+3
| * Implement filteringBrendan Abolivier2019-10-302-2/+20
| * Store labels for new eventsBrendan Abolivier2019-10-302-1/+22
| * Add database table for keeping track of labels on eventsBrendan Abolivier2019-10-291-0/+20
* | Factor out an _AsyncEventContextImpl (#6298)Richard van der Hoff2019-11-014-85/+65
* | Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schemaHubert Chathi2019-11-012-0/+43
|\ \
| * | add changelogHubert Chathi2019-10-311-0/+1
| * | fix hidden field in devices table for older sqliteHubert Chathi2019-10-311-0/+42
* | | Add contributer docs for using the provided linters script (#6164)Jason Robinson2019-11-023-0/+13
* | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-0116-12/+812
* | | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2019-11-013-3/+4
* | | Document lint.sh & allow application to specified files only (#6312)Neil Pilgrim2019-11-013-3/+20
* | | Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2019-11-015-30/+92
* | | Merge pull request #5727 from matrix-org/uhoreg/e2e_cross-signing2-part3Hubert Chathi2019-10-317-47/+241
|\ \ \ | |/ / |/| |
| * | Update synapse/storage/data_stores/main/devices.pyHubert Chathi2019-10-311-1/+1
| * | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-31129-452/+1036
| |\ \ | |/ / |/| |
* | | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-316-3/+59
|\ \ \
| * \ \ Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-31122-448/+973
| |\ \ \
| * | | | clean up code a bitHubert Chathi2019-10-311-5/+9
| * | | | make user signatures a separate streamHubert Chathi2019-10-305-14/+50
| * | | | Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-3095-1233/+1682
| |\ \ \ \
| * | | | | add changelogHubert Chathi2019-10-241-0/+1
| * | | | | make notification of signatures work with workersHubert Chathi2019-10-243-2/+17
* | | | | | rstrip slashes from url on appservice (#6306)Will Hunt2019-10-312-1/+4
| |_|/ / / |/| | | |
* | | | | Update black to 19.10b0 (#6304)Amber Brown2019-11-0141-166/+191
* | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storageErik Johnston2019-10-3123-116/+453
|\ \ \ \ \
| * | | | | Apply suggestions from code review Erik Johnston2019-10-311-1/+2
| * | | | | NewsfileErik Johnston2019-10-301-0/+1
| * | | | | Port to use state storageErik Johnston2019-10-3019-115/+216
| * | | | | Add StateGroupStorage interfaceErik Johnston2019-10-303-1/+235
| | |/ / / | |/| | |
* | | | | Expose some homeserver functionality to spam checkers (#6259)Travis Ralston2019-10-313-1/+65
* | | | | Merge pull request #6307 from matrix-org/erikj/fix_purge_roomErik Johnston2019-10-314-2/+84
|\ \ \ \ \
| * | | | | NewsfileErik Johnston2019-10-311-0/+1
| * | | | | Add unit test for /purge_room APIErik Johnston2019-10-312-1/+83
| * | | | | Fix /purge_room API.Erik Johnston2019-10-311-1/+0
* | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2019-10-313-9/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update email section of INSTALL.md about account_threepid_delegates (#6272)Andrew Morgan2019-10-302-7/+10
| * | | | | Clarify environment variable usage when running in Docker (#6181)Anton Lazarev2019-10-301-2/+3
* | | | | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-3165-149/+164
* | | | | | fix delete_existing for _persist_events (#6300)Richard van der Hoff2019-10-303-5/+3
| |/ / / / |/| | | |
| | | * | rename get_devices_by_remote to get_device_updates_by_remoteHubert Chathi2019-10-304-14/+14
| | | * | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-3094-1166/+1615
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge pull request #6240 from matrix-org/erikj/split_out_persistence_storeErik Johnston2019-10-3018-667/+818
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_...Erik Johnston2019-10-30146-722/+1245
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptorErik Johnston2019-10-304-7/+9
|\ \ \ \ \ \
| * | | | | | Clarify docstringErik Johnston2019-10-301-0/+4
| * | | | | | NewsfileErik Johnston2019-10-301-0/+1
| * | | | | | Make ObservableDeferred.observe() always return deferred.Erik Johnston2019-10-303-8/+5
* | | | | | | Modify doc to update Google ReCaptcha terms (#6257)Yash Jipkate2019-10-302-3/+4
* | | | | | | Fix log line that was printing undefined value (#6278)Andrew Morgan2019-10-302-1/+2
* | | | | | | Update CI to run isort on scripts and scripts-dev (#6270)Andrew Morgan2019-10-303-3/+3
* | | | | | | Fix small typo in comment (#6269)Andrew Morgan2019-10-302-1/+2
|/ / / / / /
* | | | | | Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2019-10-303-2/+3
* | | | | | Remove redundant arguments to CI's flake8 (#6277)Andrew Morgan2019-10-302-1/+2
* | | | | | Handle FileNotFound error in checking git repository version (#6284)Andrew Morgan2019-10-302-4/+7
* | | | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitErik Johnston2019-10-307-53/+33
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'erikj/federation_server_async_await' of github.com:matrix-org/s...Erik Johnston2019-10-2913-62/+96
| |\ \ \ \ \ \
| * | | | | | | NewsfileErik Johnston2019-10-291-0/+1
| * | | | | | | Port receipt and read markers to async/waitErik Johnston2019-10-296-53/+32
* | | | | | | | Merge pull request #6274 from matrix-org/erikj/replication_asyncErik Johnston2019-10-307-44/+27
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replicatio...Erik Johnston2019-10-2912-61/+95
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | NewsfileErik Johnston2019-10-291-0/+1
| * | | | | | | | Port replication http server endpoints to async/awaitErik Johnston2019-10-296-44/+26
* | | | | | | | | Merge pull request #6275 from matrix-org/erikj/port_rest_eventsErik Johnston2019-10-302-94/+73
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/port_rest_...Erik Johnston2019-10-2912-61/+95
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | NewsfileErik Johnston2019-10-291-0/+1
| * | | | | | | | | Port room rest handlers to async/awaitErik Johnston2019-10-291-94/+72
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6279 from matrix-org/erikj/federation_server_async_awaitErik Johnston2019-10-304-128/+100
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Don't return coroutinesErik Johnston2019-10-291-6/+6
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation...Erik Johnston2019-10-2913-62/+96
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
* | | | | | | Fix CI for synapse_port_db (#6276)Brendan Abolivier2019-10-295-4/+52
* | | | | | | Merge branch 'master' into developRichard van der Hoff2019-10-297-57/+43
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | 1.5.0 v1.5.0 github/release-v1.5.0 release-v1.5.0Richard van der Hoff2019-10-294-9/+25
| * | | | | | update ugrade notesRichard van der Hoff2019-10-291-1/+11
| * | | | | | Merge remote-tracking branch 'origin/master' into release-v1.5.0Richard van der Hoff2019-10-293-47/+7
| |\ \ \ \ \ \
| | * | | | | | Update UPGRADE.rstRichard van der Hoff2019-10-291-1/+1
| | * | | | | | Update UPGRADE.rstRichard van der Hoff2019-10-291-1/+1
| | * | | | | | Clean up the AUTHORS file (#6215)Richard van der Hoff2019-10-182-46/+6
* | | | | | | | Merge branch 'babolivier/changelog-name' into developBrendan Abolivier2019-10-291-0/+0
|\| | | | | | | | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix changelog nameBrendan Abolivier2019-10-291-0/+0
| | | * | | | Make concurrently_execute work with async/awaitErik Johnston2019-10-291-4/+3
| | | * | | | NewsfileErik Johnston2019-10-291-0/+1
| | | * | | | Port federation_server to async/awaitErik Johnston2019-10-292-118/+90
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #6263 from matrix-org/erikj/caches_return_deferredsErik Johnston2019-10-295-9/+9
|\ \ \ \ \ \
| * | | | | | Update docstringErik Johnston2019-10-291-3/+2
| * | | | | | NewsfileErik Johnston2019-10-281-0/+1
| * | | | | | Quick fix to ensure cache descriptors always return deferredsErik Johnston2019-10-284-6/+6
* | | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-293-5/+10
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #6268 from matrix-org/erikj/case_insensitive_room_dirErik Johnston2019-10-293-5/+10
| |\ \ \ \ \ \
| | * | | | | | Add comment as to why we're pinning black in testsErik Johnston2019-10-291-1/+1
| | * | | | | | Pin black versionErik Johnston2019-10-291-1/+1
| | * | | | | | NewsfileErik Johnston2019-10-291-0/+1
| | * | | | | | Make room directory search case insensitiveErik Johnston2019-10-291-4/+8
| |/ / / / / /
* | | | | | | Add CI for synapse_port_db (#6140)Brendan Abolivier2019-10-287-3/+196
* | | | | | | Fix broken URL in docker/README.md (#6264)Tobia De Koninck2019-10-281-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge tag 'v1.5.0rc2' into developRichard van der Hoff2019-10-289-12/+46
|\| | | | |
| * | | | | 1.5.0rc2 v1.5.0rc2Richard van der Hoff2019-10-287-6/+19
| * | | | | Improve signature checking on some federation APIs (#6262)Richard van der Hoff2019-10-284-7/+28
* | | | | | Convert EventContext to attrs (#6218)Richard van der Hoff2019-10-283-62/+46
* | | | | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keysHubert Chathi2019-10-254-0/+109
|\ \ \ \ \ \
| * | | | | | remove unneeded importsHubert Chathi2019-10-251-3/+1
| * | | | | | switch to using HomeserverTestCaseHubert Chathi2019-10-251-19/+25
| * | | | | | remove some unnecessary linesHubert Chathi2019-10-241-5/+0
| * | | | | | add changelogHubert Chathi2019-10-241-0/+1
| * | | | | | delete keys when deleting backupsHubert Chathi2019-10-243-0/+109
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-253-1/+6
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #6255 from matrix-org/erikj/stats_configErik Johnston2019-10-253-1/+6
| |\ \ \ \ \
| | * | | | | Fix testsErik Johnston2019-10-251-0/+2
| | * | | | | NewsfileErik Johnston2019-10-251-0/+1
| | * | | | | Remove repeated calls to config.stats_enabled.Erik Johnston2019-10-251-1/+3
| | |/ / / /
* | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-252-67/+68
|\| | | | |
| * | | | | Merge pull request #6256 from matrix-org/erikj/fix_e2e_workersErik Johnston2019-10-252-67/+68
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | NewsfileErik Johnston2019-10-251-0/+1
| | * | | | Fix /keys/query API on workers.Erik Johnston2019-10-251-67/+67
| |/ / / /
* | | | | Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_loggingErik Johnston2019-10-257-17/+25
|\ \ \ \ \
| * | | | | Address codestyle concernsMichael Kaye2019-10-243-5/+10
| * | | | | Reduce impact of debug loggingMichael Kaye2019-10-241-0/+1
| * | | | | Delay printf until logging is required.Michael Kaye2019-10-242-9/+9
| * | | | | use %r to __repr__ objectsMichael Kaye2019-10-243-4/+4
| * | | | | Don't encode object as UTF-8 string if not needed.Michael Kaye2019-10-241-2/+4
| |/ / / /
* | | | | Merge pull request #6250 from matrix-org/michaelkaye/make_user_stats_less_ver...Erik Johnston2019-10-252-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add missing '.'Michael Kaye2019-10-241-1/+1
| * | | | Add changelog.dMichael Kaye2019-10-241-0/+1
| * | | | Make user/room stats log line less verbose.Michael Kaye2019-10-241-1/+1
|/ / / /
| | * | Review commentsErik Johnston2019-10-306-19/+37
| | * | NewsfileErik Johnston2019-10-231-0/+1
| | * | Use new EventPersistenceStoreErik Johnston2019-10-2311-19/+44
| | * | Add DataStores and Storage classes.Erik Johnston2019-10-233-4/+34
| | * | Move persist_events out from main data store.Erik Johnston2019-10-232-634/+711
| | | * blackHubert Chathi2019-10-301-1/+3
| | | * apply changes as a result of PR reviewHubert Chathi2019-10-302-55/+46
| | | * Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-24350-4588/+5086
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #6248 from matrix-org/erikj/move_schema_filesErik Johnston2019-10-243-0/+1
|\ \ \ \
| * | | | NewsfileErik Johnston2019-10-241-0/+1
| * | | | Move schema delta files to the correct data store.Erik Johnston2019-10-242-0/+0
* | | | | Merge pull request #6247 from matrix-org/babolivier/port_db_columnBrendan Abolivier2019-10-242-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | ChangelogBrendan Abolivier2019-10-241-0/+1
| * | | | Add new boolean column to synapse_port_dbBrendan Abolivier2019-10-241-0/+1
* | | | | Fix up changelog v1.5.0rc1Andrew Morgan2019-10-242-22/+27
* | | | | 1.5.0rc1Andrew Morgan2019-10-2463-65/+80
|/ / / /
* | | | Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-248-47/+161
* | | | Cleanup extra quotes from IDEs (#6236)Andrew Morgan2019-10-234-5/+5
* | | | Merge pull request #6243 from matrix-org/babolivier/port_db_fix_importsBrendan Abolivier2019-10-232-11/+20
|\ \ \ \
| * | | | ChangelogBrendan Abolivier2019-10-231-0/+1
| * | | | Fix import paths in synapse_port_dbBrendan Abolivier2019-10-231-11/+19
|/ / / /
* | / / Make synapse_port_db correctly create indexes (#6102)Brendan Abolivier2019-10-232-52/+131
| |/ / |/| |
* | | Add config linting script that checks for bool casing (#6203)Andrew Morgan2019-10-2314-30/+49
* | | Merge pull request #6231 from matrix-org/erikj/refactor_storesErik Johnston2019-10-23269-4395/+4649
|\ \ \
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-228-19/+783
| |\ \ \ | |/ / / |/| | |
| * | | Clean up prepare_database.py a bit and add commentsErik Johnston2019-10-221-7/+30
| * | | Delete background_update table creation in main data_storeErik Johnston2019-10-221-21/+0
| * | | Move README into synapse/storage/__init__.pyErik Johnston2019-10-222-13/+12
| * | | Add a basic README to synapse.storageErik Johnston2019-10-222-0/+14
| * | | Fix postgres unit tests to use prepare_databaseErik Johnston2019-10-221-10/+2
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-2229-304/+707
| |\ \ \
| * | | | Fix packagingErik Johnston2019-10-211-5/+5
| * | | | NewsfileErik Johnston2019-10-211-0/+1
| * | | | Fix schema management to work with multiple data stores.Erik Johnston2019-10-211-41/+108
| * | | | Move storage classes into a main "data store".Erik Johnston2019-10-21266-4331/+4509
| | | | * don't error if federation query doesn't have cross-signing keysHubert Chathi2019-10-241-7/+9
| | | | * move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works with wor...Hubert Chathi2019-10-231-67/+67
| | | | * blackHubert Chathi2019-10-221-1/+2
| | | | * vendor-prefix the EDU name until MSC1756 is merged into the specHubert Chathi2019-10-222-2/+4
| | | | * fix unit testHubert Chathi2019-10-221-1/+3
| | | | * add news fileHubert Chathi2019-10-221-0/+1
| | | | * update to work with newer code, and fix formattingHubert Chathi2019-10-223-6/+7
| | | | * add missing paramHubert Chathi2019-10-221-1/+1
| | | | * make black happyHubert Chathi2019-10-222-27/+39
| | | | * don't crash if the user doesn't have cross-signing keysHubert Chathi2019-10-221-14/+25
| | | | * implement federation parts of cross-signingHubert Chathi2019-10-224-10/+179
| |_|_|/ |/| | |
* | | | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Hubert Chathi2019-10-225-14/+774
|\ \ \ \
| * | | | Add changelog entryHubert Chathi2019-10-181-0/+1
| * | | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-18354-5244/+9522
| |\ \ \ \
| * | | | | fix doc stringsHubert Chathi2019-10-181-9/+13
| * | | | | make isort happyHubert Chathi2019-09-241-1/+0
| * | | | | add some commentsHubert Chathi2019-09-241-2/+10
| * | | | | drop some logger lines to debugHubert Chathi2019-09-241-3/+3
| * | | | | make changes based on PR feedbackHubert Chathi2019-09-242-118/+165
| * | | | | add function docsHubert Chathi2019-09-071-2/+24
| * | | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_sig_uploadHubert Chathi2019-09-070-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-0761-583/+1486
| |\ \ \ \ \ \
| * | | | | | | use something that's the right type for user_idHubert Chathi2019-09-061-1/+1
| * | | | | | | run blackHubert Chathi2019-09-061-24/+10
| * | | | | | | split out signature processing into separate functionsHubert Chathi2019-09-061-195/+204
| * | | | | | | avoid modifying input parameterHubert Chathi2019-09-051-7/+7
| * | | | | | | fix testHubert Chathi2019-09-051-1/+3
| * | | | | | | update with newer coding styleHubert Chathi2019-09-042-3/+3
| * | | | | | | add testHubert Chathi2019-09-041-0/+88
| * | | | | | | make isort happyHubert Chathi2019-09-041-0/+1
| * | | | | | | make black happyHubert Chathi2019-09-044-178/+141
| * | | | | | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-044-85/+378
| * | | | | | | implement device signature uploading/fetchingHubert Chathi2019-09-043-0/+338
* | | | | | | | Fix demo script on ipv6-supported boxes (#6229)Andrew Morgan2019-10-222-2/+2
* | | | | | | | Update postgres.md (#6234)Adrien Luxey2019-10-221-3/+7
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Delete format_tap.py (#6219)Andrew Morgan2019-10-192-48/+1
* | | | | | | Remove Auth.check method (#6217)Richard van der Hoff2019-10-183-21/+6
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into developHubert Chathi2019-10-1815-21/+693
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-18346-5021/+9505
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | add note about database upgradeHubert Chathi2019-10-181-1/+4
| * | | | | | use the right function for when we're already in runInteractionHubert Chathi2019-10-181-4/+4
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-0761-583/+1486
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1Hubert Chathi2019-09-04141-1713/+2808
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | add user signature stream change cache to slaved device storeHubert Chathi2019-09-041-0/+3
| | * | | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-04132-1703/+2168
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-28207-1510/+4979
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-08-28206-1438/+4695
| |\ \ \ \ \ \
| * | | | | | | Cross-signing [1/4] -- hidden devices (#5759)Hubert Chathi2019-08-124-10/+49
| | | * | | | | blackHubert Chathi2019-08-281-3/+1
| | | * | | | | use stream ID generator instead of timestampHubert Chathi2019-08-284-23/+23
| | | * | | | | make isort happyHubert Chathi2019-08-211-1/+0
| | | * | | | | apply PR review suggestionsHubert Chathi2019-08-214-53/+46
| | | * | | | | fix formattingHubert Chathi2019-08-012-2/+4
| | | * | | | | add changelogHubert Chathi2019-08-011-0/+1
| | | * | | | | make changes from PR reviewHubert Chathi2019-08-014-49/+75
| | | * | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-01298-2145/+3414
| | | |\ \ \ \ \
| | | | * | | | | don't need to return the hidden column any moreHubert Chathi2019-08-011-1/+1
| | | | * | | | | really fix queries to work with PostgresHubert Chathi2019-07-311-19/+11
| | | | * | | | | PostgreSQL, Y U no like?Hubert Chathi2019-07-311-3/+4
| | | | * | | | | remove extra SQL query paramHubert Chathi2019-07-311-1/+0
| | | | * | | | | Merge branch 'develop' into cross-signing_hiddenHubert Chathi2019-07-30298-2125/+3402
| | | | |\ \ \ \ \
| | | * | | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-07-304-21/+18
| | | |\| | | | | |
| | | | * | | | | | add changelog fileHubert Chathi2019-07-301-0/+1
| | | | * | | | | | apply changes from PR reviewHubert Chathi2019-07-303-20/+17
| | | * | | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-2511-12/+621
| | | |/ / / / / /
| | | * | | | | | allow devices to be marked as "hidden"Hubert Chathi2019-07-242-16/+65
* | | | | | | | | Merge pull request #6214 from matrix-org/rav/event_auth/1Richard van der Hoff2019-10-186-211/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-1821-152/+212
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fix logging config for the docker image (#6197)Richard van der Hoff2019-10-183-3/+5
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge branch 'master' into developBrendan Abolivier2019-10-185-30/+40
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge tag 'v1.4.1'Brendan Abolivier2019-10-186-5/+91
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix changelog v1.4.1 github/release-v1.4.1 release-v1.4.1Brendan Abolivier2019-10-181-1/+1
| | * | | | | | | | 1.4.1Brendan Abolivier2019-10-183-1/+13
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-05 14:37:43 +0000