summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6196 from matrix-org/erikj/awaitErik Johnston2019-10-187-114/+114
|\
| * 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
| * NewsfileErik Johnston2019-10-111-0/+1
| * 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
* | Add missing BOOLEAN_COLUMNs to synapse_port_db (#6216)Bart Noordervliet2019-10-182-0/+3
* | Fix presence timeouts when synchrotron restarts. (#6212)Erik Johnston2019-10-184-5/+50
* | Remove dead changelog fileRichard van der Hoff2019-10-171-1/+0
* | Fix up changelogsRichard van der Hoff2019-10-171-0/+1
* | Merge tag 'v1.4.1rc1' into developRichard van der Hoff2019-10-172-1/+9
|\ \
| * | 1.4.1rc1 v1.4.1rc1Richard van der Hoff2019-10-173-2/+9
| * | 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-173-4/+29
* | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storageHubert Chathi2019-10-114-18/+23
|\ \ \
| * | | expand on commentHubert Chathi2019-10-111-1/+2
| * | | make sure we actually return somethingHubert Chathi2019-10-102-2/+9
| * | | add changelogHubert Chathi2019-10-101-0/+1
| * | | make storage layer in charge of interpreting the device key dataHubert Chathi2019-10-103-19/+15
* | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-114-19/+35
|\ \ \ \
| * | | | change test name to be uniqueHubert Chathi2019-10-101-1/+1
| * | | | add changelogHubert Chathi2019-10-091-0/+1
| * | | | make version optional in body of e2e backup version updateHubert Chathi2019-10-093-19/+34
| |/ / /
* | | | Merge pull request #6195 from matrix-org/erikj/opentracing_preview_urlErik Johnston2019-10-113-5/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | NewsfileErik Johnston2019-10-111-0/+1
| * | | Trace non-JSON APIs, /media, /key etcErik Johnston2019-10-112-5/+11
* | | | cas: support setting display name (#6114)Valérian Rousset2019-10-114-1/+8
|/ / /
* | | Fix MAU reaping where reserved users are specified. (#6168)Neil Johnson2019-10-114-51/+115
* | | Merge pull request #6156 from matrix-org/erikj/postgres_anyErik Johnston2019-10-1015-109/+190
|\ \ \
| * | | 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-108-102/+236
| |\ \ \
| * | | | NewsfileErik Johnston2019-10-101-0/+1
| * | | | Replace IN usage with helper funcsErik Johnston2019-10-1011-97/+138
| * | | | Add helper funcs to use postgres ANYErik Johnston2019-10-101-8/+56
* | | | | Merge pull request #6186 from matrix-org/erikj/disable_sql_bytesErik Johnston2019-10-108-15/+65
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix postgres unit testsErik Johnston2019-10-101-1/+1
| * | | | 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-108-102/+236
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #6191 from matrix-org/rav/fix_packagingErik Johnston2019-10-102-3/+2
|\ \ \ \ \
| * | | | | Fix python packagingRichard van der Hoff2019-10-102-3/+2
|/ / / / /
* | | | | Merge pull request #6127 from matrix-org/erikj/patch_innerErik Johnston2019-10-106-99/+234
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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-1048-163/+556
| |\ \ \ \
| * | | | | NewsfileErik Johnston2019-10-101-0/+1
| * | | | | 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-103-4/+4
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_innerErik Johnston2019-10-0999-1106/+1795
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | UpdateErik Johnston2019-09-271-8/+15
| * | | | | Patch inlinecallbacks for log contextsErik Johnston2019-09-275-10/+95
| | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq...Erik Johnston2019-10-10135-1692/+2474
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Add domain validation when creating room with list of invitees (#6121)werner2912019-10-103-1/+13
* | | | | | before fulfilling a group invite,check if user is already joined/invited (#3436)Michael Telatynski2019-10-102-4/+17
* | | | | | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-104-23/+33
* | | | | | Add snapcraft packaging information (#6084)James2019-10-103-0/+24
| |_|/ / / |/| | | |
* | | | | Fix races in room stats (and other) updates. (#6187)Richard van der Hoff2019-10-107-25/+63
* | | | | Rewrite the user_filter migration again (#6184)Richard van der Hoff2019-10-102-26/+33
* | | | | Move tag/push rules room upgrade checking ealier (#6155)Andrew Morgan2019-10-102-18/+45
* | | | | Refactor HomeserverConfig so it can be typechecked (#6137)Amber Brown2019-10-1037-94/+415
| |/ / / |/| | |
* | | | 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
* | | | | 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)Anshul Angaria2019-10-082-2/+7
* | | | | | Remove unused public room list timeout param (#6179)Andrew Morgan2019-10-082-12/+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_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)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...Richard van der Hoff2019-10-073-0/+5
* | | | | | 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_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-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)Alexander Maznev2019-10-042-0/+47
* | | | | | | | 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)Richard van der Hoff2019-10-035-19/+44
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'master' into developAndrew Morgan2019-10-039-8/+38
|\ \ \ \ \ \
* \ \ \ \ \ \ 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_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_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_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)Erik Johnston2019-10-027-350/+273
* | | | | | | | | 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 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
|\ \ \ \ \ \ \ \
* | | | | | | | | 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 Morgan2019-09-272-6/+7
* | | | | | | | | 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 Morgan2019-09-273-364/+360
* | | | | | | | 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
* | | | | | | | | Kill off half-implemented password-reset via sms (#6101)Richard van der Hoff2019-09-262-64/+2
| | | | | | | * | NewsfileErik Johnston2019-10-091-0/+1
| | | | | | | * | Do the update as a background indexErik Johnston2019-10-092-9/+51
| | | | | | | * | Disable bytes usage with postgresErik Johnston2019-10-083-3/+10
| | | | | | |/ /
| | | | | | * | 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 tag 'v1.4.0'Andrew Morgan2019-10-03303-5895/+13375
| | | | |/| | | | | | | |/
| | | | | * 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 Morgan2019-10-032-2/+5
| | | | | * 1.4.0rc2 v1.4.0rc2Andrew Morgan2019-10-027-6/+19
| | | | |/ | | | |/|
| | | * | 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_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_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_queryErik Johnston2019-10-014-7/+55
| | | |\ \ | | | |/ / | | |/| |
| | * | | NewsfileErik Johnston2019-09-301-0/+1
| | * | | Fix `devices_last_seen` background update.Erik Johnston2019-09-303-7/+54
| | |/ /
| | * | 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
| |/ / |/| |
* | | 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...Neil Johnson2019-09-264-16/+63
* | | 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 versionRichard van der Hoff2019-09-261-1/+1
|/ / /
* | | Fix dummy event insertion consent bug (#6053)Neil Johnson2019-09-265-39/+266
* | | 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
| |\ \ \ | |/ / / |/| | |
* | | | 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
* | | | | | 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)Richard van der Hoff2019-09-255-16/+83
* | | | | Refactor the user-interactive auth handling (#6105)Richard van der Hoff2019-09-255-141/+265
* | | | | 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...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_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
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | 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_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)J. Ryan Stinnett2019-09-242-0/+11
| | | * | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-2451-231/+840
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
* | | | | | | | 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 Morgan2019-09-232-0/+3
* | | | | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanupRichard van der Hoff2019-09-233-102/+122
|\ \ \ \ \ \ \ \
* | | | | | | | | 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 Morgan2019-09-232-0/+4
* | | | | | | | | 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 Morgan2019-09-233-2/+80
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Implement MSC2290 (#6043)Andrew Morgan2019-09-237-134/+203
| | | | * | | | 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_config_cleanupRichard van der Hoff2019-09-19363-5354/+10634
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Add changelogRichard 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
| | |_|/ / / / | |/| | | | |
| * | | | | | Make the sample saml config closer to our standardsRichard van der Hoff2019-09-132-102/+121
| | |/ / / / | |/| | | |
| | | | * | 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
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-25 02:51:01 +0000