summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* allow uploading signatures of master key signed by devicesHubert Chathi2019-09-044-85/+378
* implement device signature uploading/fetchingHubert Chathi2019-09-043-0/+338
* 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
|\
| * Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-044-64/+10
| * Cleanup event auth type initialisation (#5975)Andrew Morgan2019-09-042-5/+6
| * Fix and refactor room and user stats (#5971)Erik Johnston2019-09-0411-641/+1642
| * code cleanupsAndrew Morgan2019-09-031-7/+2
| * Ensure the list media admin API is always available (#5966)Travis Ralston2019-09-032-2/+6
| * Fix docstringAndrew Morgan2019-09-031-2/+1
| * Remove unnecessary variable declarationAndrew Morgan2019-09-031-1/+0
| * Docker packaging should not su-exec or chmod if already running as UID/GID (#...Michael Kaye2019-09-032-35/+50
| * Ensure an auth instance is available to ListMediaInRoom (#5967)Travis Ralston2019-09-032-0/+2
| * fix typoMatthew Hodgson2019-09-031-1/+1
| * Remove double return statements (#5962)Andrew Morgan2019-09-0315-20/+1
| * Opentrace device lists (#5853)Jorik Schellekens2019-09-038-58/+118
| * Remove unused methods from c/s api v1 in register.py (#5963)Andrew Morgan2019-09-023-137/+2
| * fix thumbnail storage location (#5915)L0ric02019-09-022-1/+2
| * Update INSTALL.md to say that Python 2 is no longer supported (#5953)Aaron Raimist2019-09-022-2/+3
| * Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-302-7/+1
| * Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3081-286/+287
| * Move buildkite config to the pipelines repo (#5943)Amber Brown2019-08-313-310/+16
| * Add m.id_access_token flag (#5930)Andrew Morgan2019-08-302-1/+7
| * Removed unused jenkins/ folder and script (#5938)Amber Brown2019-08-302-16/+1
| * Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)Andrew Morgan2019-08-304-166/+9
| * Fix buildkite pipeline plugin matrix-org/annotate using the wrong variable co...Amber Brown2019-08-301-3/+3
| * Fix coverage in sytest and use plugins for buildkite (#5922)Amber Brown2019-08-298-32/+92
* | 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
| |\|
| | * Add a link to python's logging config schema (#5926)Jorik Schellekens2019-08-283-2/+5
| | * Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consentWill Hunt2019-08-285-2/+9
| | |\
| | | * Removing entry for 5903Will Hunt2019-08-281-1/+0
| | | * Apply suggestions from code reviewWill Hunt2019-08-231-2/+2
| | | * Update changelogHalf-Shot2019-08-231-1/+1
| | | * Exempt bot usersHalf-Shot2019-08-231-1/+1
| | | * Merge branch 'hs/bot-user-type' into hs/exempt-support-users-from-consentHalf-Shot2019-08-232-1/+3
| | | |\
| | | | * Add changelogHalf-Shot2019-08-231-0/+1
| | | | * Add bot typeHalf-Shot2019-08-231-1/+2
| | | * | Fix registration testHalf-Shot2019-08-231-0/+1
| | | * | newsfile 5902Half-Shot2019-08-231-0/+1
| | | * | Ignore consent for support usersHalf-Shot2019-08-231-0/+1
| | | * | Return user_type in get_user_by_idHalf-Shot2019-08-231-1/+4
| | | |/
| | * | Let synctl use a config directory. (#5904)Jorik Schellekens2019-08-283-6/+15
| | * | Use the v2 lookup API for 3PID invites (#5897)Andrew Morgan2019-08-284-9/+166
| | * | Config templating (#5900)Jorik Schellekens2019-08-289-46/+366
| | * | Implement a structured logging output system. (#5680)Amber Brown2019-08-2831-82/+1328
| | * | Fix a cache-invalidation bug for worker-based deployments (#5920)Richard van der Hoff2019-08-282-8/+17
| | * | Merge pull request #5914 from matrix-org/rei/admin_getadminreivilibre2019-08-285-9/+62
| | |\ \
| | | * | Document GET method for retrieving admin bit of user in admin APIOlivier Wilkinson (reivilibre)2019-08-271-0/+19
| | | * | Add GET method to admin API /users/@user:dom/adminOlivier Wilkinson (reivilibre)2019-08-274-9/+43
| | * | | Typographical corrections in docker/README (#5921)Victor Goff2019-08-281-5/+5
| | * | | Merge pull request #5859 from matrix-org/rei/msc2197reivilibre2019-08-284-16/+96
| | |\ \ \
| | | * | | Newsfile on one lineOlivier Wilkinson (reivilibre)2019-08-201-2/+1
| | | * | | Use MSC2197 on stable prefix as it has almost finished FCPOlivier Wilkinson (reivilibre)2019-08-202-26/+4
| | | * | | NewsfileOlivier Wilkinson (reivilibre)2019-08-151-0/+2
| | | * | | Add support for inbound MSC2197 requests on unstable Federation APIOlivier Wilkinson (reivilibre)2019-08-151-1/+59
| | | * | | Support MSC2197 outbound with unstable prefixOlivier Wilkinson (reivilibre)2019-08-152-16/+59
| | * | | | Merge pull request #5864 from matrix-org/erikj/reliable_lookupsErik Johnston2019-08-277-215/+283
| | |\ \ \ \
| | | * | | | Fix off by one error in SRV result shufflingErik Johnston2019-08-271-8/+13
| | | * | | | Fixup commentsErik Johnston2019-08-231-1/+9
| | | * | | | Fix logcontextsErik Johnston2019-08-231-4/+8
| | | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reliable_l...Erik Johnston2019-08-2247-284/+850
| | | |\ \ \ \
| | | * | | | | Make changelog entry be a featureErik Johnston2019-08-201-0/+0
| | | * | | | | Remove now unused pick_server_from_listErik Johnston2019-08-201-30/+0
| | | * | | | | Fixup _sort_server_list to be slightly more efficientErik Johnston2019-08-201-2/+11
| | | * | | | | Remove test debugsErik Johnston2019-08-203-3/+0
| | | * | | | | NewsfileErik Johnston2019-08-151-0/+1
| | | * | | | | Refactor MatrixFederationAgent to retry SRV.Erik Johnston2019-08-154-194/+268
| | * | | | | | Allow schema deltas to be engine-specific (#5911)reivilibre2019-08-272-5/+20
| | |\ \ \ \ \ \
| | | * | | | | | Code style (Black)Olivier Wilkinson (reivilibre)2019-08-271-3/+1
| | | * | | | | | NewsfileOlivier Wilkinson (reivilibre)2019-08-271-0/+1
| | | * | | | | | Allow schema deltas to be engine-specificOlivier Wilkinson (reivilibre)2019-08-271-5/+21
| | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limitRichard van der Hoff2019-08-272-1/+2
| | |\ \ \ \ \ \
| | | * | | | | | Increase max display name limitNeil Johnson2019-08-242-1/+2
| | | |/ / / / /
| | * | | | | | Merge pull request #5895 from matrix-org/erikj/notary_keyErik Johnston2019-08-275-26/+56
| | |\ \ \ \ \ \
| | | * | | | | | Don't implicitly include server signing keyErik Johnston2019-08-231-7/+6
| | | * | | | | | Fixup review commentsErik Johnston2019-08-233-6/+6
| | | * | | | | | NewsfileErik Johnston2019-08-211-0/+1
| | | * | | | | | Only sign when we respond to remote key requestsErik Johnston2019-08-212-23/+16
| | | * | | | | | Add config option for keys to use to sign keysErik Johnston2019-08-213-9/+46
| | * | | | | | | Update 5909.miscRichard van der Hoff2019-08-271-1/+1
| | * | | | | | | Merge pull request #5909 from aaronraimist/public_base_urlRichard van der Hoff2019-08-273-2/+3
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Add changelogAaron Raimist2019-08-261-0/+1
| | | * | | | | | public_base_url is actually public_baseurlAaron Raimist2019-08-262-2/+2
| | | | |/ / / / | | | |/| | | |
| | * / | | | | Add Admin API capability to set adminship of a user (#5878)reivilibre2019-08-276-0/+132
| | |/ / / / /
| | * | | | | Propagate opentracing contexts through EDUs (#5852)Jorik Schellekens2019-08-229-94/+234
| | * | | | | Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_regis...Richard van der Hoff2019-08-222-53/+5
| | |\ \ \ \ \
| | | * | | | | Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-222-53/+5
| | * | | | | | Opentracing across workers (#5771)Jorik Schellekens2019-08-225-83/+123
| | * | | | | | Revert "Do not send consent notices if "no-consent-required" is set"Brendan Abolivier2019-08-221-4/+0
| | * | | | | | Revert "Add "require_consent" parameter for registration"Brendan Abolivier2019-08-223-18/+3
| | * | | | | | Do not send consent notices if "no-consent-required" is setHalf-Shot2019-08-221-0/+4
| | * | | | | | Add "require_consent" parameter for registrationHalf-Shot2019-08-223-3/+18
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_failErik Johnston2019-08-224-72/+164
| | |\ \ \ \ \
| | | * | | | | Change jitter to be a factor rather than absolute valueErik Johnston2019-08-202-13/+14
| | | * | | | | Fixup changelog and remove debug loggingErik Johnston2019-08-163-5/+2
| | | * | | | | NewsfileErik Johnston2019-08-151-0/+1
| | | * | | | | Retry well known on fail.Erik Johnston2019-08-153-67/+160
| | * | | | | | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-227-7/+142
| | * | | | | | Add missing index on users_in_public_rooms. (#5894)Richard van der Hoff2019-08-222-0/+18
| | * | | | | | Servlet to purge old rooms (#5845)Richard van der Hoff2019-08-226-0/+232
| | * | | | | | Improve error msg when key-fetch fails (#5896)Richard van der Hoff2019-08-222-5/+8
| | * | | | | | Drop some unused tables. (#5893)Richard van der Hoff2019-08-214-47/+23
| | | |_|/ / / | | |/| | | |
| | * | | | | Refactor the Appservice scheduler code (#5886)Richard van der Hoff2019-08-203-49/+68
| | |\ \ \ \ \
| | | * | | | | Refactor the Appservice scheduler codeRichard van der Hoff2019-08-203-49/+68
| | | | |/ / / | | | |/| | |
| | * | | | | Avoid deep recursion in appservice recovery (#5885)Richard van der Hoff2019-08-202-18/+26
| | * | | | | Opentracing doc update (#5776)Jorik Schellekens2019-08-202-27/+41
| | |/ / / /
| | * | | | Merge pull request #5860 from matrix-org/erikj/update_5704_commentsErik Johnston2019-08-192-17/+6
| | |\ \ \ \
| | | * | | | NewsfileErik Johnston2019-08-161-0/+1
| | | * | | | Remove logging for #5407 and update commentsErik Johnston2019-08-151-17/+5
| | | |/ / /
| | * | | | Merge branch 'master' into developBrendan Abolivier2019-08-176-15/+66
| | |\ \ \ \
| | | * | | | 1.3.1 v1.3.1 github/release-v1.3.1 release-v1.3.1Richard van der Hoff2019-08-175-5/+28
| | | * | | | Drop dependency on sdnotify (#5871)Richard van der Hoff2019-08-173-11/+38
| | | * | | | add attributionRichard van der Hoff2019-08-161-1/+1
| | | * | | | Add changelog entry.Chris Moos2019-08-161-0/+1
| | | * | | | Fix issue with Synapse not starting up. Fixes #5866.Chris Moos2019-08-161-1/+1
| | * | | | | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_indexHubert Chathi2019-08-163-1/+20
| | |\ \ \ \ \
| | | * | | | | fix changelogHubert Chathi2019-08-151-1/+1
| | | * | | | | update set_e2e_room_key to agree with fixed indexHubert Chathi2019-08-141-1/+1
| | | * | | | | add changelogHubert Chathi2019-08-141-0/+1
| | | * | | | | add the version field to the index for e2e_room_keysHubert Chathi2019-08-141-0/+18
| | * | | | | | Opentracing misc (#5856)Jorik Schellekens2019-08-164-16/+25
| | * | | | | | Fix up password reset template config names (#5863)Andrew Morgan2019-08-153-10/+11
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'master' into developBrendan Abolivier2019-08-156-14/+28
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge tag 'v1.3.0'Brendan Abolivier2019-08-15237-2739/+4310
| | | |\ \ \ \
| | | | * | | | 1.3.0 v1.3.0 github/release-v1.3.0 release-v1.3.0Brendan Abolivier2019-08-155-6/+14
| | | | * | | | Remove libsqlite3-dev from required build dependencies. (#5766)Andrew Morgan2019-08-153-5/+4
| | | | * | | | Merge pull request #5851 from matrix-org/rei/roomdir_maybedeferredreivilibre2019-08-152-2/+10
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | | * | | Update changelog.d/5851.bugfix reivilibre2019-08-141-2/+2
| | | | | * | | NewsfileOlivier Wilkinson (reivilibre)2019-08-141-0/+2
| | | | | * | | Wrap `get_local_public_room_list` call in `maybeDeferred` because itOlivier Wilkinson (reivilibre)2019-08-141-2/+8
| | | | |/ / /
| | | * | | | make user creation steps clearerNeil Johnson2019-08-081-5/+4
| | * | | | | Don't create broken room when power_level_content_override.users does not con...Michael Telatynski2019-08-152-1/+14
| | | |_|_|/ | | |/| | |
| | * | | | Merge pull request #5844 from matrix-org/erikj/retry_well_known_lookupErik Johnston2019-08-145-27/+137
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | NewsfileErik Johnston2019-08-131-0/+1
| | | * | | Retry well-known lookup before expiry.Erik Johnston2019-08-134-27/+136
| | * | | | 1.3.0rc1 v1.3.0rc1Brendan Abolivier2019-08-1363-62/+75
| | * | | | Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startupBrendan Abolivier2019-08-132-1/+2
| | |\ \ \ \
| | | * | | | changelogAmber H. Brown2019-08-141-0/+1
| | | * | | | fix config being a dict, actuallyAmber H. Brown2019-08-141-1/+1
| | |/ / / /
| | * | | | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stopErik Johnston2019-08-134-21/+55
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Remove redundant returnErik Johnston2019-08-131-1/+0
| | | * | | Clarify docstringErik Johnston2019-08-131-1/+1
| | | * | | NewsfileErik Johnston2019-08-011-0/+1
| | | * | | Handle pusher being deleted during processing.Erik Johnston2019-08-013-21/+55
| | * | | | Don't load the media repo when configured to use an external media repo (#5754)Amber Brown2019-08-1310-91/+188
| | * | | | Merge pull request #5836 from matrix-org/erikj/lower_bound_ttl_well_knownErik Johnston2019-08-134-171/+222
| | |\ \ \ \
| | | * | | | Make default well known cache global again.Erik Johnston2019-08-131-1/+4
| | | * | | | NewsfileErik Johnston2019-08-121-0/+1
| | | * | | | Move well known lookup into a separate clasErik Johnston2019-08-073-173/+216
| | | * | | | Add a lower bound for TTL on well known results.Erik Johnston2019-08-062-2/+6
| | | | |_|/ | | | |/| |
| | * | | | Merge pull request #5826 from matrix-org/erikj/reduce_event_pausesErik Johnston2019-08-132-128/+143
| | |\ \ \ \
| | | * | | | NewsfileErik Johnston2019-08-061-0/+1
| | | * | | | Don't unnecessarily block notifying of new events.Erik Johnston2019-08-061-128/+142
| | * | | | | Merge pull request #5843 from matrix-org/erikj/workers_hist_visErik Johnston2019-08-122-4/+1
| | |\ \ \ \ \
| | | * | | | | NewsfileErik Johnston2019-08-121-0/+1
| | | * | | | | Whitelist history visbility sytests for worker modeErik Johnston2019-08-121-4/+0
| | * | | | | | Merge pull request #5839 from tcitworld/fix-purge-remote-media-scriptErik Johnston2019-08-122-1/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Changelogs should end in '.' or '!'Erik Johnston2019-08-121-1/+1
| | | * | | | | Fix curl command typo in purge_remote_media.shThomas Citharel2019-08-092-1/+2
| | | | |/ / / | | | |/| | |
| | * | | | | Merge pull request #5788 from matrix-org/rav/metaredactionsRichard van der Hoff2019-08-123-101/+183
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | changelogRichard van der Hoff2019-07-301-0/+1
| | | * | | | Handle loops in redaction eventsRichard van der Hoff2019-07-302-60/+106
| | | * | | | recursively fetch redactionsRichard van der Hoff2019-07-301-32/+36
| | | * | | | split _get_events_from_db out of _enqueue_eventsRichard van der Hoff2019-07-291-32/+51
| | | * | | | Return dicts from _fetch_event_listRichard van der Hoff2019-07-291-15/+27
| * | | | | | Cross-signing [1/4] -- hidden devices (#5759)Hubert Chathi2019-08-124-10/+49
| |/ / / / /
| * | | | | Merge pull request #5825 from matrix-org/erikj/fix_empty_limited_syncErik Johnston2019-08-062-6/+38
| |\ \ \ \ \
| | * | | | | NewsfileErik Johnston2019-08-061-0/+1
| | * | | | | Handle TimelineBatch being limited and empty.Erik Johnston2019-08-061-6/+37
| | | |/ / / | | |/| | |
| * / | | | Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-062-3/+12
| |/ / / /
| * | | | Account validity: allow defining HTML templates to serve the us… (#5807)Brendan Abolivier2019-08-018-11/+119
| |\ \ \ \
| | * | | | LintBrendan Abolivier2019-08-013-17/+10
| | * | | | Sample configBrendan Abolivier2019-08-011-0/+10
| | * | | | ChangelogBrendan Abolivier2019-08-011-0/+1
| | * | | | Add testsBrendan Abolivier2019-08-011-0/+37
| | * | | | Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-015-9/+76
| * | | | | Merge pull request #5810 from matrix-org/erikj/no_server_reachableErik Johnston2019-08-012-4/+4
| |\ \ \ \ \
| | * | | | | NewsfileErik Johnston2019-08-011-0/+1
| | * | | | | Return 502 not 500 when failing to reach any remote server.Erik Johnston2019-08-011-4/+3
| * | | | | | Have ClientReaderSlavedStore inherit RegistrationStore (#5806)Andrew Morgan2019-08-012-21/+22
| * | | | | | Merge pull request #5808 from matrix-org/erikj/parse_decode_errorErik Johnston2019-08-012-1/+7
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | NewsfileErik Johnston2019-08-011-0/+1
| | * | | | | Handle incorrectly encoded query params correctlyErik Johnston2019-08-011-1/+6
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #5805 from matrix-org/erikj/validate_stateErik Johnston2019-08-012-2/+10
| |\ \ \ \ \
| | * | | | | NewsfileErik Johnston2019-07-311-0/+1
| | * | | | | Validate well-known state events are state events.Erik Johnston2019-07-311-2/+9
| * | | | | | Merge pull request #5801 from matrix-org/erikj/recursive_tombstoneErik Johnston2019-08-012-0/+10
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix spelling.Erik Johnston2019-08-012-2/+4
| | |/ / / /
| | * | | | NewsfileErik Johnston2019-07-311-0/+1
| | * | | | Don't allow clients to send tombstones that reference the same roomErik Johnston2019-07-311-0/+7
| * | | | | Merge pull request #5802 from matrix-org/erikj/deny_redacting_different_roomErik Johnston2019-08-012-1/+4
| |\ \ \ \ \
| | * | | | | NewsfileErik Johnston2019-07-311-0/+1
| | * | | | | Deny redaction of events in a different room.Erik Johnston2019-07-311-1/+3
| | |/ / / /
| * | | | | Merge pull request #5790 from matrix-org/erikj/groups_request_errorsErik Johnston2019-08-013-32/+61
| |\ \ \ \ \
| | * | | | | NewsfileErik Johnston2019-07-301-0/+1
| | * | | | | Don't log as exception when failing durig backfillErik Johnston2019-07-301-0/+3
| | * | | | | Correctly handle errors doing requests to group serversErik Johnston2019-07-291-32/+57
| * | | | | | Merge pull request #5804 from matrix-org/erikj/match_against_state_keyErik Johnston2019-08-012-1/+8
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | NewsfileErik Johnston2019-07-311-0/+1
| | * | | | | Explicitly check that tombstone is a state event before notifying.Erik Johnston2019-07-311-1/+7
| |/ / / / /
| * | | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686)Andrew Morgan2019-07-312-1/+3
| * | | | | Remove duplicate return statementAndrew Morgan2019-07-311-1/+0
| * | | | | Merge pull request #5794 from matrix-org/erikj/share_ssl_options_for_well_knownErik Johnston2019-07-314-17/+20
| |\ \ \ \ \
| | * | | | | NewsfileErik Johnston2019-07-311-0/+1
| | * | | | | Share SSL options for well-known requestsErik Johnston2019-07-313-17/+19
| * | | | | | Remove DelayedCall debugging from test runs (#5787)Amber Brown2019-07-312-6/+1
| * | | | | | Merge pull request #5796 from matrix-org/erikj/disable_codecov_reportErik Johnston2019-07-312-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | NewsfileErik Johnston2019-07-311-0/+1
| | * | | | | Disable codecov reports to GH comments.Erik Johnston2019-07-311-2/+1
| |/ / / / /
* | | | | | 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 pull request #5793 from matrix-org/erikj/fix_bg_updateBrendan Abolivier2019-07-303-1/+23
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | NewsfileErik Johnston2019-07-301-0/+1
| | | * | | | Don't recreate columnErik Johnston2019-07-302-1/+22
| | * | | | | Merge pull request #5792 from matrix-org/erikj/fix_bg_updateErik Johnston2019-07-303-1/+2
| | |\| | | |
| | | * | | | NewsfileErik Johnston2019-07-301-0/+1
| | | * | | | Fix current_state_events membership background update.Erik Johnston2019-07-302-1/+1
| | |/ / / /
| | * | | | Merge pull request #5789 from matrix-org/erikj/fix_error_handling_keysErik Johnston2019-07-302-4/+4
| | |\ \ \ \
| | | * | | | NewsfileErik Johnston2019-07-301-0/+1
| | | * | | | Unwrap errorErik Johnston2019-07-301-1/+2
| | | * | | | Fix error handling when fetching remote device keysErik Johnston2019-07-301-3/+1
| | |/ / / /
| | * | | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_stateErik Johnston2019-07-302-1/+37
| | |\ \ \ \
| | | * | | | NewsfileErik Johnston2019-07-231-0/+1
| | | * | | | Add unit test for current state membership bg updateErik Johnston2019-07-231-1/+36
| | * | | | | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-308-37/+9
| | | |_|/ / | | |/| | |
| | * | | | Room Complexity Client Implementation (#5783)Amber Brown2019-07-308-14/+298
| | | |/ / | | |/| |
| | * | | Merge pull request #5774 from matrix-org/erikj/fix_rejected_membershipErik Johnston2019-07-292-0/+7
| | |\ \ \
| | | * | | NewsfileErik Johnston2019-07-261-0/+1
| | | * | | Fix room summary when rejected events are in stateErik Johnston2019-07-261-0/+6
| | * | | | Merge pull request #5752 from matrix-org/erikj/forgotten_userErik Johnston2019-07-293-35/+124
| | |\ \ \ \
| | | * | | | Expand commentErik Johnston2019-07-291-0/+5
| | | * | | | Remove lost commentErik Johnston2019-07-291-7/+0
| | | |/ / /
| | | * | | NewsfileErik Johnston2019-07-241-0/+1
| | | * | | Remove join when calculating room summaries.Erik Johnston2019-07-241-13/+21
| | | * | | Remove join on room_memberships when fetching rooms for user.Erik Johnston2019-07-241-22/+36
| | | * | | Add function to get all forgotten rooms for userErik Johnston2019-07-242-0/+68
| | | |/ /
| | * | | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqliteErik Johnston2019-07-293-4/+6
| | |\ \ \
| | | * | | NewsfileErik Johnston2019-07-291-0/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-14 17:45:50 +0000