Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6295 from matrix-org/erikj/split_purge_history | Andrew Morgan | 2020-03-18 | 1 | -2/+4 |
|\ | |||||
| * | Merge pull request #6295 from matrix-org/erikj/split_purge_history | Erik Johnston | 2019-11-08 | 1 | -2/+4 |
| |\ | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg... | Erik Johnston | 2019-11-04 | 16 | -144/+357 |
| | |\ | |||||
| | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purg... | Erik Johnston | 2019-10-31 | 15 | -69/+95 |
| | |\ \ | |||||
| | * | | | Split purge API into events vs state | Erik Johnston | 2019-10-30 | 1 | -2/+5 |
* | | | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groups | Andrew Morgan | 2020-03-18 | 1 | -0/+9 |
|\| | | | | |||||
| * | | | | Merge pull request #6235 from matrix-org/anoa/room_upgrade_groups | Andrew Morgan | 2019-11-07 | 1 | -0/+9 |
| |\ \ \ \ | |||||
| | * | | | | Re-add docstring, with caveats detailed | Andrew Morgan | 2019-11-04 | 1 | -1/+1 |
| | * | | | | Transfer upgraded rooms on groups | Andrew Morgan | 2019-11-04 | 1 | -0/+9 |
| | | |_|/ | | |/| | | |||||
* | | | | | Make numeric user_id checker start at @0, and don't ratelimit on checking (#6... | Andrew Morgan | 2020-03-18 | 1 | -17/+32 |
|\| | | | | |||||
| * | | | | raise exception after multiple failures | Andrew Morgan | 2019-11-06 | 1 | -3/+10 |
| * | | | | Address review comments | Andrew Morgan | 2019-11-06 | 1 | -12/+12 |
| * | | | | Don't forget to ratelimit calls outside of RegistrationHandler | Andrew Morgan | 2019-11-06 | 1 | -2/+2 |
| * | | | | Numeric ID checker now checks @0, don't ratelimit on checking | Andrew Morgan | 2019-11-06 | 1 | -16/+25 |
* | | | | | Fix bug which caused rejected events to be stored with the wrong room state ... | Andrew Morgan | 2020-03-16 | 1 | -0/+1 |
|\| | | | | |||||
| * | | | | Fix bug which caused rejected events to be stored with the wrong room state ... | Richard van der Hoff | 2019-11-06 | 1 | -0/+1 |
* | | | | | Add some checks that we aren't using state from rejected events (#6330) | Andrew Morgan | 2020-03-16 | 1 | -1/+5 |
|\| | | | | |||||
| * | | | | Add some checks that we aren't using state from rejected events (#6330) | Richard van der Hoff | 2019-11-05 | 1 | -1/+5 |
| |/ / / | |||||
* | | | | Merge pull request #6301 from matrix-org/babolivier/msc2326 | Andrew Morgan | 2020-03-16 | 1 | -19/+19 |
|\| | | | |||||
| * | | | Factor out an _AsyncEventContextImpl (#6298) | Richard van der Hoff | 2019-11-01 | 1 | -19/+19 |
* | | | | Support for routing outbound HTTP requests via a proxy (#6239) | Andrew Morgan | 2020-03-16 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Support for routing outbound HTTP requests via a proxy (#6239) | Richard van der Hoff | 2019-11-01 | 1 | -1/+1 |
* | | | | Remove last usages of deprecated logging.warn method (#6314) | Andrew Morgan | 2020-03-16 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Remove last usages of deprecated logging.warn method (#6314) | Andrew Morgan | 2019-11-01 | 1 | -1/+1 |
* | | | | Depublish a room from the public rooms list when it is upgraded (#6232) | Andrew Morgan | 2020-03-16 | 3 | -29/+90 |
|\| | | | |||||
| * | | | Depublish a room from the public rooms list when it is upgraded (#6232) | Andrew Morgan | 2019-11-01 | 3 | -29/+90 |
* | | | | Merge pull request #5727 from matrix-org/uhoreg/e2e_cross-signing2-part3 | Andrew Morgan | 2020-03-16 | 2 | -10/+140 |
|\| | | | |||||
| * | | | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-31 | 21 | -153/+202 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into cross-signing_federation | Hubert Chathi | 2019-10-30 | 5 | -39/+43 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | black | Hubert Chathi | 2019-10-30 | 1 | -1/+3 |
| * | | | | apply changes as a result of PR review | Hubert Chathi | 2019-10-30 | 1 | -12/+10 |
| * | | | | don't error if federation query doesn't have cross-signing keys | Hubert Chathi | 2019-10-24 | 1 | -7/+9 |
| * | | | | 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 | 1 | -1/+2 |
| * | | | | update to work with newer code, and fix formatting | Hubert Chathi | 2019-10-22 | 2 | -5/+6 |
| * | | | | add missing param | Hubert Chathi | 2019-10-22 | 1 | -1/+1 |
| * | | | | make black happy | Hubert Chathi | 2019-10-22 | 1 | -5/+7 |
| * | | | | implement federation parts of cross-signing | Hubert Chathi | 2019-10-22 | 2 | -3/+126 |
* | | | | | Update black to 19.10b0 (#6304) | Andrew Morgan | 2020-03-16 | 13 | -84/+106 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Update black to 19.10b0 (#6304) | Amber Brown | 2019-11-01 | 13 | -84/+106 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #6294 from matrix-org/erikj/add_state_storage | Andrew Morgan | 2020-03-16 | 10 | -40/+63 |
|\| | | | |||||
| * | | | Merge pull request #6294 from matrix-org/erikj/add_state_storage | Erik Johnston | 2019-10-31 | 10 | -40/+63 |
| |\ \ \ | |||||
| | * | | | Port to use state storage | Erik Johnston | 2019-10-30 | 10 | -40/+63 |
| | | |/ | | |/| | |||||
* | | | | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2020-03-16 | 9 | -29/+33 |
|\| | | | |||||
| * | | | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2019-10-31 | 9 | -29/+33 |
| |/ / | |||||
* | | | Merge pull request #6240 from matrix-org/erikj/split_out_persistence_store | Andrew Morgan | 2020-03-16 | 2 | -2/+4 |
|\| | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_... | Erik Johnston | 2019-10-30 | 4 | -37/+39 |
| |\ \ | |||||
| * | | | Use new EventPersistenceStore | Erik Johnston | 2019-10-23 | 2 | -2/+4 |
| | |/ | |/| | |||||
* | | | Fix log line that was printing undefined value (#6278) | Andrew Morgan | 2020-03-16 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix log line that was printing undefined value (#6278) | Andrew Morgan | 2019-10-30 | 1 | -1/+1 |
* | | | Merge pull request #6280 from matrix-org/erikj/receipts_async_await | Andrew Morgan | 2020-03-16 | 2 | -33/+17 |
|\| | | |||||
| * | | Port receipt and read markers to async/wait | Erik Johnston | 2019-10-29 | 2 | -33/+17 |
* | | | Improve signature checking on some federation APIs (#6262) | Andrew Morgan | 2020-03-16 | 1 | -2/+18 |
|\| | | |||||
| * | | Improve signature checking on some federation APIs (#6262) | Richard van der Hoff | 2019-10-28 | 1 | -2/+18 |
* | | | Merge pull request #6255 from matrix-org/erikj/stats_config | Andrew Morgan | 2020-03-16 | 1 | -1/+3 |
|\| | | |||||
| * | | Remove repeated calls to config.stats_enabled. | Erik Johnston | 2019-10-25 | 1 | -1/+3 |
| |/ | |||||
* | | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2 | Andrew Morgan | 2020-03-16 | 1 | -1/+390 |
|\| | |||||
| * | Merge pull request #5726 from matrix-org/uhoreg/e2e_cross-signing2-part2 | Hubert Chathi | 2019-10-22 | 1 | -1/+390 |
| |\ | |||||
| | * | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-10-18 | 18 | -851/+1390 |
| | |\ | |||||
| | * | | 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 | 1 | -107/+159 |
| | * | | add function docs | Hubert Chathi | 2019-09-07 | 1 | -2/+24 |
| | * | | Merge branch 'develop' into cross-signing_sig_upload | Hubert Chathi | 2019-09-07 | 5 | -114/+280 |
| | |\ \ | |||||
| | * | | | 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 | 1 | -1/+1 |
| | * | | | make black happy | Hubert Chathi | 2019-09-04 | 1 | -78/+69 |
| | * | | | allow uploading signatures of master key signed by devices | Hubert Chathi | 2019-09-04 | 1 | -82/+150 |
| | * | | | implement device signature uploading/fetching | Hubert Chathi | 2019-09-04 | 1 | -0/+250 |
* | | | | | Remove Auth.check method (#6217) | Andrew Morgan | 2020-03-16 | 4 | -9/+220 |
|\| | | | | |||||
| * | | | | Remove Auth.check method (#6217) | Richard van der Hoff | 2019-10-18 | 1 | -3/+4 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'uhoreg/e2e_cross-signing_merged' into develop | Hubert Chathi | 2019-10-18 | 3 | -6/+216 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 18 | -746/+1387 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-09-07 | 5 | -114/+280 |
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | |||||
| | * | | | Merge branch 'develop' into cross-signing_keys | Hubert Chathi | 2019-09-04 | 17 | -485/+228 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 16 | -65/+412 |
| | |\ \ \ \ | |||||
| | * | | | | | black | Hubert Chathi | 2019-08-28 | 1 | -3/+1 |
| | * | | | | | use stream ID generator instead of timestamp | Hubert Chathi | 2019-08-28 | 1 | -4/+3 |
| | * | | | | | make isort happy | Hubert Chathi | 2019-08-21 | 1 | -1/+0 |
| | * | | | | | apply PR review suggestions | Hubert Chathi | 2019-08-21 | 1 | -42/+34 |
| | * | | | | | make changes from PR review | Hubert Chathi | 2019-08-01 | 1 | -6/+18 |
| | * | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-08-01 | 32 | -462/+638 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | allow uploading keys for cross-signing | Hubert Chathi | 2019-07-25 | 3 | -6/+216 |
* | | | | | | | | Merge pull request #6214 from matrix-org/rav/event_auth/1 | Andrew Morgan | 2020-03-16 | 1 | -102/+0 |
|\| | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 1 | -4/+9 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 2 | -10/+4 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | rip out some unreachable code | Richard van der Hoff | 2019-10-17 | 1 | -102/+0 |
* | | | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212) | Andrew Morgan | 2020-02-26 | 1 | -4/+9 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212) | Erik Johnston | 2019-10-18 | 1 | -4/+9 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage | Andrew Morgan | 2020-02-26 | 1 | -8/+2 |
|\| | | | | | | | |||||
| * | | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage | Hubert Chathi | 2019-10-11 | 1 | -8/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | make sure we actually return something | Hubert Chathi | 2019-10-10 | 1 | -0/+5 |
| | * | | | | | | | make storage layer in charge of interpreting the device key data | Hubert Chathi | 2019-10-10 | 1 | -11/+0 |
* | | | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version | Andrew Morgan | 2020-02-26 | 1 | -2/+2 |
|\| | | | | | | | | |||||
| * | | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version | Hubert Chathi | 2019-10-11 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | make version optional in body of e2e backup version update | Hubert Chathi | 2019-10-09 | 1 | -2/+2 |
| | |/ / / / / / | |||||
* | | | | | | | | Add domain validation when creating room with list of invitees (#6121) | Andrew Morgan | 2020-02-26 | 1 | -1/+3 |
|\| | | | | | | | |||||
| * | | | | | | | Add domain validation when creating room with list of invitees (#6121) | werner291 | 2019-10-10 | 1 | -1/+3 |
* | | | | | | | | Fix races in room stats (and other) updates. (#6187) | Andrew Morgan | 2020-02-26 | 3 | -14/+31 |
|\| | | | | | | | |||||
| * | | | | | | | Fix races in room stats (and other) updates. (#6187) | Richard van der Hoff | 2019-10-10 | 3 | -14/+31 |
* | | | | | | | | Move tag/push rules room upgrade checking ealier (#6155) | Andrew Morgan | 2020-02-26 | 1 | -18/+44 |
|\| | | | | | | | |||||
| * | | | | | | | Move tag/push rules room upgrade checking ealier (#6155) | Andrew Morgan | 2019-10-10 | 1 | -18/+44 |
| |/ / / / / / | |||||
* | | | | | | | Remove unused public room list timeout param (#6179) | Andrew Morgan | 2020-02-26 | 1 | -12/+1 |
|\| | | | | | | |||||
| * | | | | | | Remove unused public room list timeout param (#6179) | Andrew Morgan | 2019-10-08 | 1 | -12/+1 |
* | | | | | | | Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failure | Andrew Morgan | 2020-02-26 | 1 | -6/+4 |
|\| | | | | | | |||||
| * | | | | | | 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 |
* | | | | | | | | add some logging to the rooms stats updates, to try to track down a flaky tes... | Andrew Morgan | 2020-02-26 | 1 | -0/+1 |
|\| | | | | | | | |||||
| * | | | | | | | add some logging to the rooms stats updates, to try to track down a flaky tes... | Richard van der Hoff | 2019-10-07 | 1 | -0/+1 |
| * | | | | | | | 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 |
* | | | | | | | | Merge pull request #6152 from matrix-org/erikj/fix_room_list | Andrew Morgan | 2020-02-26 | 1 | -10/+23 |
|\| | | | | | | | |||||
| * | | | | | | | Fix public room list pagination. | Erik Johnston | 2019-10-02 | 1 | -10/+23 |
* | | | | | | | | Land improved room list based on room stats (#6019) | Andrew Morgan | 2020-02-26 | 1 | -234/+89 |
|\| | | | | | | | |||||
| * | | | | | | | Land improved room list based on room stats (#6019) | Erik Johnston | 2019-10-02 | 1 | -234/+89 |
* | | | | | | | | Fix yields and copy instead of move push rules on room upgrade (#6144) | Andrew Morgan | 2020-02-26 | 1 | -2/+2 |
|\| | | | | | | | |||||
| * | | | | | | | Fix yields and copy instead of move push rules on room upgrade (#6144) | Andrew Morgan | 2019-10-02 | 1 | -2/+2 |
| |/ / / / / / | |||||
| * | | | | | | 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 | 2020-02-26 | 2 | -384/+354 |
|\| | | | | | | |||||
| * | | | | | | Move lookup-related functions from RoomMemberHandler to IdentityHandler (#5978) | Andrew Morgan | 2019-09-27 | 2 | -364/+359 |
* | | | | | | | Fix dummy event insertion consent bug (#6053) | Andrew Morgan | 2020-02-25 | 1 | -27/+72 |
|\| | | | | | | |||||
| * | | | | | | Fix dummy event insertion consent bug (#6053) | Neil Johnson | 2019-09-26 | 1 | -27/+72 |
* | | | | | | | Enable cleaning up extremities with dummy events by default to prevent undue ... | Andrew Morgan | 2020-02-25 | 1 | -29/+34 |
|\| | | | | | | |||||
| * | | | | | | 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) | Andrew Morgan | 2020-02-25 | 2 | -1/+36 |
|\| | | | | | | |||||
| * | | | | | | Stop advertising unsupported flows for registration (#6107) | Richard van der Hoff | 2019-09-25 | 2 | -1/+36 |
* | | | | | | | Refactor the user-interactive auth handling (#6105) | Andrew Morgan | 2020-02-25 | 3 | -131/+248 |
|\| | | | | | | |||||
| * | | | | | | Refactor the user-interactive auth handling (#6105) | Richard van der Hoff | 2019-09-25 | 3 | -131/+248 |
* | | | | | | | Merge pull request #6037 from matrix-org/rav/saml_mapping_work | Andrew Morgan | 2020-02-25 | 1 | -8/+98 |
|\| | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 1 | -0/+10 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work | Richard van der Hoff | 2019-09-24 | 3 | -82/+192 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | 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 | 26 | -571/+1051 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | 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 | 1 | -8/+95 |
* | | | | | | | | | | Add sid to next_link for email validation (#6097) | Andrew Morgan | 2020-02-25 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Add sid to next_link for email validation (#6097) | J. Ryan Stinnett | 2019-09-24 | 1 | -0/+10 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Add submit_url response parameter to msisdn /requestToken (#6079) | Andrew Morgan | 2020-02-25 | 1 | -1/+11 |
|\| | | | | | | | | |||||
| * | | | | | | | | Add submit_url response parameter to msisdn /requestToken (#6079) | Andrew Morgan | 2019-09-23 | 1 | -1/+11 |
* | | | | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000) | Andrew Morgan | 2020-02-25 | 2 | -3/+20 |
|\| | | | | | | | | |||||
| * | | | | | | | | Use the federation blacklist for requests to untrusted Identity Servers (#6000) | Andrew Morgan | 2019-09-23 | 2 | -4/+21 |
* | | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078) | Andrew Morgan | 2020-02-25 | 1 | -0/+34 |
|\| | | | | | | | | |||||
| * | | | | | | | | Add POST submit_token endpoint for MSISDN (#6078) | Andrew Morgan | 2019-09-23 | 1 | -0/+34 |
* | | | | | | | | | Implement MSC2290 (#6043) | Andrew Morgan | 2020-02-25 | 2 | -53/+87 |
|\| | | | | | | | | |||||
| * | | | | | | | | Implement MSC2290 (#6043) | Andrew Morgan | 2019-09-23 | 2 | -52/+86 |
* | | | | | | | | | Return timeout error to user for identity server calls (#6073) | Andrew Morgan | 2020-02-25 | 2 | -11/+37 |
|\| | | | | | | | | |||||
| * | | | | | | | | Return timeout error to user for identity server calls (#6073) | Andrew Morgan | 2019-09-23 | 2 | -11/+37 |
* | | | | | | | | | Allow HS to send emails when adding an email to the HS (#6042) | Andrew Morgan | 2020-02-25 | 1 | -10/+2 |
|\| | | | | | | | | |||||
| * | | | | | | | | Allow HS to send emails when adding an email to the HS (#6042) | Andrew Morgan | 2019-09-20 | 1 | -14/+3 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | v2 3PID Invites (part of MSC2140) (#5979) | Andrew Morgan | 2020-02-25 | 1 | -25/+84 |
|\| | | | | | | | |||||
| * | | | | | | | v2 3PID Invites (part of MSC2140) (#5979) | Andrew Morgan | 2019-09-17 | 1 | -23/+81 |
* | | | | | | | | Fix race condition in room stats. (#6029) | Andrew Morgan | 2020-02-25 | 1 | -4/+10 |
|\| | | | | | | | |||||
| * | | | | | | | Fix race condition in room stats. (#6029) | Erik Johnston | 2019-09-17 | 1 | -4/+10 |
* | | | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976) | Andrew Morgan | 2020-02-25 | 3 | -32/+239 |
|\| | | | | | | | |||||
| * | | | | | | | Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976) | Andrew Morgan | 2019-09-11 | 3 | -35/+203 |
* | | | | | | | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction | Andrew Morgan | 2020-02-25 | 2 | -12/+53 |
|\| | | | | | | | |||||
| * | | | | | | | Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction | Erik Johnston | 2019-09-11 | 2 | -12/+53 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix comments | Erik Johnston | 2019-09-11 | 2 | -2/+2 |
| | * | | | | | | | Fix how we check for self redaction | Erik Johnston | 2019-09-11 | 1 | -4/+18 |
| | * | | | | | | | Allow use of different ratelimits for admin redactions. | Erik Johnston | 2019-09-11 | 2 | -12/+39 |
* | | | | | | | | | Add note about extra arg to send_membership_event, remove arg in remote_rejec... | Andrew Morgan | 2020-02-25 | 1 | -10/+2 |
|\| | | | | | | | | |||||
| * | | | | | | | | Add note about extra arg to send_membership_event, remove arg in remote_rejec... | Andrew Morgan | 2019-09-11 | 1 | -10/+2 |
* | | | | | | | | | Fix existing v2 identity server calls (MSC2140) (#6013) | Andrew Morgan | 2020-02-25 | 1 | -2/+26 |
|\| | | | | | | | | |||||
| * | | | | | | | | Fix existing v2 identity server calls (MSC2140) (#6013) | Andrew Morgan | 2019-09-11 | 1 | -2/+26 |
* | | | | | | | | | Remove origin parameter from add_display_name_to_third_party_invite and add p... | Andrew Morgan | 2020-02-25 | 1 | -1/+6 |
|\| | | | | | | | | |||||
| * | | | | | | | | Remove origin parameter from add_display_name_to_third_party_invite and add p... | Andrew Morgan | 2019-09-11 | 1 | -1/+6 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validation | Andrew Morgan | 2020-02-25 | 2 | -40/+43 |
|\| | | | | | | | |||||
| * | | | | | | | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validation | Erik Johnston | 2019-09-10 | 2 | -41/+43 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add changelog | Andrew Morgan | 2019-09-10 | 1 | -3/+3 |
| | * | | | | | | | Use account_threepid_delegate for 3pid validation | Andrew Morgan | 2019-09-10 | 2 | -41/+43 |
* | | | | | | | | | Merge pull request #6004 from matrix-org/jaywink/autojoin-create-real-users | Andrew Morgan | 2020-02-25 | 1 | -8/+4 |
|\| | | | | | | | | |||||
| * | | | | | | | | Only count real users when checking for auto-creation of auto-join room | Jason Robinson | 2019-09-09 | 1 | -8/+4 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Ensure a sid parameter is passed to bind_threepid (#5995) | Andrew Morgan | 2020-02-25 | 1 | -1/+7 |
|\| | | | | | | | |||||
| * | | | | | | | Ensure a sid parameter is passed to bind_threepid (#5995) | Andrew Morgan | 2019-09-06 | 1 | -1/+7 |
* | | | | | | | | Merge pull request #5998 from matrix-org/erikj/fixup_federate_flag | Andrew Morgan | 2020-02-25 | 1 | -1/+3 |
|\| | | | | | | | |||||
| * | | | | | | | Correctly handle non-bool m.federate flag | Erik Johnston | 2019-09-06 | 1 | -1/+3 |
| |/ / / / / / | |||||
* | | | | | | | Allow Synapse to send registration emails + choose Synapse or an external ser... | Andrew Morgan | 2020-02-25 | 3 | -74/+154 |
|\| | | | | | | |||||
| * | | | | | | Allow Synapse to send registration emails + choose Synapse or an external ser... | Andrew Morgan | 2019-09-06 | 3 | -71/+153 |
* | | | | | | | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_... | Andrew Morgan | 2020-02-25 | 1 | -4/+1 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_... | Erik Johnston | 2019-09-05 | 1 | -4/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Link the send loop with the edus contexts | Jorik Schellekens | 2019-09-05 | 1 | -4/+1 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892) | Andrew Morgan | 2020-02-25 | 1 | -42/+120 |
|\| | | | | | | |||||
| * | | | | | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892) | Andrew Morgan | 2019-09-05 | 1 | -41/+119 |
* | | | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980) | Andrew Morgan | 2020-02-25 | 1 | -1/+2 |
|\| | | | | | | |||||
| * | | | | | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980) | Andrew Morgan | 2019-09-05 | 1 | -1/+2 |
| |/ / / / / | |||||
* | | | | | | Remove bind_email and bind_msisdn (#5964) | Andrew Morgan | 2020-02-25 | 1 | -44/+6 |
|\| | | | | | |||||
| * | | | | | Remove bind_email and bind_msisdn (#5964) | Andrew Morgan | 2019-09-04 | 1 | -44/+6 |
* | | | | | | Fix and refactor room and user stats (#5971) | Andrew Morgan | 2020-02-25 | 2 | -182/+134 |
|\| | | | | | |||||
| * | | | | | Fix and refactor room and user stats (#5971) | Erik Johnston | 2019-09-04 | 1 | -175/+132 |
| * | | | | | code cleanups | Andrew Morgan | 2019-09-03 | 1 | -7/+2 |
* | | | | | | Ensure the list media admin API is always available (#5966) | Andrew Morgan | 2020-02-25 | 1 | -3/+1 |
|\| | | | | | |||||
| * | | | | | Fix docstring | Andrew Morgan | 2019-09-03 | 1 | -2/+1 |
| * | | | | | Remove unnecessary variable declaration | Andrew Morgan | 2019-09-03 | 1 | -1/+0 |
* | | | | | | Ensure an auth instance is available to ListMediaInRoom (#5967) | Andrew Morgan | 2020-02-25 | 1 | -1/+1 |
|\| | | | | | |||||
| * | | | | | fix typo | Matthew Hodgson | 2019-09-03 | 1 | -1/+1 |
* | | | | | | Remove double return statements (#5962) | Andrew Morgan | 2020-02-25 | 5 | -7/+0 |
|\| | | | | | |||||
| * | | | | | Remove double return statements (#5962) | Andrew Morgan | 2019-09-03 | 5 | -7/+0 |
* | | | | | | Opentrace device lists (#5853) | Andrew Morgan | 2020-02-25 | 2 | -3/+68 |
|\| | | | | | |||||
| * | | | | | Opentrace device lists (#5853) | Jorik Schellekens | 2019-09-03 | 2 | -3/+68 |
* | | | | | | Remove unused methods from c/s api v1 in register.py (#5963) | Andrew Morgan | 2020-02-24 | 1 | -185/+0 |
|\| | | | | | |||||
| * | | | | | Remove unused methods from c/s api v1 in register.py (#5963) | Andrew Morgan | 2019-09-02 | 1 | -104/+0 |
* | | | | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2020-02-24 | 10 | -19/+21 |
|\| | | | | | |||||
| * | | | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 10 | -19/+19 |
| * | | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937) | Andrew Morgan | 2019-08-30 | 2 | -132/+9 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Revert "Use the v2 lookup API for 3PID invites (#5897)" | Andrew Morgan | 2020-02-24 | 2 | -256/+176 |
* | | | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Andrew Morgan | 2020-02-24 | 1 | -1/+4 |
|\| | | | | |||||
| * | | | | Merge pull request #5902 from matrix-org/hs/exempt-support-users-from-consent | Will Hunt | 2019-08-28 | 1 | -1/+4 |
| |\ \ \ \ | |||||
| | * | | | | Apply suggestions from code review | Will Hunt | 2019-08-23 | 1 | -2/+2 |
| | * | | | | Exempt bot users | Half-Shot | 2019-08-23 | 1 | -1/+1 |
| | * | | | | Return user_type in get_user_by_id | Half-Shot | 2019-08-23 | 1 | -1/+4 |
* | | | | | | Use the v2 lookup API for 3PID invites (#5897) | Andrew Morgan | 2020-02-24 | 2 | -176/+256 |
|\| | | | | | |||||
| * | | | | | Use the v2 lookup API for 3PID invites (#5897) | Andrew Morgan | 2019-08-28 | 2 | -9/+132 |
* | | | | | | Implement a structured logging output system. (#5680) | Andrew Morgan | 2020-02-21 | 1 | -2/+3 |
|\| | | | | | |||||
| * | | | | | Implement a structured logging output system. (#5680) | Amber Brown | 2019-08-28 | 1 | -2/+3 |
* | | | | | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | Andrew Morgan | 2020-02-21 | 1 | -0/+9 |
|\| | | | | | |||||
| * | | | | | Merge pull request #5914 from matrix-org/rei/admin_getadmin | reivilibre | 2019-08-28 | 1 | -0/+9 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add GET method to admin API /users/@user:dom/admin | Olivier Wilkinson (reivilibre) | 2019-08-27 | 1 | -0/+9 |
* | | | | | | | Merge pull request #5859 from matrix-org/rei/msc2197 | Andrew Morgan | 2020-02-21 | 1 | -1/+28 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #5859 from matrix-org/rei/msc2197 | reivilibre | 2019-08-28 | 1 | -1/+28 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Support MSC2197 outbound with unstable prefix | Olivier Wilkinson (reivilibre) | 2019-08-15 | 1 | -1/+28 |
| | | |_|/ / / | | |/| | | | | |||||
* | | | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limit | Andrew Morgan | 2020-02-21 | 1 | -1/+1 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #5906 from matrix-org/neilj/increase_display_name_limit | Richard van der Hoff | 2019-08-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Increase max display name limit | Neil Johnson | 2019-08-24 | 1 | -1/+1 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | Add Admin API capability to set adminship of a user (#5878) | Andrew Morgan | 2020-02-21 | 1 | -0/+10 |
|\| | | | | | |||||
| * | | | | | Add Admin API capability to set adminship of a user (#5878) | reivilibre | 2019-08-27 | 1 | -0/+10 |
| |/ / / / | |||||
* | | | | | Propagate opentracing contexts through EDUs (#5852) | Andrew Morgan | 2020-02-21 | 1 | -6/+21 |
|\| | | | | |||||
| * | | | | Propagate opentracing contexts through EDUs (#5852) | Jorik Schellekens | 2019-08-22 | 1 | -6/+21 |
| * | | | | Revert "Add "require_consent" parameter for registration" | Brendan Abolivier | 2019-08-22 | 1 | -12/+2 |
| * | | | | Add "require_consent" parameter for registration | Half-Shot | 2019-08-22 | 1 | -2/+12 |
* | | | | | Opentrace e2e keys (#5855) | Andrew Morgan | 2020-02-21 | 2 | -3/+77 |
|\| | | | | |||||
| * | | | | Opentrace e2e keys (#5855) | Jorik Schellekens | 2019-08-22 | 2 | -3/+77 |
* | | | | | Servlet to purge old rooms (#5845) | Andrew Morgan | 2020-02-21 | 1 | -0/+17 |
|\| | | | | |||||
| * | | | | Servlet to purge old rooms (#5845) | Richard van der Hoff | 2019-08-22 | 1 | -0/+17 |
* | | | | | Merge pull request #5860 from matrix-org/erikj/update_5704_comments | Andrew Morgan | 2020-02-21 | 1 | -17/+5 |
|\| | | | |