summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Replace UPDATE with UPSERT on device_max_stream_id table (#6363)Andrew Morgan2019-11-151-2/+15
* Fix guest -> real account upgrade with account validity enabled (#6359)Andrew Morgan2019-11-141-6/+3
* Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_...Andrew Morgan2019-11-141-1/+1
|\
| * Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5Brendan Abolivier2019-11-141-1/+1
| |\
| | * Set room version default to 5Neil Johnson2019-10-191-1/+1
* | | A couple more instancesAndrew Morgan2019-11-122-2/+2
* | | Replace instance variations of homeserver with correct case/spacingAndrew Morgan2019-11-1218-31/+31
|/ /
* | Merge pull request #6340 from matrix-org/babolivier/pagination_queryBrendan Abolivier2019-11-081-8/+32
|\ \
| * | Incorporate reviewBrendan Abolivier2019-11-081-12/+12
| * | LintBrendan Abolivier2019-11-071-2/+2
| * | Only join on event_labels if we're filtering on labelsBrendan Abolivier2019-11-071-9/+24
| * | Handle lack of filterBrendan Abolivier2019-11-071-5/+3
| * | Fix the SQL SELECT query in _paginate_room_events_txnBrendan Abolivier2019-11-071-2/+13
* | | Merge pull request #6295 from matrix-org/erikj/split_purge_historyErik Johnston2019-11-085-174/+323
|\ \ \
| * | | Move type annotation into docstringErik Johnston2019-11-081-3/+3
| * | | Fix deleting state groups during room purge.Erik Johnston2019-11-061-13/+14
| * | | Use correct type annotationErik Johnston2019-11-061-2/+2
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-11-053-83/+94
| |\ \ \
| * | | | Change to not require a state_groups.room_id index.Erik Johnston2019-11-044-53/+45
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-11-0464-336/+1288
| |\ \ \ \
| * | | | | Fix up commentErik Johnston2019-11-011-2/+1
| * | | | | Update log line to lie a little lessErik Johnston2019-10-311-1/+1
| * | | | | Add state_groups.room_id indexErik Johnston2019-10-312-0/+24
| * | | | | DocstringsErik Johnston2019-10-311-3/+11
| * | | | | Fix purge room APIErik Johnston2019-10-311-5/+8
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg...Erik Johnston2019-10-3179-218/+562
| |\ \ \ \ \
| * | | | | | Split purge API into events vs stateErik Johnston2019-10-305-177/+300
* | | | | | | Merge pull request #6310 from matrix-org/babolivier/msc2326_bg_updateBrendan Abolivier2019-11-072-0/+80
|\ \ \ \ \ \ \
| * | | | | | | Update synapse/storage/data_stores/main/events_bg_updates.pyBrendan Abolivier2019-11-071-1/+1
| * | | | | | | Update synapse/storage/data_stores/main/events_bg_updates.pyBrendan Abolivier2019-11-071-1/+1
| * | | | | | | Copy resultsBrendan Abolivier2019-11-071-1/+3
| * | | | | | | Revert "Back to using cursor_to_dict"Brendan Abolivier2019-11-071-9/+9
| * | | | | | | Back to using cursor_to_dictBrendan Abolivier2019-11-071-9/+9
| * | | | | | | Initialise value before loopingBrendan Abolivier2019-11-071-4/+8
| * | | | | | | Incorporate reviewBrendan Abolivier2019-11-071-14/+9
| * | | | | | | Fix field nameBrendan Abolivier2019-11-061-1/+1
| * | | | | | | Update insertBrendan Abolivier2019-11-061-1/+6
| * | | | | | | Merge branch 'develop' into babolivier/msc2326_bg_updateBrendan Abolivier2019-11-046-92/+189
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Print out the actual number of affected rowsBrendan Abolivier2019-11-041-4/+4
| * | | | | | | Correctly order resultsBrendan Abolivier2019-11-041-5/+5
| * | | | | | | TODOBrendan Abolivier2019-11-041-0/+2
| * | | | | | | Fix exit conditionBrendan Abolivier2019-11-041-1/+3
| * | | | | | | LintBrendan Abolivier2019-11-041-6/+3
| * | | | | | | Don't try to process events we already have a label forBrendan Abolivier2019-11-041-1/+2
| * | | | | | | Use a sensible default value for labelsBrendan Abolivier2019-11-041-1/+1
| * | | | | | | Use the right format for rowsBrendan Abolivier2019-11-041-1/+1
| * | | | | | | MSC2326: Add background update to take previous events into accountBrendan Abolivier2019-11-042-0/+72
* | | | | | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groupsAndrew Morgan2019-11-073-1/+29
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrad...Andrew Morgan2019-11-043-83/+94
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Re-add docstring, with caveats detailedAndrew Morgan2019-11-043-3/+7
| * | | | | | | | Transfer upgraded rooms on groupsAndrew Morgan2019-11-042-0/+24
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Fix LruCache callback deduplication (#6213)V024602019-11-071-11/+37
* | | | | | | | Make numeric user_id checker start at @0, and don't ratelimit on checking (#6...Andrew Morgan2019-11-063-21/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | raise exception after multiple failuresAndrew Morgan2019-11-061-3/+10
| * | | | | | | | Address review commentsAndrew Morgan2019-11-062-13/+13
| * | | | | | | | Don't forget to ratelimit calls outside of RegistrationHandlerAndrew Morgan2019-11-062-2/+4
| * | | | | | | | Numeric ID checker now checks @0, don't ratelimit on checkingAndrew Morgan2019-11-062-20/+29
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'master' into developRichard van der Hoff2019-11-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 1.5.1 v1.5.1Richard van der Hoff2019-11-061-1/+1
* | | | | | | | Fix bug which caused rejected events to be stored with the wrong room state ...Richard van der Hoff2019-11-064-92/+108
* | | | | | | | Add some checks that we aren't using state from rejected events (#6330)Richard van der Hoff2019-11-052-6/+49
* | | | | | | | Merge pull request #6336 from matrix-org/erikj/fix_phone_home_statsErik Johnston2019-11-051-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix phone home statsErik Johnston2019-11-051-2/+2
* | | | | | | | | Merge pull request #6334 from matrix-org/rav/url_preview_limit_title_2Richard van der Hoff2019-11-051-1/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Fix exception when OpenGraph tag values are intsRichard van der Hoff2019-11-051-1/+2
* | | | | | | | | Merge branch 'develop' into rav/url_preview_limit_titleRichard van der Hoff2019-11-05143-1693/+3109
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | / / / / / Improve documentation for EventContext fields (#6319)Richard van der Hoff2019-11-052-26/+68
| | |/ / / / / | |/| | | | |
| * | | | | | Remove the psutil dependency (#6318)Amber Brown2019-11-053-83/+94
| |/ / / / /
| * / / / / document the REPLICATE command a bit better (#6305)Richard van der Hoff2019-11-043-9/+95
| |/ / / /
| * | | | Merge pull request #6301 from matrix-org/babolivier/msc2326Brendan Abolivier2019-11-016-4/+98
| |\ \ \ \
| | * | | | Incorporate reviewBrendan Abolivier2019-11-014-3/+9
| | * | | | 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-013-5/+18
| | * | | | LintBrendan Abolivier2019-10-301-7/+1
| | * | | | Add more integration testingBrendan Abolivier2019-10-301-1/+1
| | * | | | Add unit testsBrendan Abolivier2019-10-301-1/+1
| | * | | | 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-012-84/+61
| * | | | | Merge pull request #6313 from matrix-org/uhoreg/cross_signing_fix_sqlite_schemaHubert Chathi2019-11-011-0/+42
| |\ \ \ \ \
| | * | | | | fix hidden field in devices table for older sqliteHubert Chathi2019-10-311-0/+42
| * | | | | | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-0110-6/+429
| * | | | | | Remove last usages of deprecated logging.warn method (#6314)Andrew Morgan2019-11-012-3/+3
| * | | | | | Depublish a room from the public rooms list when it is upgraded (#6232)Andrew Morgan2019-11-014-30/+91
| * | | | | | Update synapse/storage/data_stores/main/devices.pyHubert Chathi2019-10-311-1/+1
| * | | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-31108-380/+803
| |\| | | | |
| | * | | | | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-315-3/+58
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notifyHubert Chathi2019-10-31103-376/+742
| | | |\ \ \ \ \
| | | * | | | | | 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-3043-1142/+1234
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | * | | | | | make notification of signatures work with workersHubert Chathi2019-10-243-2/+17
| | * | | | | | | rstrip slashes from url on appservice (#6306)Will Hunt2019-10-311-1/+3
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Update black to 19.10b0 (#6304)Amber Brown2019-11-0137-158/+179
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storageErik Johnston2019-10-3119-66/+338
| | |\ \ \ \ \
| | | * | | | | Apply suggestions from code review Erik Johnston2019-10-311-1/+2
| | | * | | | | Port to use state storageErik Johnston2019-10-3016-65/+102
| | | * | | | | Add StateGroupStorage interfaceErik Johnston2019-10-303-1/+235
| | | | |/ / / | | | |/| | |
| | * | | | | Expose some homeserver functionality to spam checkers (#6259)Travis Ralston2019-10-312-1/+64
| | * | | | | Fix /purge_room API.Erik Johnston2019-10-311-1/+0
| | * | | | | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-3162-145/+159
| | * | | | | fix delete_existing for _persist_events (#6300)Richard van der Hoff2019-10-302-5/+2
| | |/ / / /
| * | | | | rename get_devices_by_remote to get_device_updates_by_remoteHubert Chathi2019-10-302-6/+6
| * | | | | Merge branch 'develop' into cross-signing_federationHubert Chathi2019-10-3042-1075/+1167
| |\| | | |
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_...Erik Johnston2019-10-3045-542/+555
| | |\ \ \ \
| | | * \ \ \ Merge pull request #6291 from matrix-org/erikj/fix_cache_descriptorErik Johnston2019-10-301-4/+5
| | | |\ \ \ \
| | | | * | | | Clarify docstringErik Johnston2019-10-301-0/+4
| | | | * | | | Make ObservableDeferred.observe() always return deferred.Erik Johnston2019-10-301-5/+2
| | | * | | | | Fix log line that was printing undefined value (#6278)Andrew Morgan2019-10-301-1/+1
| | | * | | | | Fix small typo in comment (#6269)Andrew Morgan2019-10-301-1/+1
| | | |/ / / /
| | | * | | | Fix typo in domain name in account_threepid_delegates config option (#6273)Andrew Morgan2019-10-301-1/+1
| | | * | | | Handle FileNotFound error in checking git repository version (#6284)Andrew Morgan2019-10-301-4/+6
| | | * | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitErik Johnston2019-10-306-53/+32
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'erikj/federation_server_async_await' of github.com:matrix-org/s...Erik Johnston2019-10-291-1/+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-306-44/+26
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/replicatio...Erik Johnston2019-10-291-1/+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-301-94/+72
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/port_rest_...Erik Johnston2019-10-291-1/+1
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | |
| | | | * | | | | | | Port room rest handlers to async/awaitErik Johnston2019-10-291-94/+72
| | | | | |/ / / / / | | | | |/| | | | |
| | | * | | | | | | Don't return coroutinesErik Johnston2019-10-291-6/+6
| | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/federation...Erik Johnston2019-10-291-1/+1
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| / / / | | | | |_|/ / / | | | |/| | | |
| | | | * | | | Merge branch 'master' into developRichard van der Hoff2019-10-291-1/+1
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | * | | | | Make concurrently_execute work with async/awaitErik Johnston2019-10-291-4/+3
| | | * | | | | Port federation_server to async/awaitErik Johnston2019-10-291-118/+87
| | | |/ / / /
| | | * | | | Merge pull request #6263 from matrix-org/erikj/caches_return_deferredsErik Johnston2019-10-293-7/+6
| | | |\ \ \ \
| | | | * | | | Update docstringErik Johnston2019-10-291-3/+2
| | | | * | | | Quick fix to ensure cache descriptors always return deferredsErik Johnston2019-10-283-4/+4
| | | * | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-291-4/+8
| | | |\ \ \ \ \
| | | * | | | | | Add CI for synapse_port_db (#6140)Brendan Abolivier2019-10-281-3/+6
| | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge tag 'v1.5.0rc2' into developRichard van der Hoff2019-10-284-8/+28
| | | |\ \ \ \ \
| | | * | | | | | Convert EventContext to attrs (#6218)Richard van der Hoff2019-10-282-62/+45
| | | * | | | | | Merge pull request #6253 from matrix-org/uhoreg/e2e_backup_delete_keysHubert Chathi2019-10-252-0/+33
| | | |\ \ \ \ \ \
| | | | * | | | | | delete keys when deleting backupsHubert Chathi2019-10-242-0/+33
| | | | | |_|_|/ / | | | | |/| | | |
| | | * | | | | | Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-251-1/+3
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'release-v1.5.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-251-67/+67
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge pull request #6251 from matrix-org/michaelkaye/debug_guard_loggingErik Johnston2019-10-256-17/+24
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Address codestyle concernsMichael Kaye2019-10-243-5/+10
| | | | * | | | | | | | 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
| | | | | |_|/ / / / / | | | | |/| | | | | |
| | | * / | | | | | | Make user/room stats log line less verbose.Michael Kaye2019-10-241-1/+1
| | | |/ / / / / / /
| | * | | | | | | | Review commentsErik Johnston2019-10-304-13/+28
| | * | | | | | | | Use new EventPersistenceStoreErik Johnston2019-10-233-3/+12
| | * | | | | | | | 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-24277-4434/+4751
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | 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
| * | | | | | | | | 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
* | | | | | | | | | Apply suggestions from code reviewRichard van der Hoff2019-11-051-1/+1
* | | | | | | | | | Strip overlong OpenGraph data from url previewRichard van der Hoff2019-11-051-1/+19
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | 1.5.0 v1.5.0 github/release-v1.5.0 release-v1.5.0Richard van der Hoff2019-10-291-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Make room directory search case insensitiveErik Johnston2019-10-291-4/+8
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | 1.5.0rc2 v1.5.0rc2Richard van der Hoff2019-10-281-1/+1
* | | | | | | Improve signature checking on some federation APIs (#6262)Richard van der Hoff2019-10-283-7/+27
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #6255 from matrix-org/erikj/stats_configErik Johnston2019-10-251-1/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove repeated calls to config.stats_enabled.Erik Johnston2019-10-251-1/+3
| | |/ / / | |/| | |
* / | | | Fix /keys/query API on workers.Erik Johnston2019-10-251-67/+67
|/ / / /
* | | | Move schema delta files to the correct data store.Erik Johnston2019-10-242-0/+0
* | | | 1.5.0rc1Andrew Morgan2019-10-241-1/+1
* | | | Option to suppress resource exceeded alerting (#6173)Neil Johnson2019-10-244-43/+96
* | | | Cleanup extra quotes from IDEs (#6236)Andrew Morgan2019-10-231-2/+1
| |/ / |/| |
* | | Add config linting script that checks for bool casing (#6203)Andrew Morgan2019-10-239-15/+22
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-223-13/+479
|\| |
| * | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2Hubert Chathi2019-10-223-13/+479
| |\ \ | | |/ | |/|
| | * Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-18152-2508/+5409
| | |\
| | * | 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 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-0736-510/+1219
| | |\ \
| | * | | 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
| | * | | update with newer coding styleHubert Chathi2019-09-042-3/+3
| | * | | make black happyHubert Chathi2019-09-043-93/+79
| | * | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-043-84/+152
| | * | | implement device signature uploading/fetchingHubert Chathi2019-09-043-0/+338
* | | | | 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-221-0/+13
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2019-10-2219-198/+631
|\| | | |
| * | | | Remove Auth.check method (#6217)Richard van der Hoff2019-10-182-21/+5
| | |_|/ | |/| |
| * | | Merge branch 'uhoreg/e2e_cross-signing_merged' into developHubert Chathi2019-10-1812-21/+623
| |\ \ \
| | * \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-18149-2344/+5400
| | |\ \ \
| | * | | | 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-0736-510/+1219
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | * | | add user signature stream change cache to slaved device storeHubert Chathi2019-09-041-0/+3
| | * | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0496-1261/+1463
| | |\ \ \
| | * \ \ \ Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-2898-1378/+3636
| | |\ \ \ \
| | | * \ \ \ Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-08-2885-1304/+3405
| | | |\ \ \ \
| | | * | | | | Cross-signing [1/4] -- hidden devices (#5759)Hubert Chathi2019-08-123-10/+48
| | * | | | | | 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
| | * | | | | | make changes from PR reviewHubert Chathi2019-08-014-49/+75
| | * | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-01187-1954/+2779
| | |\ \ \ \ \ \
| | | * | | | | | 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-30187-1934/+2767
| | | |\ \ \ \ \ \
| | * | | | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-07-303-21/+17
| | |\| | | | | | |
| | | * | | | | | | apply changes from PR reviewHubert Chathi2019-07-303-20/+17
| | * | | | | | | | allow uploading keys for cross-signingHubert Chathi2019-07-2510-12/+558
| | |/ / / / / / /
| | * | | | | | | allow devices to be marked as "hidden"Hubert Chathi2019-07-242-16/+65
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-189-122/+125
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix logging config for the docker image (#6197)Richard van der Hoff2019-10-181-3/+2
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-1829-187/+354
| |\ \ \ \ \ \ \ \
| * | | | | | | | | rip out some unreachable codeRichard van der Hoff2019-10-174-153/+0
* | | | | | | | | | 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-21261-4324/+4500
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'master' into developBrendan Abolivier2019-10-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 1.4.1Brendan Abolivier2019-10-181-1/+1
* | | | | | | | | | Merge pull request #6196 from matrix-org/erikj/awaitErik Johnston2019-10-186-114/+113
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Port synapse/rest/client/_base.py to async/awaitErik Johnston2019-10-111-9/+5
| * | | | | | | | | | Add maybe_awaitable and fix __init__ bugsErik Johnston2019-10-112-2/+34
| * | | | | | | | | | Port synaps/rest/client/users.py to async/awaitErik Johnston2019-10-111-11/+7
| * | | | | | | | | | Port synaps/rest/client/server_notice_servlet.py to async/awaitErik Johnston2019-10-111-6/+3
| * | | | | | | | | | Port synaps/rest/client/media.py to async/awaitErik Johnston2019-10-111-16/+11
| * | | | | | | | | | Port rest/admin/__init__.py to async/awaitErik Johnston2019-10-111-72/+55
* | | | | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212)Erik Johnston2019-10-181-4/+9
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge tag 'v1.4.1rc1' into developRichard van der Hoff2019-10-171-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | 1.4.1rc1 v1.4.1rc1Richard van der Hoff2019-10-171-1/+1
| * | | | | | | | | Do the update as a background indexErik Johnston2019-10-172-9/+51
| * | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnetsErik Johnston2019-10-172-4/+28
* | | | | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageHubert Chathi2019-10-112-12/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | expand on commentHubert Chathi2019-10-111-1/+2
| * | | | | | | | | | make sure we actually return somethingHubert Chathi2019-10-102-2/+9
| * | | | | | | | | | make storage layer in charge of interpreting the device key dataHubert Chathi2019-10-102-13/+9
* | | | | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-112-3/+3
|\ \ \ \ \ \ \ \ \ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-06 19:46:12 +0000