summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | 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 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 remote-tracking branch 'origin/develop' into rav/event_auth/1Richard van der Hoff2019-10-1829-187/+354
|\| | | | | | | | |
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | make version optional in body of e2e backup version updateHubert Chathi2019-10-092-3/+3
| | |/ / / / / / / / /
| * | | | | | | | | | Merge pull request #6195 from matrix-org/erikj/opentracing_preview_urlErik Johnston2019-10-112-5/+11
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Trace non-JSON APIs, /media, /key etcErik Johnston2019-10-112-5/+11
| * | | | | | | | | | cas: support setting display name (#6114)Valérian Rousset2019-10-112-1/+6
| |/ / / / / / / / /
| * | | | | | | | | Fix MAU reaping where reserved users are specified. (#6168)Neil Johnson2019-10-112-42/+65
| * | | | | | | | | Merge pull request #6156 from matrix-org/erikj/postgres_anyErik Johnston2019-10-1014-109/+189
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix SQLite take 2Erik Johnston2019-10-101-1/+1
| | * | | | | | | | | Fix SQLiteErik Johnston2019-10-101-1/+1
| | * | | | | | | | | Remove add_in_list_sql_clauseErik Johnston2019-10-104-34/+25
| | * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/postgres_anyErik Johnston2019-10-103-3/+231
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Replace IN usage with helper funcsErik Johnston2019-10-1011-97/+138
| | * | | | | | | | | | Add helper funcs to use postgres ANYErik Johnston2019-10-101-8/+56
| * | | | | | | | | | | Fix store_url_cache using bytesErik Johnston2019-10-101-2/+2
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq...Erik Johnston2019-10-103-3/+231
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq...Erik Johnston2019-10-1088-1620/+2239
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Do the update as a background indexErik Johnston2019-10-092-9/+51
| * | | | | | | | | | | Disable bytes usage with postgresErik Johnston2019-10-083-3/+10
* | | | | | | | | | | | rip out some unreachable codeRichard van der Hoff2019-10-174-153/+0
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_innerErik Johnston2019-10-103-3/+231
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixup commentsErik Johnston2019-10-101-3/+3
| * | | | | | | | | | Fix py3.5Erik Johnston2019-10-101-1/+1
| * | | | | | | | | | Fix py3.5Erik Johnston2019-10-101-1/+1
| * | | | | | | | | | sortErik Johnston2019-10-101-3/+1
| * | | | | | | | | | Appease mypyErik Johnston2019-10-101-13/+18
| * | | | | | | | | | Add comentsErik Johnston2019-10-101-5/+25
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-1039-146/+521
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix packagingErik Johnston2019-10-101-2/+4
| * | | | | | | | | | | Log correct contextErik Johnston2019-10-101-6/+6
| * | | | | | | | | | | Test for sentinel commitErik Johnston2019-10-101-2/+19
| * | | | | | | | | | | Move patch_inline_callbacks into synapse/Erik Johnston2019-10-102-1/+180
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-0962-1041/+1507
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Patch inlinecallbacks for log contextsErik Johnston2019-09-274-6/+13
* | | | | | | | | | | | Add domain validation when creating room with list of invitees (#6121)werner2912019-10-101-1/+3
* | | | | | | | | | | | before fulfilling a group invite,check if user is already joined/invited (#3436)Michael Telatynski2019-10-101-4/+16
* | | | | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-102-22/+31
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Fix races in room stats (and other) updates. (#6187)Richard van der Hoff2019-10-104-23/+60
* | | | | | | | | | | Rewrite the user_filter migration again (#6184)Richard van der Hoff2019-10-101-26/+32
* | | | | | | | | | | Move tag/push rules room upgrade checking ealier (#6155)Andrew Morgan2019-10-101-18/+44
* | | | | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137)Amber Brown2019-10-1033-79/+385
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnetsErik Johnston2019-10-092-4/+28
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix existing hex encoded json values in DBErik Johnston2019-10-081-0/+26
| * | | | | | | | | Fix inserting bytes as textErik Johnston2019-10-081-4/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6178 from matrix-org/babolivier/factor_out_bg_updatesBrendan Abolivier2019-10-099-605/+670
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
| * | | | | | | | | 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)Anshul Angaria2019-10-081-2/+6
* | | | | | | | | | Remove unused public room list timeout param (#6179)Andrew Morgan2019-10-081-12/+1
* | | | | | | | | | Fix /federation/v1/state for recent room versions (#6170)Richard van der Hoff2019-10-081-13/+0
* | | | | | | | | | Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failureErik Johnston2019-10-071-6/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unused variableErik Johnston2019-10-031-2/+0
| * | | | | | | | | | Don't regenerate numeric user ID if registration fails.Erik Johnston2019-10-031-4/+4
* | | | | | | | | | | Log responder we are using. (#6139)Michael Kaye2019-10-071-1/+1
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | add some logging to the rooms stats updates, to try to track down a flaky tes...Richard van der Hoff2019-10-072-0/+4
* | | | | | | | | | Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_indexBrendan Abolivier2019-10-071-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix unique_user_filter_index schema updateBrendan Abolivier2019-10-071-2/+2
* | | | | | | | | | | Merge pull request #6159 from matrix-org/erikj/cache_membershipsErik Johnston2019-10-071-19/+45
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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-034-19/+43
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
| * | | | | | | | | | | 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-revokedBrendan Abolivier2019-10-041-2/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | TypoBrendan Abolivier2019-10-041-1/+1
| * | | | | | | | | | | LintBrendan Abolivier2019-10-041-3/+1
| * | | | | | | | | | | Incorporate reviewBrendan Abolivier2019-10-041-14/+8
| * | | | | | | | | | | Add test caseBrendan Abolivier2019-10-031-1/+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)Alexander Maznev2019-10-041-0/+46
* | | | | | | | | | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142)Robert Swain2019-10-041-3/+11
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | add some metrics on the federation sender (#6160)Richard van der Hoff2019-10-034-19/+43
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'master' into developAndrew Morgan2019-10-032-3/+5
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | 1.4.0 v1.4.0 github/release-v1.4.0 release-v1.4.0Andrew Morgan2019-10-031-1/+1
| * | | | | | | | | Replace client_secret with <redacted> in server logs (#6158)Andrew Morgan2019-10-031-2/+4
| * | | | | | | | | 1.4.0rc2 v1.4.0rc2Andrew Morgan2019-10-021-1/+1
* | | | | | | | | | Merge pull request #6154 from matrix-org/erikj/fix_appservice_paginationErik Johnston2019-10-021-18/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix appservice room list paginationErik Johnston2019-10-021-18/+18
* | | | | | | | | | | Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatableErik Johnston2019-10-021-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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_generatedErik Johnston2019-10-021-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Bound find_next_generated_user_id DB query.Erik Johnston2019-10-021-1/+3
* | | | | | | | | | | Fix public room list pagination.Erik Johnston2019-10-022-27/+59
* | | | | | | | | | | Land improved room list based on room stats (#6019)Erik Johnston2019-10-025-311/+272
* | | | | | | | | | | Fix up some typechecking (#6150)Amber Brown2019-10-0220-40/+102
* | | | | | | | | | | Fix yields and copy instead of move push rules on room upgrade (#6144)Andrew Morgan2019-10-022-12/+8
|/ / / / / / / / / /
* | / / / / / / / / Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into developErik Johnston2019-10-026-19/+143
|\| | | | | | | | | | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timingsErik Johnston2019-10-022-1/+19
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix errors storing large retry intervals.Erik Johnston2019-10-022-1/+19
| * | | | | | | | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactionsErik Johnston2019-10-021-0/+14
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix fetching censored redactions from DBErik Johnston2019-10-021-0/+14
| * | | | | | | | | 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 branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/s...Erik Johnston2019-10-014-8/+55
|\| | | | | | | |
| * | | | | | | | Fix `devices_last_seen` background update.Erik Johnston2019-09-303-7/+54
| * | | | | | | | Fix 'redaction_retention_period' sampel config to match guidelinesErik Johnston2019-09-261-1/+1
* | | | | | | | | Drop unused tables (#6115)Richard van der Hoff2019-09-301-0/+20
* | | | | | | | | Edit SimpleHttpClient to reference that header keys can be passed as str or b...Andrew Morgan2019-09-271-6/+6
* | | | | | | | | 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
* | | | | | | | | LintBrendan Abolivier2019-09-271-3/+1
* | | | | | | | | 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 Morgan2019-09-272-364/+359
* | | | | | | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-spanErik Johnston2019-09-272-1/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | isortErik Johnston2019-09-251-1/+1
| * | | | | | | | Add device and appservice tagsErik Johnston2019-09-251-0/+3
| * | | | | | | | 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
* | | | | | | | | Kill off half-implemented password-reset via sms (#6101)Richard van der Hoff2019-09-261-64/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Explicitly log when a homeserver does not have a trusted key server configure...Neil Johnson2019-09-262-12/+52
* | | | | | | | bump versionRichard van der Hoff2019-09-261-1/+1
* | | | | | | | Fix dummy event insertion consent bug (#6053)Neil Johnson2019-09-262-30/+87
* | | | | | | | 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-2519-404/+1106
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #6089 from matrix-org/erikj/cleanup_user_ipsErik Johnston2019-09-252-49/+99
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us...Erik Johnston2019-09-2518-400/+1104
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Use if `is not None`Erik Johnston2019-09-251-1/+1
| * | | | | | | | | | Enable cleaning up extremities with dummy events by default to prevent undue ...Neil Johnson2019-09-251-3/+1
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Threepid validity checks on msisdns should not be dependent on 'threepid_beha...Neil Johnson2019-09-251-29/+34
| * | | | | | | | | Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-253-4/+65
| * | | | | | | | | Refactor the user-interactive auth handling (#6105)Richard van der Hoff2019-09-253-131/+248
| * | | | | | | | | Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-251-62/+62
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #6092 from matrix-org/babolivier/background_update_deactiv...Brendan Abolivier2019-09-242-6/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Incorporate reviewBrendan Abolivier2019-09-241-3/+3
| | * | | | | | | | Fix loggingBrendan Abolivier2019-09-241-1/+1
| | * | | | | | | | TypoBrendan Abolivier2019-09-231-1/+1
| | * | | | | | | | Fix the return value in the users_set_deactivated_flag background jobBrendan Abolivier2019-09-231-4/+4
| * | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-244-8/+72
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | remove unused parameter to get_user_id_by_threepid (#6099)Richard van der Hoff2019-09-241-1/+1
| | * | | | | | | | | Merge pull request #6069 from matrix-org/rav/fix_attribute_mappingRichard van der Hoff2019-09-242-7/+61
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | docstrings and commentsRichard van der Hoff2019-09-241-7/+21
| | | * | | | | | | | | Merge branch 'develop' into rav/fix_attribute_mappingRichard van der Hoff2019-09-19181-2622/+6021
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix a bug with saml attribute maps.Richard van der Hoff2019-09-192-7/+47
| | * | | | | | | | | | | Add sid to next_link for email validation (#6097)J. Ryan Stinnett2019-09-241-0/+10
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-2420-196/+674
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Add submit_url response parameter to msisdn /requestToken (#6079)Andrew Morgan2019-09-232-1/+13
| | * | | | | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044)Andrew Morgan2019-09-231-0/+2
| | * | | | | | | | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanupRichard van der Hoff2019-09-231-51/+62
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into rav/saml_config_cleanupRichard van der Hoff2019-09-19181-2622/+6021
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | * | | | | | | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000)Andrew Morgan2019-09-233-4/+24
| | * | | | | | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974)Andrew Morgan2019-09-231-0/+3
| | * | | | | | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972)Andrew Morgan2019-09-231-1/+13
| | * | | | | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2019-09-232-2/+79
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Implement MSC2290 (#6043)Andrew Morgan2019-09-235-125/+202
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | | Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-19181-2622/+6021
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | / / / / / / / / / | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | better loggingRichard van der Hoff2019-09-191-0/+2
| * | | | | | | | | | | | Record mappings from saml users in an external tableRichard van der Hoff2019-09-135-10/+250
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Make the sample saml config closer to our standardsRichard van der Hoff2019-09-131-51/+62
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Review commentsErik Johnston2019-09-253-6/+3
* | | | | | | | | | | Prune rows in user_ips older than configured periodErik Johnston2019-09-242-8/+67
* | | | | | | | | | | Add has_completed_background_updateErik Johnston2019-09-241-1/+24
* | | | | | | | | | | Add wrap_as_background_process decorator.Erik Johnston2019-09-241-1/+28
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Query devices table for last seen info.Erik Johnston2019-09-231-49/+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
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Disable /register/available if registration is disabled (#6082)Andrew Morgan2019-09-231-0/+5
* | | | | | | | | Generalize email sending logging (#6075)Andrew Morgan2019-09-231-1/+1
* | | | | | | | | Return timeout error to user for identity server calls (#6073)Andrew Morgan2019-09-232-11/+37
* | | | | | | | | Merge pull request #6072 from matrix-org/rav/fix_retry_resetRichard van der Hoff2019-09-231-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix exception when resetting retry timingsRichard van der Hoff2019-09-201-1/+1
* | | | | | | | | | fix broken copyrightsMatthew Hodgson2019-09-232-2/+2
* | | | | | | | | | Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-2010-72/+346
* | | | | | | | | | Remove trailing slash ability from password reset's submit_token endpoint (#6...Andrew Morgan2019-09-201-1/+1
|/ / / / / / / / /
* | | | | | | | | Ensure email validation link parameters are URL-encoded (#6063)Andrew Morgan2019-09-201-4/+6
* | | | | | | | | Drop support for bind param on POST /account/3pid (MSC2290) (#6067)Andrew Morgan2019-09-201-4/+0
* | | | | | | | | Use unstable prefix for 3PID unbind API (#6062)J. Ryan Stinnett2019-09-191-1/+1
* | | | | | | | | Undo the deletion of some tables (#6047)Richard van der Hoff2019-09-191-20/+0
* | | | | | | | | Remove POST method from password reset submit_token endpoint (#6056)Andrew Morgan2019-09-191-17/+0
* | | | | | | | | Fix typo in account_threepid_delegates config (#6028)Jorik Schellekens2019-09-181-1/+1
* | | | | | | | | Fix logcontext spam on non-Linux platforms (#6059)J. Ryan Stinnett2019-09-181-2/+11
| |/ / / / / / / |/| | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-15 06:00:56 +0000