Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix demo script on ipv6-supported boxes (#6229) | Andrew Morgan | 2019-10-22 | 2 | -2/+2 |
* | Update postgres.md (#6234) | Adrien Luxey | 2019-10-22 | 1 | -3/+7 |
* | Delete format_tap.py (#6219) | Andrew Morgan | 2019-10-19 | 2 | -48/+1 |
* | Remove Auth.check method (#6217) | Richard van der Hoff | 2019-10-18 | 3 | -21/+6 |
* | Merge branch 'uhoreg/e2e_cross-signing_merged' into develop | Hubert Chathi | 2019-10-18 | 15 | -21/+693 |
|\ | |||||
| * | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 346 | -5021/+9505 |
| |\ | |||||
| * | | add note about database upgrade | Hubert Chathi | 2019-10-18 | 1 | -1/+4 |
| * | | 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 | 61 | -583/+1486 |
| |\ \ | |||||
| * \ \ | Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1 | Hubert Chathi | 2019-09-04 | 141 | -1713/+2808 |
| |\ \ \ | |||||
| | * | | | 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 | 132 | -1703/+2168 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 207 | -1510/+4979 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-08-28 | 206 | -1438/+4695 |
| |\ \ \ \ \ | |||||
| * | | | | | | Cross-signing [1/4] -- hidden devices (#5759) | Hubert Chathi | 2019-08-12 | 4 | -10/+49 |
| | | * | | | | 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 |
| | | * | | | | fix formatting | Hubert Chathi | 2019-08-01 | 2 | -2/+4 |
| | | * | | | | add changelog | Hubert Chathi | 2019-08-01 | 1 | -0/+1 |
| | | * | | | | 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 | 298 | -2145/+3414 |
| | | |\ \ \ \ | |||||
| | | | * | | | | 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 | 298 | -2125/+3402 |
| | | | |\ \ \ \ | |||||
| | | * | | | | | | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-07-30 | 4 | -21/+18 |
| | | |\| | | | | | |||||
| | | | * | | | | | add changelog file | Hubert Chathi | 2019-07-30 | 1 | -0/+1 |
| | | | * | | | | | apply changes from PR review | Hubert Chathi | 2019-07-30 | 3 | -20/+17 |
| | | * | | | | | | allow uploading keys for cross-signing | Hubert Chathi | 2019-07-25 | 11 | -12/+621 |
| | | |/ / / / / | |||||
| | | * | | | | | allow devices to be marked as "hidden" | Hubert Chathi | 2019-07-24 | 2 | -16/+65 |
* | | | | | | | | Merge pull request #6214 from matrix-org/rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 6 | -211/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 21 | -152/+212 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Fix logging config for the docker image (#6197) | Richard van der Hoff | 2019-10-18 | 3 | -3/+5 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'master' into develop | Brendan Abolivier | 2019-10-18 | 5 | -30/+40 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge tag 'v1.4.1' | Brendan Abolivier | 2019-10-18 | 6 | -5/+91 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix changelog v1.4.1 github/release-v1.4.1 release-v1.4.1 | Brendan Abolivier | 2019-10-18 | 1 | -1/+1 |
| | * | | | | | | | | 1.4.1 | Brendan Abolivier | 2019-10-18 | 3 | -1/+13 |
| * | | | | | | | | | Update docker-compose.yml for a static config file, and update traefik exampl... | przemas75 | 2019-10-18 | 2 | -29/+27 |
* | | | | | | | | | | Merge pull request #6196 from matrix-org/erikj/await | Erik Johnston | 2019-10-18 | 7 | -114/+114 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 |
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-11 | 1 | -0/+1 |
| * | | | | | | | | | | 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 |
* | | | | | | | | | | | Add missing BOOLEAN_COLUMNs to synapse_port_db (#6216) | Bart Noordervliet | 2019-10-18 | 2 | -0/+3 |
* | | | | | | | | | | | Fix presence timeouts when synchrotron restarts. (#6212) | Erik Johnston | 2019-10-18 | 4 | -5/+50 |
| | | | * | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/event_auth/1 | Richard van der Hoff | 2019-10-18 | 46 | -223/+460 |
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Remove dead changelog file | Richard van der Hoff | 2019-10-17 | 1 | -1/+0 |
* | | | | | | | | | | | Fix up changelogs | Richard van der Hoff | 2019-10-17 | 1 | -0/+1 |
* | | | | | | | | | | | Merge tag 'v1.4.1rc1' into develop | Richard van der Hoff | 2019-10-17 | 2 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | 1.4.1rc1 v1.4.1rc1 | Richard van der Hoff | 2019-10-17 | 3 | -2/+9 |
| * | | | | | | | | | | 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 | 3 | -4/+29 |
* | | | | | | | | | | | Merge pull request #6193 from matrix-org/uhoreg/interpret_device_key_in_storage | Hubert Chathi | 2019-10-11 | 4 | -18/+23 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | 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 |
| * | | | | | | | | | | | add changelog | Hubert Chathi | 2019-10-10 | 1 | -0/+1 |
| * | | | | | | | | | | | make storage layer in charge of interpreting the device key data | Hubert Chathi | 2019-10-10 | 3 | -19/+15 |
* | | | | | | | | | | | | Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version | Hubert Chathi | 2019-10-11 | 4 | -19/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | change test name to be unique | Hubert Chathi | 2019-10-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | add changelog | Hubert Chathi | 2019-10-09 | 1 | -0/+1 |
| * | | | | | | | | | | | | make version optional in body of e2e backup version update | Hubert Chathi | 2019-10-09 | 3 | -19/+34 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #6195 from matrix-org/erikj/opentracing_preview_url | Erik Johnston | 2019-10-11 | 3 | -5/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-11 | 1 | -0/+1 |
| * | | | | | | | | | | | 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 | 4 | -1/+8 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Fix MAU reaping where reserved users are specified. (#6168) | Neil Johnson | 2019-10-11 | 4 | -51/+115 |
* | | | | | | | | | | | Merge pull request #6156 from matrix-org/erikj/postgres_any | Erik Johnston | 2019-10-10 | 15 | -109/+190 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | 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 | 8 | -102/+236 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-10 | 1 | -0/+1 |
| * | | | | | | | | | | | | 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 |
* | | | | | | | | | | | | | Merge pull request #6186 from matrix-org/erikj/disable_sql_bytes | Erik Johnston | 2019-10-10 | 8 | -15/+65 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix postgres unit tests | Erik Johnston | 2019-10-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | 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 | 8 | -102/+236 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge pull request #6191 from matrix-org/rav/fix_packaging | Erik Johnston | 2019-10-10 | 2 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fix python packaging | Richard van der Hoff | 2019-10-10 | 2 | -3/+2 |
|/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sq... | Erik Johnston | 2019-10-10 | 135 | -1692/+2474 |
| |\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-09 | 1 | -0/+1 |
| * | | | | | | | | | | | | 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 |
| | | | | | * | | | | | | | changelog | Richard van der Hoff | 2019-10-17 | 1 | -0/+1 |
| | | | | | * | | | | | | | rip out some unreachable code | Richard van der Hoff | 2019-10-17 | 4 | -153/+0 |
| | | | | | * | | | | | | | Remove dead check_auth script | Richard van der Hoff | 2019-10-11 | 1 | -58/+0 |
| |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #6127 from matrix-org/erikj/patch_inner | Erik Johnston | 2019-10-10 | 6 | -99/+234 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 | 48 | -163/+556 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-10 | 1 | -0/+1 |
| * | | | | | | | | | | | | 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 | 3 | -4/+4 |
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner | Erik Johnston | 2019-10-09 | 99 | -1106/+1795 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Update | Erik Johnston | 2019-09-27 | 1 | -8/+15 |
| * | | | | | | | | | | | | Patch inlinecallbacks for log contexts | Erik Johnston | 2019-09-27 | 5 | -10/+95 |
* | | | | | | | | | | | | | Add domain validation when creating room with list of invitees (#6121) | werner291 | 2019-10-10 | 3 | -1/+13 |
* | | | | | | | | | | | | | before fulfilling a group invite,check if user is already joined/invited (#3436) | Michael Telatynski | 2019-10-10 | 2 | -4/+17 |
* | | | | | | | | | | | | | send 404 as http-status when filter-id is unknown to the server (#2380) | krombel | 2019-10-10 | 4 | -23/+33 |
* | | | | | | | | | | | | | Add snapcraft packaging information (#6084) | James | 2019-10-10 | 3 | -0/+24 |
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fix races in room stats (and other) updates. (#6187) | Richard van der Hoff | 2019-10-10 | 7 | -25/+63 |
* | | | | | | | | | | | | Rewrite the user_filter migration again (#6184) | Richard van der Hoff | 2019-10-10 | 2 | -26/+33 |
* | | | | | | | | | | | | Move tag/push rules room upgrade checking ealier (#6155) | Andrew Morgan | 2019-10-10 | 2 | -18/+45 |
* | | | | | | | | | | | | Refactor HomeserverConfig so it can be typechecked (#6137) | Amber Brown | 2019-10-10 | 37 | -94/+415 |
| |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #6185 from matrix-org/erikj/fix_censored_evnets | Erik Johnston | 2019-10-09 | 3 | -4/+29 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Update changelog.d/6185.bugfix | Erik Johnston | 2019-10-09 | 1 | -1/+1 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Fix existing hex encoded json values in DB | Erik Johnston | 2019-10-08 | 1 | -0/+26 |
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-08 | 1 | -0/+1 |
| * | | | | | | | | | | 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 | 10 | -605/+671 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 |
| * | | | | | | | | | | Changelog | Brendan Abolivier | 2019-10-07 | 1 | -0/+1 |
| * | | | | | | | | | | 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 | 2 | -2/+7 |
* | | | | | | | | | | | Remove unused public room list timeout param (#6179) | Andrew Morgan | 2019-10-08 | 2 | -12/+2 |
* | | | | | | | | | | | Fix /federation/v1/state for recent room versions (#6170) | Richard van der Hoff | 2019-10-08 | 2 | -13/+1 |
* | | | | | | | | | | | fix changelog | Richard van der Hoff | 2019-10-07 | 1 | -1/+1 |
* | | | | | | | | | | | Merge pull request #6161 from matrix-org/erikj/dont_regen_user_id_on_failure | Erik Johnston | 2019-10-07 | 2 | -6/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixup newsfile | Erik Johnston | 2019-10-03 | 2 | -1/+1 |
| * | | | | | | | | | | | Remove unused variable | Erik Johnston | 2019-10-03 | 1 | -2/+0 |
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-03 | 1 | -0/+1 |
| * | | | | | | | | | | | 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 | 2 | -1/+2 |
| |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Fix changelog for PR #6175 | Brendan Abolivier | 2019-10-07 | 2 | -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 | 3 | -0/+5 |
* | | | | | | | | | | | Merge pull request #6175 from matrix-org/babolivier/fix_unique_user_filter_index | Brendan Abolivier | 2019-10-07 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-10-07 | 1 | -0/+1 |
| * | | | | | | | | | | | 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 | 2 | -19/+46 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 | 5 | -19/+44 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-03 | 1 | -0/+1 |
| * | | | | | | | | | | | | 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 | 3 | -2/+89 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | 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 |
| * | | | | | | | | | | | | Lint (again) | Brendan Abolivier | 2019-10-03 | 1 | -3/+1 |
| * | | | | | | | | | | | | Lint | Brendan Abolivier | 2019-10-03 | 1 | -5/+5 |
| * | | | | | | | | | | | | Add test case | Brendan Abolivier | 2019-10-03 | 2 | -1/+84 |
| * | | | | | | | | | | | | Changelog | Brendan Abolivier | 2019-10-02 | 1 | -0/+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 | 2 | -0/+47 |
* | | | | | | | | | | | | | media/thumbnailer: Better quality for 1-bit / 8-bit color palette images (#2142) | Robert Swain | 2019-10-04 | 2 | -3/+12 |
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | add some metrics on the federation sender (#6160) | Richard van der Hoff | 2019-10-03 | 5 | -19/+44 |
| |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'master' into develop | Andrew Morgan | 2019-10-03 | 9 | -8/+38 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge tag 'v1.4.0' | Andrew Morgan | 2019-10-03 | 303 | -5895/+13375 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | 1.4.0 v1.4.0 github/release-v1.4.0 release-v1.4.0 | Andrew Morgan | 2019-10-03 | 4 | -2/+16 |
| | * | | | | | | | | | Replace client_secret with <redacted> in server logs (#6158) | Andrew Morgan | 2019-10-03 | 2 | -2/+5 |
| | * | | | | | | | | | 1.4.0rc2 v1.4.0rc2 | Andrew Morgan | 2019-10-02 | 7 | -6/+19 |
* | | | | | | | | | | | Merge pull request #6154 from matrix-org/erikj/fix_appservice_pagination | Erik Johnston | 2019-10-02 | 2 | -18/+19 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-02 | 1 | -0/+1 |
| * | | | | | | | | | | | 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 | 2 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_room_l... | Erik Johnston | 2019-10-02 | 0 | -0/+0 |
| |\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-02 | 1 | -0/+1 |
| * | | | | | | | | | | | | 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 | 2 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-02 | 1 | -0/+1 |
| * | | | | | | | | | | | | Bound find_next_generated_user_id DB query. | Erik Johnston | 2019-10-02 | 1 | -1/+3 |
* | | | | | | | | | | | | | Merge pull request #6152 from matrix-org/erikj/fix_room_list | Erik Johnston | 2019-10-02 | 3 | -27/+60 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Newsfile | Erik Johnston | 2019-10-02 | 1 | -0/+1 |
| * | | | | | | | | | | | | Fix public room list pagination. | Erik Johnston | 2019-10-02 | 2 | -27/+59 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'master' into develop | Brendan Abolivier | 2019-10-02 | 4 | -9/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Update the issue template for new way of getting server version (#6051) | Richard van der Hoff | 2019-09-19 | 1 | -9/+13 |
| * | | | | | | | | | | | Update INSTALL.md with void-linux (#5873) | Pete | 2019-09-19 | 1 | -0/+7 |
| * | | | | | | | | | | | add explanations on how to actually include an access_token (#6031) | axel simon | 2019-09-13 | 1 | -0/+12 |
| * | | | | | | | | | | | README: link to reverse_proxy.rst (#6027) | Richard van der Hoff | 2019-09-12 | 1 | -0/+13 |
* | | | | | | | | | | | | Land improved room list based on room stats (#6019) | Erik Johnston | 2019-10-02 | 7 | -350/+273 |
* | | | | | | | | | | | | Fix up some typechecking (#6150) | Amber Brown | 2019-10-02 | 22 | -40/+104 |
* | | | | | | | | | | | | Fix yields and copy instead of move push rules on room upgrade (#6144) | Andrew Morgan | 2019-10-02 | 3 | -12/+9 |
| |/ / / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2019-10-02 | 11 | -19/+193 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings | Erik Johnston | 2019-10-02 | 4 | -1/+31 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Newsfile | Erik Johnston | 2019-10-02 | 1 | -0/+1 |
| | * | | | | | | | | | Fix errors storing large retry intervals. | Erik Johnston | 2019-10-02 | 3 | -1/+30 |
| * | | | | | | | | | | Merge pull request #6145 from matrix-org/erikj/fix_censored_redactions | Erik Johnston | 2019-10-02 | 3 | -0/+51 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Newsfile | Erik Johnston | 2019-10-02 | 1 | -0/+1 |
| | * | | | | | | | | | Fix fetching censored redactions from DB | Erik Johnston | 2019-10-02 | 2 | -0/+50 |
| * | | | | | | | | | | Merge pull request #6141 from matrix-org/erikj/censor_redactions_fix | Erik Johnston | 2019-10-02 | 4 | -18/+111 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Newsfile | Erik Johnston | 2019-10-01 | 1 | -0/+1 |
| | * | | | | | | | | | 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 pull request #6135 from matrix-org/erikj/fixup_devices_last_seen_query | Erik Johnston | 2019-10-01 | 4 | -7/+55 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/s... | Erik Johnston | 2019-10-01 | 8 | -11/+60 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Newsfile | Erik Johnston | 2019-09-30 | 1 | -0/+1 |
| * | | | | | | | | | | Fix `devices_last_seen` background update. | Erik Johnston | 2019-09-30 | 3 | -7/+54 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #6117 from matrix-org/erikj/fix_sample_config | Erik Johnston | 2019-09-26 | 3 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Newsfile | Erik Johnston | 2019-09-26 | 1 | -0/+1 |
| | * | | | | | | | | | Fix 'redaction_retention_period' sampel config to match guidelines | Erik Johnston | 2019-09-26 | 2 | -2/+2 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | s/month/week/ to match config | Neil Johnson | 2019-09-26 | 1 | -1/+1 |
| * | | | | | | | | | Update CHANGES.md | Richard van der Hoff | 2019-09-26 | 1 | -1/+1 |
* | | | | | | | | | | Drop unused tables (#6115) | Richard van der Hoff | 2019-09-30 | 2 | -0/+21 |
* | | | | | | | | | | Edit SimpleHttpClient to reference that header keys can be passed as str or b... | Andrew Morgan | 2019-09-27 | 2 | -6/+7 |
* | | | | | | | | | | Merge pull request #6125 from matrix-org/babolivier/deactivation-invite | Brendan Abolivier | 2019-09-27 | 3 | -14/+92 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | 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 |
| * | | | | | | | | | Update changelog.d/6125.feature | Brendan Abolivier | 2019-09-27 | 1 | -1/+1 |
| * | | | | | | | | | ok | Brendan Abolivier | 2019-09-27 | 1 | -1/+3 |
| * | | | | | | | | | Lint | Brendan Abolivier | 2019-09-27 | 2 | -10/+2 |
| * | | | | | | | | | Changelog | Brendan Abolivier | 2019-09-27 | 1 | -0/+1 |
| * | | | | | | | | | Add test to validate the change | Brendan Abolivier | 2019-09-27 | 1 | -13/+57 |
| * | | | | | | | | | 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 | 3 | -364/+360 |
* | | | | | | | | | Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-span | Erik Johnston | 2019-09-27 | 3 | -1/+22 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | isort | Erik Johnston | 2019-09-25 | 1 | -1/+1 |
| * | | | | | | | | | Add device and appservice tags | Erik Johnston | 2019-09-25 | 1 | -0/+3 |
| * | | | | | | | | | Newsfile | Erik Johnston | 2019-09-25 | 1 | -0/+1 |
| * | | | | | | | | | 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 | 2 | -64/+2 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | more changelog updates v1.4.0rc1 | Richard van der Hoff | 2019-09-26 | 1 | -7/+7 |
* | | | | | | | | | Changelog formatting | Richard van der Hoff | 2019-09-26 | 1 | -2/+1 |
* | | | | | | | | | changelog | Richard van der Hoff | 2019-09-26 | 132 | -132/+156 |
* | | | | | | | | | Explicitly log when a homeserver does not have a trusted key server configure... | Neil Johnson | 2019-09-26 | 4 | -16/+63 |
* | | | | | | | | | Merge commit '1b23f991a' into release-v1.4.0 | Richard van der Hoff | 2019-09-26 | 2 | -42/+152 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Clarify upgrade notes ahead of 1.4.0 release | Neil Johnson | 2019-09-26 | 2 | -42/+152 |
* | | | | | | | | | | bump version | Richard van der Hoff | 2019-09-26 | 1 | -1/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Fix dummy event insertion consent bug (#6053) | Neil Johnson | 2019-09-26 | 5 | -39/+266 |