Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | move get_e2e_cross_signing_key to EndToEndKeyWorkerStore so it works with wor... | Hubert Chathi | 2019-10-23 | 1 | -67/+67 |
* | black | Hubert Chathi | 2019-10-22 | 1 | -1/+2 |
* | vendor-prefix the EDU name until MSC1756 is merged into the spec | Hubert Chathi | 2019-10-22 | 2 | -2/+4 |
* | update to work with newer code, and fix formatting | Hubert Chathi | 2019-10-22 | 3 | -6/+7 |
* | add missing param | Hubert Chathi | 2019-10-22 | 1 | -1/+1 |
* | make black happy | Hubert Chathi | 2019-10-22 | 2 | -27/+39 |
* | don't crash if the user doesn't have cross-signing keys | Hubert Chathi | 2019-10-22 | 1 | -14/+25 |
* | implement federation parts of cross-signing | Hubert Chathi | 2019-10-22 | 4 | -10/+179 |
* | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2 | Hubert Chathi | 2019-10-22 | 3 | -13/+479 |
|\ | |||||
| * | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-10-18 | 152 | -2508/+5409 |
| |\ | |||||
| * | | fix doc strings | Hubert Chathi | 2019-10-18 | 1 | -9/+13 |
| * | | make isort happy | Hubert Chathi | 2019-09-24 | 1 | -1/+0 |
| * | | add some comments | Hubert Chathi | 2019-09-24 | 1 | -2/+10 |
| * | | drop some logger lines to debug | Hubert Chathi | 2019-09-24 | 1 | -3/+3 |
| * | | make changes based on PR feedback | Hubert Chathi | 2019-09-24 | 2 | -118/+165 |
| * | | add function docs | Hubert Chathi | 2019-09-07 | 1 | -2/+24 |
| * | | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-09-07 | 36 | -510/+1219 |
| |\ \ | |||||
| * | | | run black | Hubert Chathi | 2019-09-06 | 1 | -24/+10 |
| * | | | split out signature processing into separate functions | Hubert Chathi | 2019-09-06 | 1 | -195/+204 |
| * | | | avoid modifying input parameter | Hubert Chathi | 2019-09-05 | 1 | -7/+7 |
| * | | | update with newer coding style | Hubert Chathi | 2019-09-04 | 2 | -3/+3 |
| * | | | make black happy | Hubert Chathi | 2019-09-04 | 3 | -93/+79 |
| * | | | allow uploading signatures of master key signed by devices | Hubert Chathi | 2019-09-04 | 3 | -84/+152 |
| * | | | implement device signature uploading/fetching | Hubert Chathi | 2019-09-04 | 3 | -0/+338 |
* | | | | Remove Auth.check method (#6217) | Richard van der Hoff | 2019-10-18 | 2 | -21/+5 |
| |_|/ |/| | | |||||
* | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into develop | Hubert Chathi | 2019-10-18 | 12 | -21/+623 |
|\ \ \ | |||||
| * \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 149 | -2344/+5400 |
| |\ \ \ | |||||
| * | | | | use the right function for when we're already in runInteraction | Hubert Chathi | 2019-10-18 | 1 | -4/+4 |
| * | | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-09-07 | 36 | -510/+1219 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| * | | | add user signature stream change cache to slaved device store | Hubert Chathi | 2019-09-04 | 1 | -0/+3 |
| * | | | Merge branch 'develop' into cross-signing_keys | Hubert Chathi | 2019-09-04 | 96 | -1261/+1463 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 98 | -1378/+3636 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-08-28 | 85 | -1304/+3405 |
| | |\ \ \ \ | |||||
| | * | | | | | Cross-signing [1/4] -- hidden devices (#5759) | Hubert Chathi | 2019-08-12 | 3 | -10/+48 |
| * | | | | | | black | Hubert Chathi | 2019-08-28 | 1 | -3/+1 |
| * | | | | | | use stream ID generator instead of timestamp | Hubert Chathi | 2019-08-28 | 4 | -23/+23 |
| * | | | | | | make isort happy | Hubert Chathi | 2019-08-21 | 1 | -1/+0 |
| * | | | | | | apply PR review suggestions | Hubert Chathi | 2019-08-21 | 4 | -53/+46 |
| * | | | | | | make changes from PR review | Hubert Chathi | 2019-08-01 | 4 | -49/+75 |
| * | | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-08-01 | 187 | -1954/+2779 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | don't need to return the hidden column any more | Hubert Chathi | 2019-08-01 | 1 | -1/+1 |
| | * | | | | | | really fix queries to work with Postgres | Hubert Chathi | 2019-07-31 | 1 | -19/+11 |
| | * | | | | | | PostgreSQL, Y U no like? | Hubert Chathi | 2019-07-31 | 1 | -3/+4 |
| | * | | | | | | remove extra SQL query param | Hubert Chathi | 2019-07-31 | 1 | -1/+0 |
| | * | | | | | | Merge branch 'develop' into cross-signing_hidden | Hubert Chathi | 2019-07-30 | 187 | -1934/+2767 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-07-30 | 3 | -21/+17 |
| |\| | | | | | | | |||||
| | * | | | | | | | apply changes from PR review | Hubert Chathi | 2019-07-30 | 3 | -20/+17 |
| * | | | | | | | | allow uploading keys for cross-signing | Hubert Chathi | 2019-07-25 | 10 | -12/+558 |
| |/ / / / / / / | |||||
| * | | | | | | | allow devices to be marked as "hidden" | Hubert Chathi | 2019-07-24 | 2 | -16/+65 |
* | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 9 | -122/+125 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix logging config for the docker image (#6197) | Richard van der Hoff | 2019-10-18 | 1 | -3/+2 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'master' into develop | Brendan Abolivier | 2019-10-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | 1.4.1 | Brendan Abolivier | 2019-10-18 | 1 | -1/+1 |
| * | | | | | | | | Merge pull request #6196 from matrix-org/erikj/await | Erik Johnston | 2019-10-18 | 6 | -114/+113 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Port synapse/rest/client/_base.py to async/await | Erik Johnston | 2019-10-11 | 1 | -9/+5 |
| | * | | | | | | | | Add maybe_awaitable and fix __init__ bugs | Erik Johnston | 2019-10-11 | 2 | -2/+34 |
| | * | | | | | | | | Port synaps/rest/client/users.py to async/await | Erik Johnston | 2019-10-11 | 1 | -11/+7 |
| | * | | | | | | | | Port synaps/rest/client/server_notice_servlet.py to async/await | Erik Johnston | 2019-10-11 | 1 | -6/+3 |
| | * | | | | | | | | Port synaps/rest/client/media.py to async/await | Erik Johnston | 2019-10-11 | 1 | -16/+11 |
| | * | | | | | | | | Port rest/admin/__init__.py to async/await | Erik Johnston | 2019-10-11 | 1 | -72/+55 |
| * | | | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212) | Erik Johnston | 2019-10-18 | 1 | -4/+9 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 29 | -187/+354 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge tag 'v1.4.1rc1' into develop | Richard van der Hoff | 2019-10-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | 1.4.1rc1 v1.4.1rc1 | Richard van der Hoff | 2019-10-17 | 1 | -1/+1 |
| | * | | | | | | | | Do the update as a background index | Erik Johnston | 2019-10-17 | 2 | -9/+51 |
| | * | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets | Erik Johnston | 2019-10-17 | 2 | -4/+28 |
| * | | | | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage | Hubert Chathi | 2019-10-11 | 2 | -12/+16 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | expand on comment | Hubert Chathi | 2019-10-11 | 1 | -1/+2 |
| | * | | | | | | | | | make sure we actually return something | Hubert Chathi | 2019-10-10 | 2 | -2/+9 |
| | * | | | | | | | | | make storage layer in charge of interpreting the device key data | Hubert Chathi | 2019-10-10 | 2 | -13/+9 |
| * | | | | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version | Hubert Chathi | 2019-10-11 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | make version optional in body of e2e backup version update | Hubert Chathi | 2019-10-09 | 2 | -3/+3 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #6195 from matrix-org/erikj/opentracing_preview_url | Erik Johnston | 2019-10-11 | 2 | -5/+11 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Trace non-JSON APIs, /media, /key etc | Erik Johnston | 2019-10-11 | 2 | -5/+11 |
| * | | | | | | | | | | cas: support setting display name (#6114) | Valérian Rousset | 2019-10-11 | 2 | -1/+6 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Fix MAU reaping where reserved users are specified. (#6168) | Neil Johnson | 2019-10-11 | 2 | -42/+65 |
| * | | | | | | | | | Merge pull request #6156 from matrix-org/erikj/postgres_any | Erik Johnston | 2019-10-10 | 14 | -109/+189 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix SQLite take 2 | Erik Johnston | 2019-10-10 | 1 | -1/+1 |
| | * | | | | | | | | | Fix SQLite | Erik Johnston | 2019-10-10 | 1 | -1/+1 |
| | * | | | | | | | | | Remove add_in_list_sql_clause | Erik Johnston | 2019-10-10 | 4 | -34/+25 |
| | * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/postgres_any | Erik Johnston | 2019-10-10 | 3 | -3/+231 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Replace IN usage with helper funcs | Erik Johnston | 2019-10-10 | 11 | -97/+138 |
| | * | | | | | | | | | | Add helper funcs to use postgres ANY | Erik Johnston | 2019-10-10 | 1 | -8/+56 |
| * | | | | | | | | | | | Fix store_url_cache using bytes | Erik Johnston | 2019-10-10 | 1 | -2/+2 |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq... | Erik Johnston | 2019-10-10 | 3 | -3/+231 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq... | Erik Johnston | 2019-10-10 | 88 | -1620/+2239 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Do the update as a background index | Erik Johnston | 2019-10-09 | 2 | -9/+51 |
| * | | | | | | | | | | | Disable bytes usage with postgres | Erik Johnston | 2019-10-08 | 3 | -3/+10 |
* | | | | | | | | | | | | rip out some unreachable code | Richard van der Hoff | 2019-10-17 | 4 | -153/+0 |
| |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_inner | Erik Johnston | 2019-10-10 | 3 | -3/+231 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fixup comments | Erik Johnston | 2019-10-10 | 1 | -3/+3 |
| * | | | | | | | | | | Fix py3.5 | Erik Johnston | 2019-10-10 | 1 | -1/+1 |
| * | | | | | | | | | | Fix py3.5 | Erik Johnston | 2019-10-10 | 1 | -1/+1 |
| * | | | | | | | | | | sort | Erik Johnston | 2019-10-10 | 1 | -3/+1 |
| * | | | | | | | | | | Appease mypy | Erik Johnston | 2019-10-10 | 1 | -13/+18 |
| * | | | | | | | | | | Add coments | Erik Johnston | 2019-10-10 | 1 | -5/+25 |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner | Erik Johnston | 2019-10-10 | 39 | -146/+521 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix packaging | Erik Johnston | 2019-10-10 | 1 | -2/+4 |
| * | | | | | | | | | | | Log correct context | Erik Johnston | 2019-10-10 | 1 | -6/+6 |
| * | | | | | | | | | | | Test for sentinel commit | Erik Johnston | 2019-10-10 | 1 | -2/+19 |
| * | | | | | | | | | | | Move patch_inline_callbacks into synapse/ | Erik Johnston | 2019-10-10 | 2 | -1/+180 |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner | Erik Johnston | 2019-10-09 | 62 | -1041/+1507 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Patch inlinecallbacks for log contexts | Erik Johnston | 2019-09-27 | 4 | -6/+13 |
* | | | | | | | | | | | | Add domain validation when creating room with list of invitees (#6121) | werner291 | 2019-10-10 | 1 | -1/+3 |
* | | | | | | | | | | | | before fulfilling a group invite,check if user is already joined/invited (#3436) | Michael Telatynski | 2019-10-10 | 1 | -4/+16 |
* | | | | | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380) | krombel | 2019-10-10 | 2 | -22/+31 |
| |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Fix races in room stats (and other) updates. (#6187) | Richard van der Hoff | 2019-10-10 | 4 | -23/+60 |
* | | | | | | | | | | | Rewrite the user_filter migration again (#6184) | Richard van der Hoff | 2019-10-10 | 1 | -26/+32 |
* | | | | | | | | | | | Move tag/push rules room upgrade checking ealier (#6155) | Andrew Morgan | 2019-10-10 | 1 | -18/+44 |
* | | | | | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137) | Amber Brown | 2019-10-10 | 33 | -79/+385 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets | Erik Johnston | 2019-10-09 | 2 | -4/+28 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Fix existing hex encoded json values in DB | Erik Johnston | 2019-10-08 | 1 | -0/+26 |
| * | | | | | | | | | Fix inserting bytes as text | Erik Johnston | 2019-10-08 | 1 | -4/+2 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #6178 from matrix-org/babolivier/factor_out_bg_updates | Brendan Abolivier | 2019-10-09 | 9 | -605/+670 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix RegistrationStore | Brendan Abolivier | 2019-10-08 | 1 | -1/+1 |
| * | | | | | | | | | Cleanup client_ips | Brendan Abolivier | 2019-10-08 | 1 | -7/+0 |
| * | | | | | | | | | Don't end up with 4 classes in registration | Brendan Abolivier | 2019-10-08 | 1 | -52/+50 |
| * | | | | | | | | | Lint | Brendan Abolivier | 2019-10-07 | 3 | -3/+3 |
| * | | | | | | | | | Move roommember's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -108/+114 |
| * | | | | | | | | | Move user_directory's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -84/+94 |
| * | | | | | | | | | Move state's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -190/+204 |
| * | | | | | | | | | Move search's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -25/+31 |
| * | | | | | | | | | Move registration's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -95/+103 |
| * | | | | | | | | | Move media_repository's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -3/+9 |
| * | | | | | | | | | Move devices's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -22/+27 |
| * | | | | | | | | | Move deviceinbox's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -15/+22 |
| * | | | | | | | | | Move client_ips's bg updates to a dedicated store | Brendan Abolivier | 2019-10-07 | 1 | -94/+106 |
* | | | | | | | | | | add M_TOO_LARGE error code for uploading a too large file (#6151) | Anshul Angaria | 2019-10-08 | 1 | -2/+6 |
* | | | | | | | | | | Remove unused public room list timeout param (#6179) | Andrew Morgan | 2019-10-08 | 1 | -12/+1 |
* | | | | | | | | | | Fix /federation/v1/state for recent room versions (#6170) | Richard van der Hoff | 2019-10-08 | 1 | -13/+0 |
* | | | | | | | | | | Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failure | Erik Johnston | 2019-10-07 | 1 | -6/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Remove unused variable | Erik Johnston | 2019-10-03 | 1 | -2/+0 |
| * | | | | | | | | | | Don't regenerate numeric user ID if registration fails. | Erik Johnston | 2019-10-03 | 1 | -4/+4 |
* | | | | | | | | | | | Log responder we are using. (#6139) | Michael Kaye | 2019-10-07 | 1 | -1/+1 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | add some logging to the rooms stats updates, to try to track down a flaky tes... | Richard van der Hoff | 2019-10-07 | 2 | -0/+4 |
* | | | | | | | | | | Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_index | Brendan Abolivier | 2019-10-07 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix unique_user_filter_index schema update | Brendan Abolivier | 2019-10-07 | 1 | -2/+2 |
* | | | | | | | | | | | Merge pull request #6159 from matrix-org/erikj/cache_memberships | Erik Johnston | 2019-10-07 | 1 | -19/+45 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix bug where we didn't pull out event ID | Erik Johnston | 2019-10-07 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cache_memb... | Erik Johnston | 2019-10-03 | 4 | -19/+43 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Use the right error.... | Erik Johnston | 2019-10-03 | 1 | -1/+1 |
| * | | | | | | | | | | | pep8 | Erik Johnston | 2019-10-03 | 1 | -1/+0 |
| * | | | | | | | | | | | Fixup names and comments | Erik Johnston | 2019-10-03 | 1 | -6/+7 |
| * | | | | | | | | | | | cachedList descriptor doesn't like typing | Erik Johnston | 2019-10-03 | 1 | -2/+2 |
| * | | | | | | | | | | | Cache room membership lookups in _get_joined_users_from_context | Erik Johnston | 2019-10-03 | 1 | -19/+45 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #6147 from matrix-org/babolivier/3pid-invite-revoked | Brendan Abolivier | 2019-10-04 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Typo | Brendan Abolivier | 2019-10-04 | 1 | -1/+1 |
| * | | | | | | | | | | | Lint | Brendan Abolivier | 2019-10-04 | 1 | -3/+1 |
| * | | | | | | | | | | | Incorporate review | Brendan Abolivier | 2019-10-04 | 1 | -14/+8 |
| * | | | | | | | | | | | Add test case | Brendan Abolivier | 2019-10-03 | 1 | -1/+1 |
| * | | | | | | | | | | | Lint | Brendan Abolivier | 2019-10-02 | 1 | -1/+3 |
| * | | | | | | | | | | | Don't 500 code when trying to exchange a revoked 3PID invite | Brendan Abolivier | 2019-10-02 | 1 | -2/+13 |
* | | | | | | | | | | | | Update `user_filters` table to have a unique index, and non-null columns (#1172) | Alexander Maznev | 2019-10-04 | 1 | -0/+46 |
* | | | | | | | | | | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142) | Robert Swain | 2019-10-04 | 1 | -3/+11 |
| |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | add some metrics on the federation sender (#6160) | Richard van der Hoff | 2019-10-03 | 4 | -19/+43 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into develop | Andrew Morgan | 2019-10-03 | 2 | -3/+5 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | 1.4.0 v1.4.0 github/release-v1.4.0 release-v1.4.0 | Andrew Morgan | 2019-10-03 | 1 | -1/+1 |
| * | | | | | | | | | Replace client_secret with <redacted> in server logs (#6158) | Andrew Morgan | 2019-10-03 | 1 | -2/+4 |
| * | | | | | | | | | 1.4.0rc2 v1.4.0rc2 | Andrew Morgan | 2019-10-02 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #6154 from matrix-org/erikj/fix_appservice_pagination | Erik Johnston | 2019-10-02 | 1 | -18/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix appservice room list pagination | Erik Johnston | 2019-10-02 | 1 | -18/+18 |
* | | | | | | | | | | | Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatable | Erik Johnston | 2019-10-02 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix not showing non-federatable rooms to remote room list queries | Erik Johnston | 2019-10-02 | 1 | -0/+3 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge pull request #6148 from matrix-org/erikj/find_next_generated | Erik Johnston | 2019-10-02 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Bound find_next_generated_user_id DB query. | Erik Johnston | 2019-10-02 | 1 | -1/+3 |
* | | | | | | | | | | | Fix public room list pagination. | Erik Johnston | 2019-10-02 | 2 | -27/+59 |
* | | | | | | | | | | | Land improved room list based on room stats (#6019) | Erik Johnston | 2019-10-02 | 5 | -311/+272 |
* | | | | | | | | | | | Fix up some typechecking (#6150) | Amber Brown | 2019-10-02 | 20 | -40/+102 |
* | | | | | | | | | | | Fix yields and copy instead of move push rules on room upgrade (#6144) | Andrew Morgan | 2019-10-02 | 2 | -12/+8 |
|/ / / / / / / / / / | |||||
* | / / / / / / / / | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-02 | 6 | -19/+143 |
|\| | | | | | | | | | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings | Erik Johnston | 2019-10-02 | 2 | -1/+19 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix errors storing large retry intervals. | Erik Johnston | 2019-10-02 | 2 | -1/+19 |
| * | | | | | | | | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactions | Erik Johnston | 2019-10-02 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Fix fetching censored redactions from DB | Erik Johnston | 2019-10-02 | 1 | -0/+14 |
| * | | | | | | | | | Use `received_ts` to find uncensored redacted events | Erik Johnston | 2019-10-01 | 1 | -14/+7 |
| * | | | | | | | | | Add received_ts column to redactions. | Erik Johnston | 2019-10-01 | 3 | -9/+92 |
| * | | | | | | | | | Don't repeatedly attempt to censor events we don't have. | Erik Johnston | 2019-10-01 | 1 | -1/+17 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/s... | Erik Johnston | 2019-10-01 | 4 | -8/+55 |
|\| | | | | | | | | |||||
| * | | | | | | | | Fix `devices_last_seen` background update. | Erik Johnston | 2019-09-30 | 3 | -7/+54 |
| * | | | | | | | | Fix 'redaction_retention_period' sampel config to match guidelines | Erik Johnston | 2019-09-26 | 1 | -1/+1 |
* | | | | | | | | | Drop unused tables (#6115) | Richard van der Hoff | 2019-09-30 | 1 | -0/+20 |
* | | | | | | | | | Edit SimpleHttpClient to reference that header keys can be passed as str or b... | Andrew Morgan | 2019-09-27 | 1 | -6/+6 |
* | | | | | | | | | Incorporate review | Brendan Abolivier | 2019-09-27 | 1 | -4/+2 |
* | | | | | | | | | Update synapse/handlers/deactivate_account.py | Brendan Abolivier | 2019-09-27 | 1 | -1/+3 |
* | | | | | | | | | Update synapse/handlers/deactivate_account.py | Brendan Abolivier | 2019-09-27 | 1 | -1/+1 |
* | | | | | | | | | Lint | Brendan Abolivier | 2019-09-27 | 1 | -3/+1 |
* | | | | | | | | | Fixup and add some logging | Brendan Abolivier | 2019-09-27 | 1 | -1/+9 |
* | | | | | | | | | Reject pending invites on deactivation | Brendan Abolivier | 2019-09-27 | 1 | -0/+31 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978) | Andrew Morgan | 2019-09-27 | 2 | -364/+359 |
* | | | | | | | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-span | Erik Johnston | 2019-09-27 | 2 | -1/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | isort | Erik Johnston | 2019-09-25 | 1 | -1/+1 |
| * | | | | | | | | Add device and appservice tags | Erik Johnston | 2019-09-25 | 1 | -0/+3 |
| * | | | | | | | | Add tags for event_id and txn_id in event sending | Erik Johnston | 2019-09-25 | 1 | -0/+18 |
| * | | | | | | | | Don't create new span for get_user_by_req | Erik Johnston | 2019-09-25 | 1 | -1/+0 |
* | | | | | | | | | Kill off half-implemented password-reset via sms (#6101) | Richard van der Hoff | 2019-09-26 | 1 | -64/+1 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Explicitly log when a homeserver does not have a trusted key server configure... | Neil Johnson | 2019-09-26 | 2 | -12/+52 |
* | | | | | | | | bump version | Richard van der Hoff | 2019-09-26 | 1 | -1/+1 |
* | | | | | | | | Fix dummy event insertion consent bug (#6053) | Neil Johnson | 2019-09-26 | 2 | -30/+87 |
* | | | | | | | | Update comments and docstring | Richard van der Hoff | 2019-09-25 | 1 | -4/+6 |
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us... | Erik Johnston | 2019-09-25 | 19 | -404/+1106 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge pull request #6089 from matrix-org/erikj/cleanup_user_ips | Erik Johnston | 2019-09-25 | 2 | -49/+99 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_us... | Erik Johnston | 2019-09-25 | 18 | -400/+1104 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Use if `is not None` | Erik Johnston | 2019-09-25 | 1 | -1/+1 |
| * | | | | | | | | | | Enable cleaning up extremities with dummy events by default to prevent undue ... | Neil Johnson | 2019-09-25 | 1 | -3/+1 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Threepid validity checks on msisdns should not be dependent on 'threepid_beha... | Neil Johnson | 2019-09-25 | 1 | -29/+34 |
| * | | | | | | | | | Stop advertising unsupported flows for registration (#6107) | Richard van der Hoff | 2019-09-25 | 3 | -4/+65 |
| * | | | | | | | | | Refactor the user-interactive auth handling (#6105) | Richard van der Hoff | 2019-09-25 | 3 | -131/+248 |
| * | | | | | | | | | Refactor code for calculating registration flows (#6106) | Richard van der Hoff | 2019-09-25 | 1 | -62/+62 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #6092 from matrix-org/babolivier/background_update_deactiv... | Brendan Abolivier | 2019-09-24 | 2 | -6/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Incorporate review | Brendan Abolivier | 2019-09-24 | 1 | -3/+3 |
| | * | | | | | | | | Fix logging | Brendan Abolivier | 2019-09-24 | 1 | -1/+1 |
| | * | | | | | | | | Typo | Brendan Abolivier | 2019-09-23 | 1 | -1/+1 |
| | * | | | | | | | | Fix the return value in the users_set_deactivated_flag background job | Brendan Abolivier | 2019-09-23 | 1 | -4/+4 |
| * | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 4 | -8/+72 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | remove unused parameter to get_user_id_by_threepid (#6099) | Richard van der Hoff | 2019-09-24 | 1 | -1/+1 |
| | * | | | | | | | | | Merge pull request #6069 from matrix-org/rav/fix_attribute_mapping | Richard van der Hoff | 2019-09-24 | 2 | -7/+61 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | docstrings and comments | Richard van der Hoff | 2019-09-24 | 1 | -7/+21 |
| | | * | | | | | | | | | Merge branch 'develop' into rav/fix_attribute_mapping | Richard van der Hoff | 2019-09-19 | 181 | -2622/+6021 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Fix a bug with saml attribute maps. | Richard van der Hoff | 2019-09-19 | 2 | -7/+47 |
| | * | | | | | | | | | | | Add sid to next_link for email validation (#6097) | J. Ryan Stinnett | 2019-09-24 | 1 | -0/+10 |
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 20 | -196/+674 |
| |\| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add submit_url response parameter to msisdn /requestToken (#6079) | Andrew Morgan | 2019-09-23 | 2 | -1/+13 |
| | * | | | | | | | | | | | Add an unstable feature flag for separate add/bind 3pid APIs (#6044) | Andrew Morgan | 2019-09-23 | 1 | -0/+2 |
| | * | | | | | | | | | | | Merge pull request #6064 from matrix-org/rav/saml_config_cleanup | Richard van der Hoff | 2019-09-23 | 1 | -51/+62 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into rav/saml_config_cleanup | Richard van der Hoff | 2019-09-19 | 181 | -2622/+6021 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000) | Andrew Morgan | 2019-09-23 | 3 | -4/+24 |
| | * | | | | | | | | | | | | Add m.id_access_token to /versions unstable_features (MSC2264) (#5974) | Andrew Morgan | 2019-09-23 | 1 | -0/+3 |
| | * | | | | | | | | | | | | Add m.require_identity_server to /versions unstable_flags (#5972) | Andrew Morgan | 2019-09-23 | 1 | -1/+13 |
| | * | | | | | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078) | Andrew Morgan | 2019-09-23 | 2 | -2/+79 |
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Implement MSC2290 (#6043) | Andrew Morgan | 2019-09-23 | 5 | -125/+202 |
| * | | | | | | | | | | | | Merge commit '33757bad1' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-20 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | More better logging | Richard van der Hoff | 2019-09-20 | 1 | -1/+2 |
| * | | | | | | | | | | | | | Merge branch 'develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-19 | 181 | -2622/+6021 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | / / / / / / / / / | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | better logging | Richard van der Hoff | 2019-09-19 | 1 | -0/+2 |
| * | | | | | | | | | | | | Record mappings from saml users in an external table | Richard van der Hoff | 2019-09-13 | 5 | -10/+250 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Make the sample saml config closer to our standards | Richard van der Hoff | 2019-09-13 | 1 | -51/+62 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Review comments | Erik Johnston | 2019-09-25 | 3 | -6/+3 |
* | | | | | | | | | | | Prune rows in user_ips older than configured period | Erik Johnston | 2019-09-24 | 2 | -8/+67 |
* | | | | | | | | | | | Add has_completed_background_update | Erik Johnston | 2019-09-24 | 1 | -1/+24 |
* | | | | | | | | | | | Add wrap_as_background_process decorator. | Erik Johnston | 2019-09-24 | 1 | -1/+28 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Query devices table for last seen info. | Erik Johnston | 2019-09-23 | 1 | -49/+8 |
* | | | | | | | | | | Add BG update to populate devices last seen info | Erik Johnston | 2019-09-23 | 2 | -0/+55 |
* | | | | | | | | | | Add last seen info to devices table. | Erik Johnston | 2019-09-23 | 2 | -0/+36 |
| |_|/ / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Disable /register/available if registration is disabled (#6082) | Andrew Morgan | 2019-09-23 | 1 | -0/+5 |
* | | | | | | | | | Generalize email sending logging (#6075) | Andrew Morgan | 2019-09-23 | 1 | -1/+1 |
* | | | | | | | | | Return timeout error to user for identity server calls (#6073) | Andrew Morgan | 2019-09-23 | 2 | -11/+37 |
* | | | | | | | | | Merge pull request #6072 from matrix-org/rav/fix_retry_reset | Richard van der Hoff | 2019-09-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix exception when resetting retry timings | Richard van der Hoff | 2019-09-20 | 1 | -1/+1 |
* | | | | | | | | | | fix broken copyrights | Matthew Hodgson | 2019-09-23 | 2 | -2/+2 |
* | | | | | | | | | | Allow HS to send emails when adding an email to the HS (#6042) | Andrew Morgan | 2019-09-20 | 10 | -72/+346 |