summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137)Amber Brown2019-10-1037-94/+415
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnetsAndrew Morgan2020-02-263-4/+29
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnetsErik Johnston2019-10-093-4/+29
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Update changelog.d/6185.bugfixErik Johnston2019-10-091-1/+1
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fix existing hex encoded json values in DBErik Johnston2019-10-081-0/+26
| | * | | | | | | | | | NewsfileErik Johnston2019-10-081-0/+1
| | * | | | | | | | | | Fix inserting bytes as textErik Johnston2019-10-081-4/+2
| | | |_|/ / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Merge pull request #6178 from matrix-org/babolivier/factor_out_bg_updatesAndrew Morgan2020-02-2610-605/+671
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #6178 from matrix-org/babolivier/factor_out_bg_updatesBrendan Abolivier2019-10-0910-605/+671
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix RegistrationStoreBrendan Abolivier2019-10-081-1/+1
| | * | | | | | | | | | Cleanup client_ipsBrendan Abolivier2019-10-081-7/+0
| | * | | | | | | | | | Don't end up with 4 classes in registrationBrendan Abolivier2019-10-081-52/+50
| | * | | | | | | | | | ChangelogBrendan Abolivier2019-10-071-0/+1
| | * | | | | | | | | | LintBrendan Abolivier2019-10-073-3/+3
| | * | | | | | | | | | Move roommember's bg updates to a dedicated storeBrendan Abolivier2019-10-071-108/+114
| | * | | | | | | | | | Move user_directory's bg updates to a dedicated storeBrendan Abolivier2019-10-071-84/+94
| | * | | | | | | | | | Move state's bg updates to a dedicated storeBrendan Abolivier2019-10-071-190/+204
| | * | | | | | | | | | Move search's bg updates to a dedicated storeBrendan Abolivier2019-10-071-25/+31
| | * | | | | | | | | | Move registration's bg updates to a dedicated storeBrendan Abolivier2019-10-071-95/+103
| | * | | | | | | | | | Move media_repository's bg updates to a dedicated storeBrendan Abolivier2019-10-071-3/+9
| | * | | | | | | | | | Move devices's bg updates to a dedicated storeBrendan Abolivier2019-10-071-22/+27
| | * | | | | | | | | | Move deviceinbox's bg updates to a dedicated storeBrendan Abolivier2019-10-071-15/+22
| | * | | | | | | | | | Move client_ips's bg updates to a dedicated storeBrendan Abolivier2019-10-071-94/+106
* | | | | | | | | | | | add M_TOO_LARGE error code for uploading a too large file (#6151)Andrew Morgan2020-02-262-2/+7
|\| | | | | | | | | | |
| * | | | | | | | | | | add M_TOO_LARGE error code for uploading a too large file (#6151)Anshul Angaria2019-10-082-2/+7
* | | | | | | | | | | | Remove unused public room list timeout param (#6179)Andrew Morgan2020-02-262-12/+2
|\| | | | | | | | | | |
| * | | | | | | | | | | Remove unused public room list timeout param (#6179)Andrew Morgan2019-10-082-12/+2
* | | | | | | | | | | | Fix /federation/v1/state for recent room versions (#6170)Andrew Morgan2020-02-263-14/+2
|\| | | | | | | | | | |
| * | | | | | | | | | | Fix /federation/v1/state for recent room versions (#6170)Richard van der Hoff2019-10-082-13/+1
| * | | | | | | | | | | fix changelogRichard van der Hoff2019-10-071-1/+1
* | | | | | | | | | | | Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failureAndrew Morgan2020-02-262-6/+5
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failureErik Johnston2019-10-072-6/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixup newsfileErik Johnston2019-10-032-1/+1
| | * | | | | | | | | | | Remove unused variableErik Johnston2019-10-031-2/+0
| | * | | | | | | | | | | NewsfileErik Johnston2019-10-031-0/+1
| | * | | | | | | | | | | Don't regenerate numeric user ID if registration fails.Erik Johnston2019-10-031-4/+4
* | | | | | | | | | | | | Log responder we are using. (#6139)Andrew Morgan2020-02-264-2/+3
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Log responder we are using. (#6139)Michael Kaye2019-10-072-1/+2
| | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fix changelog for PR #6175Brendan Abolivier2019-10-072-1/+1
* | | | | | | | | | | | add some logging to the rooms stats updates, to try to track down a flaky tes...Andrew Morgan2020-02-263-0/+5
|\| | | | | | | | | | |
| * | | | | | | | | | | add some logging to the rooms stats updates, to try to track down a flaky tes...Richard van der Hoff2019-10-073-0/+5
* | | | | | | | | | | | Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_indexAndrew Morgan2020-02-262-2/+3
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_indexBrendan Abolivier2019-10-072-2/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | ChangelogBrendan Abolivier2019-10-071-0/+1
| | * | | | | | | | | | | Fix unique_user_filter_index schema updateBrendan Abolivier2019-10-071-2/+2
* | | | | | | | | | | | | Merge pull request #6159 from matrix-org/erikj/cache_membershipsAndrew Morgan2020-02-262-19/+46
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #6159 from matrix-org/erikj/cache_membershipsErik Johnston2019-10-072-19/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Fix bug where we didn't pull out event IDErik Johnston2019-10-071-1/+1
| | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cache_memb...Erik Johnston2019-10-035-19/+44
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Use the right error....Erik Johnston2019-10-031-1/+1
| | * | | | | | | | | | | | pep8Erik Johnston2019-10-031-1/+0
| | * | | | | | | | | | | | Fixup names and commentsErik Johnston2019-10-031-6/+7
| | * | | | | | | | | | | | cachedList descriptor doesn't like typingErik Johnston2019-10-031-2/+2
| | * | | | | | | | | | | | NewsfileErik Johnston2019-10-031-0/+1
| | * | | | | | | | | | | | Cache room membership lookups in _get_joined_users_from_contextErik Johnston2019-10-031-19/+45
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedAndrew Morgan2020-02-261-4/+1
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revokedBrendan Abolivier2019-10-043-2/+89
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | TypoBrendan Abolivier2019-10-041-1/+1
| | * | | | | | | | | | | | LintBrendan Abolivier2019-10-041-3/+1
| | * | | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-10-041-14/+8
| | * | | | | | | | | | | | Lint (again)Brendan Abolivier2019-10-031-3/+1
| | * | | | | | | | | | | | LintBrendan Abolivier2019-10-031-5/+5
| | * | | | | | | | | | | | Add test caseBrendan Abolivier2019-10-032-1/+84
| | * | | | | | | | | | | | ChangelogBrendan Abolivier2019-10-021-0/+1
| | * | | | | | | | | | | | LintBrendan Abolivier2019-10-021-1/+3
| | * | | | | | | | | | | | Don't 500 code when trying to exchange a revoked 3PID inviteBrendan Abolivier2019-10-021-2/+13
* | | | | | | | | | | | | | Update `user_filters` table to have a unique index, and non-null columns (#1172)Andrew Morgan2020-02-262-0/+47
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Update `user_filters` table to have a unique index, and non-null columns (#1172)Alexander Maznev2019-10-042-0/+47
* | | | | | | | | | | | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)Andrew Morgan2020-02-262-3/+12
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)Robert Swain2019-10-042-3/+12
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | add some metrics on the federation sender (#6160)Andrew Morgan2020-02-265-19/+44
|\| | | | | | | | | | | |
| * | | | | | | | | | | | add some metrics on the federation sender (#6160)Richard van der Hoff2019-10-035-19/+44
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into developAndrew Morgan2020-02-260-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into developAndrew Morgan2019-10-039-8/+38
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge tag 'v1.4.0'Andrew Morgan2019-10-03303-5895/+13375
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
* | | | | | | | | | | | 1.4.0Andrew Morgan2020-02-264-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | 1.4.0 v1.4.0 github/release-v1.4.0 release-v1.4.0Andrew Morgan2019-10-034-2/+16
* | | | | | | | | | | | Replace client_secret with <redacted> in server logs (#6158)Andrew Morgan2020-02-262-2/+5
|\| | | | | | | | | | |
| * | | | | | | | | | | Replace client_secret with <redacted> in server logs (#6158)Andrew Morgan2019-10-032-2/+5
* | | | | | | | | | | | Merge pull request #6154 from matrix-org/erikj/fix_appservice_paginationAndrew Morgan2020-02-262-18/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #6154 from matrix-org/erikj/fix_appservice_paginationErik Johnston2019-10-022-18/+19
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | NewsfileErik Johnston2019-10-021-0/+1
| | * | | | | | | | | | | Fix appservice room list paginationErik Johnston2019-10-021-18/+18
* | | | | | | | | | | | | Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatableAndrew Morgan2020-02-262-0/+4
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatableErik Johnston2019-10-022-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_room_l...Erik Johnston2019-10-020-0/+0
| | |\| | | | | | | | | | |
| | * | | | | | | | | | | | NewsfileErik Johnston2019-10-021-0/+1
| | * | | | | | | | | | | | Fix not showing non-federatable rooms to remote room list queriesErik Johnston2019-10-021-0/+3
* | | | | | | | | | | | | | Merge pull request #6148 from matrix-org/erikj/find_next_generatedAndrew Morgan2020-02-262-1/+4
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #6148 from matrix-org/erikj/find_next_generatedErik Johnston2019-10-022-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | NewsfileErik Johnston2019-10-021-0/+1
| | * | | | | | | | | | | | Bound find_next_generated_user_id DB query.Erik Johnston2019-10-021-1/+3
* | | | | | | | | | | | | | Merge pull request #6152 from matrix-org/erikj/fix_room_listAndrew Morgan2020-02-263-27/+60
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #6152 from matrix-org/erikj/fix_room_listErik Johnston2019-10-023-27/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | NewsfileErik Johnston2019-10-021-0/+1
| | * | | | | | | | | | | | Fix public room list pagination.Erik Johnston2019-10-022-27/+59
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'master' into developBrendan Abolivier2019-10-024-9/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Land improved room list based on room stats (#6019)Andrew Morgan2020-02-267-350/+273
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Land improved room list based on room stats (#6019)Erik Johnston2019-10-027-350/+273
* | | | | | | | | | | | | 1.4.0rc2Andrew Morgan2020-02-267-6/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | 1.4.0rc2 v1.4.0rc2Andrew Morgan2019-10-027-6/+19
* | | | | | | | | | | | | Fix up some typechecking (#6150)Andrew Morgan2020-02-2622-40/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Fix up some typechecking (#6150)Amber Brown2019-10-0222-40/+104
* | | | | | | | | | | | | Fix yields and copy instead of move push rules on room upgrade (#6144)Andrew Morgan2020-02-263-12/+9
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Fix yields and copy instead of move push rules on room upgrade (#6144)Andrew Morgan2019-10-023-12/+9
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-0211-19/+193
| |\| | | | | | | | | | | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/s...Erik Johnston2019-10-018-11/+60
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsAndrew Morgan2020-02-264-1/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsErik Johnston2019-10-024-1/+31
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | NewsfileErik Johnston2019-10-021-0/+1
| | * | | | | | | | | | | Fix errors storing large retry intervals.Erik Johnston2019-10-023-1/+30
* | | | | | | | | | | | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactionsAndrew Morgan2020-02-263-0/+51
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactionsErik Johnston2019-10-023-0/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | NewsfileErik Johnston2019-10-021-0/+1
| | * | | | | | | | | | | Fix fetching censored redactions from DBErik Johnston2019-10-022-0/+50
* | | | | | | | | | | | | Merge pull request #6141 from matrix-org/erikj/censor_redactions_fixAndrew Morgan2020-02-264-18/+111
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #6141 from matrix-org/erikj/censor_redactions_fixErik Johnston2019-10-024-18/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | NewsfileErik Johnston2019-10-011-0/+1
| | * | | | | | | | | | | Use `received_ts` to find uncensored redacted eventsErik Johnston2019-10-011-14/+7
| | * | | | | | | | | | | Add received_ts column to redactions.Erik Johnston2019-10-013-9/+92
| | * | | | | | | | | | | Don't repeatedly attempt to censor events we don't have.Erik Johnston2019-10-011-1/+17
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #6135 from matrix-org/erikj/fixup_devices_last_seen_queryAndrew Morgan2020-02-264-7/+55
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #6135 from matrix-org/erikj/fixup_devices_last_seen_queryErik Johnston2019-10-014-7/+55
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | NewsfileErik Johnston2019-09-301-0/+1
| | * | | | | | | | | | Fix `devices_last_seen` background update.Erik Johnston2019-09-303-7/+54
| |/ / / / / / / / / /
* | | | | | | | | | | Drop unused tables (#6115)Andrew Morgan2020-02-262-0/+21
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Drop unused tables (#6115)Richard van der Hoff2019-09-302-0/+21
* | | | | | | | | | | Edit SimpleHttpClient to reference that header keys can be passed as str or b...Andrew Morgan2020-02-262-6/+7
|\| | | | | | | | | |
| * | | | | | | | | | Edit SimpleHttpClient to reference that header keys can be passed as str or b...Andrew Morgan2019-09-272-6/+7
* | | | | | | | | | | Merge pull request #6125 from matrix-org/babolivier/deactivation-inviteAndrew Morgan2020-02-261-17/+3
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #6125 from matrix-org/babolivier/deactivation-inviteBrendan Abolivier2019-09-273-14/+92
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Incorporate reviewBrendan Abolivier2019-09-271-4/+2
| | * | | | | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+3
| | * | | | | | | | | Update synapse/handlers/deactivate_account.pyBrendan Abolivier2019-09-271-1/+1
| | * | | | | | | | | Update changelog.d/6125.featureBrendan Abolivier2019-09-271-1/+1
| | * | | | | | | | | okBrendan Abolivier2019-09-271-1/+3
| | * | | | | | | | | LintBrendan Abolivier2019-09-272-10/+2
| | * | | | | | | | | ChangelogBrendan Abolivier2019-09-271-0/+1
| | * | | | | | | | | Add test to validate the changeBrendan Abolivier2019-09-271-13/+57
| | * | | | | | | | | Fixup and add some loggingBrendan Abolivier2019-09-271-1/+9
| | * | | | | | | | | Reject pending invites on deactivationBrendan Abolivier2019-09-271-0/+31
| |/ / / / / / / / /
* | | | | | | | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2020-02-266-388/+366
|\| | | | | | | | |
| * | | | | | | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978)Andrew Morgan2019-09-273-364/+360
* | | | | | | | | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-spanAndrew Morgan2020-02-253-1/+22
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-spanErik Johnston2019-09-273-1/+22
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | isortErik Johnston2019-09-251-1/+1
| | * | | | | | | | | Add device and appservice tagsErik Johnston2019-09-251-0/+3
| | * | | | | | | | | NewsfileErik Johnston2019-09-251-0/+1
| | * | | | | | | | | Add tags for event_id and txn_id in event sendingErik Johnston2019-09-251-0/+18
| | * | | | | | | | | Don't create new span for get_user_by_reqErik Johnston2019-09-251-1/+0
* | | | | | | | | | | Merge pull request #6117 from matrix-org/erikj/fix_sample_configAndrew Morgan2020-02-254-4/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #6117 from matrix-org/erikj/fix_sample_configErik Johnston2019-09-263-2/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | NewsfileErik Johnston2019-09-261-0/+1
| | * | | | | | | | | | Fix 'redaction_retention_period' sampel config to match guidelinesErik Johnston2019-09-262-2/+2
| |/ / / / / / / / / /
| * | | | | | | | | | s/month/week/ to match configNeil Johnson2019-09-261-1/+1
| * | | | | | | | | | Update CHANGES.mdRichard van der Hoff2019-09-261-1/+1
* | | | | | | | | | | Kill off half-implemented password-reset via sms (#6101)Andrew Morgan2020-02-25134-198/+157
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Kill off half-implemented password-reset via sms (#6101)Richard van der Hoff2019-09-262-64/+2
| |/ / / / / / / / /
| * | | | | | | | | more changelog updates v1.4.0rc1Richard van der Hoff2019-09-261-7/+7
| * | | | | | | | | Changelog formattingRichard van der Hoff2019-09-261-2/+1
| * | | | | | | | | changelogRichard van der Hoff2019-09-26132-132/+156
* | | | | | | | | | Explicitly log when a homeserver does not have a trusted key server configure...Andrew Morgan2020-02-254-16/+63
|\| | | | | | | | |
| * | | | | | | | | Explicitly log when a homeserver does not have a trusted key server configure...Neil Johnson2019-09-264-16/+63
* | | | | | | | | | Merge commit '1b23f991a' into release-v1.4.0Andrew Morgan2020-02-252-42/+152
|\| | | | | | | | |
| * | | | | | | | | Merge commit '1b23f991a' into release-v1.4.0Richard van der Hoff2019-09-262-42/+152
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Clarify upgrade notes ahead of 1.4.0 releaseNeil Johnson2019-09-262-42/+152
* | | | | | | | | | | bump versionAndrew Morgan2020-02-251-1/+1
|\| | | | | | | | | |
| * | | | | | | | | | bump versionRichard van der Hoff2019-09-261-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Fix dummy event insertion consent bug (#6053)Andrew Morgan2020-02-255-39/+266
|\| | | | | | | | |
| * | | | | | | | | Fix dummy event insertion consent bug (#6053)Neil Johnson2019-09-265-39/+266
* | | | | | | | | | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2Andrew Morgan2020-02-257-11/+197
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #6098 from matrix-org/erikj/cleanup_user_ips_2Erik Johnston2019-09-267-11/+197
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update comments and docstringRichard van der Hoff2019-09-251-4/+6
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-2542-495/+1317
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Review commentsErik Johnston2019-09-254-7/+4
| | * | | | | | | | | NewsfileErik Johnston2019-09-241-0/+1
| | * | | | | | | | | Test that pruning of old user IPs worksErik Johnston2019-09-241-0/+71
| | * | | | | | | | | Prune rows in user_ips older than configured periodErik Johnston2019-09-243-8/+73
| | * | | | | | | | | Add has_completed_background_updateErik Johnston2019-09-241-1/+24
| | * | | | | | | | | Add wrap_as_background_process decorator.Erik Johnston2019-09-241-1/+28
* | | | | | | | | | | Merge pull request #6089 from matrix-org/erikj/cleanup_user_ipsAndrew Morgan2020-02-254-50/+179
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #6089 from matrix-org/erikj/cleanup_user_ipsErik Johnston2019-09-254-50/+179
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-2540-491/+1314
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Use if `is not None`Erik Johnston2019-09-251-1/+1
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Test background updateErik Johnston2019-09-231-0/+79
| | * | | | | | | | | | NewsfileErik Johnston2019-09-231-0/+1
| | * | | | | | | | | | Query devices table for last seen info.Erik Johnston2019-09-232-50/+8
| | * | | | | | | | | | Add BG update to populate devices last seen infoErik Johnston2019-09-232-0/+55
| | * | | | | | | | | | Add last seen info to devices table.Erik Johnston2019-09-232-0/+36
* | | | | | | | | | | | Enable cleaning up extremities with dummy events by default to prevent undue ...Andrew Morgan2020-02-254-32/+37
|\| | | | | | | | | | |
| * | | | | | | | | | | Enable cleaning up extremities with dummy events by default to prevent undue ...Neil Johnson2019-09-252-3/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Threepid validity checks on msisdns should not be dependent on 'threepid_beha...Neil Johnson2019-09-252-29/+35
* | | | | | | | | | | Stop advertising unsupported flows for registration (#6107)Andrew Morgan2020-02-255-16/+83
|\| | | | | | | | | |
| * | | | | | | | | | Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-255-16/+83
* | | | | | | | | | | Refactor the user-interactive auth handling (#6105)Andrew Morgan2020-02-255-141/+265
|\| | | | | | | | | |
| * | | | | | | | | | Refactor the user-interactive auth handling (#6105)Richard van der Hoff2019-09-255-141/+265
* | | | | | | | | | | Refactor code for calculating registration flows (#6106)Andrew Morgan2020-02-254-83/+145
|\| | | | | | | | | |
| * | | | | | | | | | Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-254-83/+145
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #6092 from matrix-org/babolivier/background_update_deactiv...Andrew Morgan2020-02-253-6/+7
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #6092 from matrix-org/babolivier/background_update_deactiv...Brendan Abolivier2019-09-243-6/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Incorporate reviewBrendan Abolivier2019-09-241-3/+3
| | * | | | | | | | | Fix loggingBrendan Abolivier2019-09-241-1/+1
| | * | | | | | | | | TypoBrendan Abolivier2019-09-231-1/+1
| | * | | | | | | | | ChangelogBrendan Abolivier2019-09-231-0/+1
| | * | | | | | | | | Fix the return value in the users_set_deactivated_flag background jobBrendan Abolivier2019-09-231-4/+4
* | | | | | | | | | | Merge pull request #6037 from matrix-org/rav/saml_mapping_workAndrew Morgan2020-02-257-10/+280
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #6037 from matrix-org/rav/saml_mapping_workRichard van der Hoff2019-09-247-10/+280
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-247-8/+75
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-2451-231/+840
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge commit '33757bad1' into rav/saml_mapping_workRichard van der Hoff2019-09-201-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | More better loggingRichard van der Hoff2019-09-201-1/+2
| | * | | | | | | | | | | | Update 6037.featureRichard van der Hoff2019-09-191-1/+1
| | * | | | | | | | | | | | Merge branch 'rav/saml_config_cleanup' into rav/saml_mapping_workRichard van der Hoff2019-09-191-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-19363-5354/+10634
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | better loggingRichard van der Hoff2019-09-191-0/+2
| | * | | | | | | | | | | | | changelogRichard van der Hoff2019-09-131-0/+1
| | * | | | | | | | | | | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-136-10/+276
* | | | | | | | | | | | | | | remove unused parameter to get_user_id_by_threepid (#6099)Andrew Morgan2020-02-252-1/+2
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | remove unused parameter to get_user_id_by_threepid (#6099)Richard van der Hoff2019-09-242-1/+2
* | | | | | | | | | | | | | | Merge pull request #6069 from matrix-org/rav/fix_attribute_mappingAndrew Morgan2020-02-253-7/+62
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #6069 from matrix-org/rav/fix_attribute_mappingRichard van der Hoff2019-09-243-7/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | docstrings and commentsRichard van der Hoff2019-09-241-7/+21
| | * | | | | | | | | | | | | | Merge branch 'develop' into rav/fix_attribute_mappingRichard van der Hoff2019-09-19363-5354/+10634
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix a bug with saml attribute maps.Richard van der Hoff2019-09-193-7/+48
* | | | | | | | | | | | | | | | Add sid to next_link for email validation (#6097)Andrew Morgan2020-02-252-0/+11
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add sid to next_link for email validation (#6097)J. Ryan Stinnett2019-09-242-0/+11
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2020-02-254-1/+16
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2019-09-234-1/+16
* | | | | | | | | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044)Andrew Morgan2020-02-252-0/+3
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044)Andrew Morgan2019-09-232-0/+3
* | | | | | | | | | | | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanupAndrew Morgan2020-02-253-102/+122
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanupRichard van der Hoff2019-09-233-102/+122
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'develop' into rav/saml_config_cleanupRichard van der Hoff2019-09-19363-5354/+10634
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Add changelogRichard van der Hoff2019-09-191-0/+1
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Make the sample saml config closer to our standardsRichard van der Hoff2019-09-132-102/+121
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2020-02-258-6/+57
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2019-09-235-4/+28
* | | | | | | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974)Andrew Morgan2020-02-252-0/+4
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974)Andrew Morgan2019-09-232-0/+4
* | | | | | | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972)Andrew Morgan2020-02-252-1/+14
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972)Andrew Morgan2019-09-232-1/+14
* | | | | | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2020-02-253-2/+80
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2019-09-233-2/+80
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Implement MSC2290 (#6043)Andrew Morgan2020-02-257-130/+241
|\| | | | | | | | | | |
| * | | | | | | | | | | Implement MSC2290 (#6043)Andrew Morgan2019-09-237-134/+203
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Disable /register/available if registration is disabled (#6082)Andrew Morgan2020-02-252-0/+6
|\| | | | | | | | | |
| * | | | | | | | | | Disable /register/available if registration is disabled (#6082)Andrew Morgan2019-09-232-0/+6
* | | | | | | | | | | Generalize email sending logging (#6075)Andrew Morgan2020-02-252-1/+2
|\| | | | | | | | | |
| * | | | | | | | | | Generalize email sending logging (#6075)Andrew Morgan2019-09-232-1/+2
* | | | | | | | | | | Return timeout error to user for identity server calls (#6073)Andrew Morgan2020-02-253-11/+38
|\| | | | | | | | | |