Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5212 from matrix-org/erikj/deny_multiple_reactions | Erik Johnston | 2019-05-21 | 4 | -5/+87 |
|\ | |||||
| * | Fix words | Erik Johnston | 2019-05-21 | 1 | -3/+3 |
| * | Newsfile | Erik Johnston | 2019-05-20 | 1 | -0/+1 |
| * | Block attempts to annotate the same event twice | Erik Johnston | 2019-05-20 | 3 | -5/+86 |
* | | Introduce room v4 which updates event ID format. (#5217) | Richard van der Hoff | 2019-05-21 | 3 | -5/+6 |
* | | Exclude soft-failed events from fwd-extremity candidates. (#5146) | Richard van der Hoff | 2019-05-21 | 3 | -3/+14 |
* | | Pin eliot to <1.8 on python 3.5.2 (#5218) | Richard van der Hoff | 2019-05-21 | 3 | -7/+36 |
* | | Merge pull request #5204 from matrix-org/babolivier/account_validity_expirati... | Brendan Abolivier | 2019-05-21 | 6 | -12/+134 |
|\ \ | |||||
| * | | Doc | Brendan Abolivier | 2019-05-21 | 2 | -0/+16 |
| * | | Do the select and insert in a single transaction | Brendan Abolivier | 2019-05-21 | 1 | -10/+6 |
| * | | Changelog | Brendan Abolivier | 2019-05-17 | 1 | -0/+1 |
| * | | Add startup background job for account validity | Brendan Abolivier | 2019-05-17 | 3 | -12/+121 |
* | | | Fix error handling for rooms whose versions are unknown. (#5219) | Richard van der Hoff | 2019-05-21 | 5 | -7/+38 |
| |/ |/| | |||||
* | | Revert "expose SlavedProfileStore to ClientReaderSlavedStore (#5200)" | Richard van der Hoff | 2019-05-20 | 2 | -3/+0 |
* | | Add a test room version which updates event ID format (#5210) | Richard van der Hoff | 2019-05-20 | 3 | -3/+34 |
* | | Merge pull request #5211 from matrix-org/erikj/fixup_reaction_constants | Erik Johnston | 2019-05-20 | 5 | -20/+21 |
|\ \ | |||||
| * | | Newsfile | Erik Johnston | 2019-05-20 | 1 | -0/+1 |
| * | | Rename relation types to match MSC | Erik Johnston | 2019-05-20 | 4 | -20/+20 |
|/ / | |||||
* | | Merge pull request #5209 from matrix-org/erikj/reactions_base | Erik Johnston | 2019-05-20 | 14 | -16/+1439 |
|\ \ | |||||
| * | | Newsfile | Erik Johnston | 2019-05-20 | 2 | -1/+1 |
| * | | Merge pull request #5207 from matrix-org/erikj/reactions_redactions | Erik Johnston | 2019-05-20 | 3 | -12/+125 |
| |\ \ | |||||
| | * | | Fixup comments | Erik Johnston | 2019-05-20 | 1 | -2/+2 |
| | * | | Correctly update aggregation counts after redaction | Erik Johnston | 2019-05-20 | 3 | -0/+57 |
| | * | | Make tests use different user for each reaction it sends | Erik Johnston | 2019-05-17 | 1 | -12/+68 |
| * | | | Merge pull request #5195 from matrix-org/erikj/edits | Erik Johnston | 2019-05-20 | 4 | -14/+166 |
| |\| | | |||||
| | * | | Fixup bsaed on review comments | Erik Johnston | 2019-05-17 | 3 | -19/+19 |
| | * | | Add basic editing support | Erik Johnston | 2019-05-16 | 4 | -15/+167 |
| |/ / | |||||
| * | | Merge pull request #5192 from matrix-org/erikj/relations_aggregations | Erik Johnston | 2019-05-16 | 9 | -27/+706 |
| |\ \ | |||||
| | * | | Move parsing of tokens out of storage layer | Erik Johnston | 2019-05-16 | 2 | -14/+21 |
| | * | | Indirect tuple conversion | Erik Johnston | 2019-05-16 | 1 | -0/+6 |
| | * | | Check that event is visible in new APIs | Erik Johnston | 2019-05-16 | 2 | -3/+16 |
| | * | | Fix relations in worker mode | Erik Johnston | 2019-05-16 | 5 | -13/+28 |
| | * | | Add cache to relations | Erik Johnston | 2019-05-16 | 1 | -0/+8 |
| | * | | Add aggregations API | Erik Johnston | 2019-05-16 | 5 | -13/+643 |
| * | | | Merge pull request #5186 from matrix-org/erikj/simple_pagination | Erik Johnston | 2019-05-16 | 9 | -0/+479 |
| |\| | | |||||
| | * | | Actually check for None rather falsey | Erik Johnston | 2019-05-15 | 1 | -2/+2 |
| | * | | Actually implement idempotency | Erik Johnston | 2019-05-15 | 1 | -1/+8 |
| | * | | Newsfile | Erik Johnston | 2019-05-15 | 1 | -0/+1 |
| | * | | Add simple pagination API | Erik Johnston | 2019-05-15 | 3 | -0/+160 |
| | * | | Add simple send_relation API and track in DB | Erik Johnston | 2019-05-15 | 8 | -0/+311 |
| |/ / | |||||
| * | | Merge branch 'erikj/refactor_pagination_bounds' into erikj/reactions_base | Erik Johnston | 2019-05-15 | 5 | -63/+122 |
| |\ \ | |||||
| * \ \ | Merge branch 'erikj/fix_config_ratelimiting' into erikj/test | Erik Johnston | 2019-05-14 | 2 | -1/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'erikj/async_serialize_event' into erikj/reactions_rebase | Erik Johnston | 2019-05-14 | 13 | -101/+194 |
| |\ \ \ \ | |||||
* | | | | | | Limit UserIds to a length that fits in a state key (#5198) | ReidAnderson | 2019-05-20 | 4 | -1/+21 |
* | | | | | | fix mapping of return values for get_or_register_3pid_guest (#5177) | bytepoets-blo | 2019-05-17 | 2 | -1/+2 |
* | | | | | | Merge pull request #5191 from matrix-org/erikj/refactor_pagination_bounds | Erik Johnston | 2019-05-17 | 2 | -61/+134 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Spelling and clarifications | Erik Johnston | 2019-05-17 | 1 | -5/+9 |
| * | | | | | | Update docstring | Erik Johnston | 2019-05-16 | 1 | -1/+12 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Newsfile | Erik Johnston | 2019-05-15 | 1 | -0/+1 |
| * | | | | | Make generating SQL bounds for pagination generic | Erik Johnston | 2019-05-15 | 1 | -61/+118 |
* | | | | | | expose SlavedProfileStore to ClientReaderSlavedStore (#5200) | Neil Johnson | 2019-05-17 | 2 | -0/+3 |
* | | | | | | Some vagrant hackery for testing the debs | Richard van der Hoff | 2019-05-17 | 4 | -0/+48 |
* | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2019-05-17 | 3 | -25/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Stop telling people to install the optional dependencies. (#5197) | Richard van der Hoff | 2019-05-17 | 3 | -25/+25 |
* | | | | | | | Merge pull request #5196 from matrix-org/babolivier/per_room_profiles | Brendan Abolivier | 2019-05-17 | 5 | -1/+96 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Lint | Brendan Abolivier | 2019-05-16 | 1 | -1/+0 |
| * | | | | | | Lint | Brendan Abolivier | 2019-05-16 | 1 | -1/+3 |
| * | | | | | | Changelog + sample config | Brendan Abolivier | 2019-05-16 | 2 | -0/+7 |
| * | | | | | | Forgot copyright | Brendan Abolivier | 2019-05-16 | 1 | -0/+1 |
| * | | | | | | Add test case | Brendan Abolivier | 2019-05-16 | 1 | -1/+67 |
| * | | | | | | Add option to disable per-room profiles | Brendan Abolivier | 2019-05-16 | 2 | -0/+20 |
* | | | | | | | Fix image orientation when generating thumbnail (#5039) | PauRE | 2019-05-16 | 4 | -1/+46 |
* | | | | | | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_only | David Baker | 2019-05-16 | 4 | -7/+27 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Terms might not be the last stage | David Baker | 2019-05-13 | 1 | -1/+1 |
| * | | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec... | David Baker | 2019-05-13 | 2 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec... | David Baker | 2019-05-13 | 4 | -31/+47 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | And now I realise why the test is failing... | David Baker | 2019-05-13 | 1 | -1/+8 |
| * | | | | | | | | Update changelog | David Baker | 2019-05-10 | 1 | -1/+1 |
| * | | | | | | | | Re-order flows so that email auth is done last | David Baker | 2019-05-10 | 1 | -4/+12 |
| * | | | | | | | | Thanks, automated grammar pedantry. | David Baker | 2019-05-10 | 1 | -1/+1 |
| * | | | | | | | | Comment | David Baker | 2019-05-10 | 1 | -0/+4 |
| * | | | | | | | | Add changelog entry | David Baker | 2019-05-10 | 1 | -0/+1 |
| * | | | | | | | | Add a DUMMY stage to captcha-only registration flow | David Baker | 2019-05-10 | 1 | -1/+1 |
* | | | | | | | | | Make /sync attempt to return device updates for both joined and invited users... | Matthew Hodgson | 2019-05-16 | 2 | -19/+26 |
* | | | | | | | | | Merge pull request #5187 from matrix-org/dbkr/only_check_threepid_not_in_use_... | David Baker | 2019-05-16 | 2 | -18/+23 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Make newsfile clearer | David Baker | 2019-05-15 | 1 | -1/+1 |
| * | | | | | | | | | Have I got newsfile for you | David Baker | 2019-05-14 | 1 | -0/+1 |
| * | | | | | | | | | Only check 3pids not in use when registering | David Baker | 2019-05-14 | 1 | -18/+22 |
* | | | | | | | | | | Make all the rate limiting options more consistent (#5181) | Amber Brown | 2019-05-15 | 8 | -131/+138 |
* | | | | | | | | | | Drop support for v2_alpha API prefix (#5190) | Richard van der Hoff | 2019-05-15 | 8 | -26/+21 |
* | | | | | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-05-15 | 3 | -8/+16 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | / / / / | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | fix some typos in the changelog v0.99.4 github/release-v0.99.4 release-v0.99.4 | Richard van der Hoff | 2019-05-15 | 1 | -5/+4 |
| * | | | | | | | | 0.99.4 | Richard van der Hoff | 2019-05-15 | 3 | -3/+12 |
* | | | | | | | | | Merge pull request #5183 from matrix-org/erikj/async_serialize_event | Erik Johnston | 2019-05-15 | 13 | -101/+194 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update docstring with correct return type | Erik Johnston | 2019-05-15 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Newsfile | Erik Johnston | 2019-05-14 | 2 | -6/+7 |
| * | | | | | | | | Allow client event serialization to be async | Erik Johnston | 2019-05-14 | 12 | -95/+187 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_array | Erik Johnston | 2019-05-15 | 7 | -30/+55 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update docstring with correct type | Erik Johnston | 2019-05-15 | 1 | -1/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Newsfile | Erik Johnston | 2019-05-14 | 1 | -0/+1 |
| * | | | | | | | Expose DataStore._get_events as get_events_as_list | Erik Johnston | 2019-05-14 | 6 | -30/+54 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #5185 from matrix-org/erikj/fix_config_ratelimiting | Erik Johnston | 2019-05-15 | 2 | -1/+3 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Newsfile | Erik Johnston | 2019-05-14 | 1 | -0/+1 |
| * | | | | | | Use correct config option for ratelimiting in tests | Erik Johnston | 2019-05-14 | 1 | -1/+2 |
| |/ / / / / | |||||
* / / / / / | comment about user_joined_room | Richard van der Hoff | 2019-05-14 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Migrate all tests to use the dict-based config format instead of hanging item... | Amber Brown | 2019-05-13 | 23 | -203/+240 |
* | | | | | Add ability to blacklist ip ranges for federation traffic (#5043) | Andrew Morgan | 2019-05-13 | 6 | -14/+168 |
|/ / / / | |||||
* | | / | 0.99.4rc1 v0.99.4rc1 | Brendan Abolivier | 2019-05-13 | 75 | -78/+83 |
| |_|/ |/| | | |||||
* | | | Merge pull request #5179 from matrix-org/babolivier/isort | Brendan Abolivier | 2019-05-13 | 2 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix changelog | Brendan Abolivier | 2019-05-13 | 1 | -0/+0 |
| * | | Changelog | Brendan Abolivier | 2019-05-13 | 1 | -0/+1 |
| * | | Fix CI after new release of isort | Brendan Abolivier | 2019-05-13 | 1 | -1/+0 |
|/ / | |||||
* | | Merge branch 'master' into develop | Richard van der Hoff | 2019-05-10 | 0 | -0/+0 |
|\ \ | |||||
| * | | fix sample config | Richard van der Hoff | 2019-05-10 | 1 | -1/+1 |
* | | | URL preview blacklisting fixes (#5155) | Andrew Morgan | 2019-05-10 | 4 | -31/+47 |
| |/ |/| | |||||
* | | Revert 085ae346ace418e0fc043ac5f568f85ebf80038e | David Baker | 2019-05-10 | 1 | -1/+1 |
* | | Add a DUMMY stage to captcha-only registration flow | David Baker | 2019-05-10 | 1 | -1/+1 |
* | | Make Prometheus snippet less confusing on the metrics collection doc (#4288) | Gergely Polonkai | 2019-05-10 | 1 | -1/+4 |
* | | Set syslog identifiers in systemd units (#5023) | Christoph Müller | 2019-05-10 | 6 | -1/+14 |
* | | Run Black on the tests again (#5170) | Amber Brown | 2019-05-10 | 54 | -1169/+829 |
* | | Add AllowEncodedSlashes to apache (#5068) | colonelkrud | 2019-05-09 | 1 | -0/+2 |
* | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2019-05-09 | 1 | -16/+5 |
|\| | |||||
| * | remove instructions for jessie installation (#5164) | Richard van der Hoff | 2019-05-09 | 1 | -16/+5 |
* | | Run `black` on per_destination_queue | Richard van der Hoff | 2019-05-09 | 1 | -35/+39 |
* | | Limit the number of EDUs in transactions to 100 as expected by receiver (#5138) | Quentin Dufour | 2019-05-09 | 3 | -27/+32 |
* | | Fix bogus imports in tests (#5154) | Brendan Abolivier | 2019-05-08 | 4 | -5/+7 |
* | | add options to require an access_token to GET /profile and /publicRooms on CS... | Matthew Hodgson | 2019-05-08 | 9 | -13/+252 |
* | | Merge pull request #5037 from matrix-org/erikj/limit_inflight_dns | Erik Johnston | 2019-05-08 | 2 | -1/+83 |
|\ \ | |||||
| * | | Newsfile | Erik Johnston | 2019-04-09 | 1 | -0/+1 |
| * | | Limit in flight DNS requests | Erik Johnston | 2019-04-09 | 1 | -1/+82 |
* | | | Do checks on aliases for incoming m.room.aliases events (#5128) | Brendan Abolivier | 2019-05-08 | 7 | -8/+225 |
* | | | Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_invite | Erik Johnston | 2019-05-07 | 2 | -0/+12 |
|\ \ \ | |||||
| * | | | Rate limit early | Erik Johnston | 2019-05-02 | 1 | -2/+3 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_... | Erik Johnston | 2019-04-26 | 108 | -6218/+1842 |
| |\ \ \ | |||||
| * | | | | Newsfile | Erik Johnston | 2019-04-26 | 1 | -0/+1 |
| * | | | | Ratelimit 3pid invites | Erik Johnston | 2019-04-26 | 1 | -0/+10 |
* | | | | | Remove the requirement to authenticate for /admin/server_version. (#5122) | Richard van der Hoff | 2019-05-07 | 5 | -38/+32 |
* | | | | | Fix spelling in server notices admin API docs (#5142) | Travis Ralston | 2019-05-06 | 2 | -1/+2 |
* | | | | | Fix sample config | Richard van der Hoff | 2019-05-06 | 1 | -1/+1 |
* | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-05-03 | 9 | -19/+84 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge tag 'v0.99.3.2' | Richard van der Hoff | 2019-05-03 | 9 | -19/+84 |
| |\ \ \ \ | |||||
| | * | | | | 0.99.3.2 v0.99.3.2 github/release-v0.99.3.2 release-v0.99.3.2 | Richard van der Hoff | 2019-05-03 | 4 | -2/+16 |
| | * | | | | include disco in deb build target list | Richard van der Hoff | 2019-05-03 | 1 | -0/+1 |
| | * | | | | Merge pull request #5135 from matrix-org/rav/build_fixes | Richard van der Hoff | 2019-05-03 | 3 | -1/+11 |
| | |\ \ \ \ | |||||
| | | * | | | | changelog | Richard van der Hoff | 2019-05-03 | 1 | -0/+1 |
| | | * | | | | Debian: we now need libpq-dev. | Richard van der Hoff | 2019-05-03 | 1 | -1/+2 |
| | | * | | | | pin urllib3 to <1.25 | Richard van der Hoff | 2019-05-03 | 1 | -0/+8 |
| | |/ / / / | |||||
| | * | | | | changelog tweaks v0.99.3.1 github/release-v0.99.3.1 release-v0.99.3.1 | Richard van der Hoff | 2019-05-03 | 1 | -2/+4 |
| | * | | | | 0.99.3.1 | Richard van der Hoff | 2019-05-03 | 5 | -3/+16 |
| | * | | | | Merge pull request #5134 from matrix-org/rav/url_preview_blacklist | Richard van der Hoff | 2019-05-03 | 3 | -15/+34 |
| | |\ \ \ \ | |||||
| | | * | | | | more config comment updates | Richard van der Hoff | 2019-05-03 | 2 | -4/+10 |
| | | * | | | | Blacklist 0.0.0.0 and :: by default for URL previews | Richard van der Hoff | 2019-05-03 | 3 | -15/+28 |
| | * | | | | | Merge pull request #5133 from matrix-org/rav/systemrandom | Richard van der Hoff | 2019-05-03 | 2 | -2/+8 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | typo | Neil Johnson | 2019-05-03 | 1 | -1/+1 |
| | | * | | | | Use SystemRandom for token generation | Richard van der Hoff | 2019-05-03 | 2 | -2/+8 |
* | | | | | | | Add admin api for sending server_notices (#5121) | Richard van der Hoff | 2019-05-02 | 21 | -42/+196 |
* | | | | | | | Merge pull request #5124 from matrix-org/babolivier/aliases | Brendan Abolivier | 2019-05-02 | 5 | -2/+40 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add some limitations to alias creation | Brendan Abolivier | 2019-05-02 | 5 | -2/+40 |
* | | | | | | | | Factor out an "assert_requester_is_admin" function (#5120) | Richard van der Hoff | 2019-05-02 | 4 | -76/+81 |
* | | | | | | | | Merge pull request #5119 from matrix-org/rav/admin_api_urls | Richard van der Hoff | 2019-05-02 | 30 | -114/+180 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | fix examples | Richard van der Hoff | 2019-05-01 | 1 | -4/+4 |
| * | | | | | | | Fix sample config | Richard van der Hoff | 2019-05-01 | 1 | -2/+2 |
| * | | | | | | | changelog | Richard van der Hoff | 2019-05-01 | 1 | -0/+1 |
| * | | | | | | | Move admin api impl to its own package | Richard van der Hoff | 2019-05-01 | 19 | -42/+67 |
| * | | | | | | | Move admin API to a new prefix | Richard van der Hoff | 2019-05-01 | 12 | -36/+76 |
| * | | | | | | | Move admin API away from ClientV1RestServlet | Richard van der Hoff | 2019-05-01 | 1 | -33/+33 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #5116 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-05-01 | 2 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Rename changelog file | Brendan Abolivier | 2019-05-01 | 1 | -0/+0 |
| * | | | | | | | Add changelog | Brendan Abolivier | 2019-05-01 | 1 | -0/+1 |
| * | | | | | | | Fix whole path for admin route | Brendan Abolivier | 2019-05-01 | 1 | -1/+1 |
| * | | | | | | | Fix typo in account validity admin route | Brendan Abolivier | 2019-05-01 | 1 | -1/+1 |
* | | | | | | | | Add a default .m.rule.tombstone push rule (#4867) | Travis Ralston | 2019-04-29 | 2 | -0/+18 |
* | | | | | | | | Merge pull request #5100 from matrix-org/rav/verification_hackery | Richard van der Hoff | 2019-04-29 | 3 | -18/+55 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2019-04-25 | 1 | -0/+1 |
| * | | | | | | | more logging improvements | Richard van der Hoff | 2019-04-25 | 1 | -8/+11 |
| * | | | | | | | remove extraneous exception logging | Richard van der Hoff | 2019-04-25 | 2 | -18/+34 |
| * | | | | | | | Clarify logging when PDU signature checking fails | Richard van der Hoff | 2019-04-25 | 2 | -3/+20 |
* | | | | | | | | Merge pull request #5103 from matrix-org/rav/fix_notif_loop | Richard van der Hoff | 2019-04-26 | 3 | -0/+24 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix infinite loop in presence handler | Richard van der Hoff | 2019-04-26 | 3 | -0/+24 |
|/ / / / / / / | |||||
* | | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2019-04-25 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | add gpg key fingerprint | Richard van der Hoff | 2019-04-22 | 1 | -0/+2 |
* | | | | | | | Merge pull request #5098 from matrix-org/rav/fix_pep_517 | Richard van der Hoff | 2019-04-25 | 3 | -2/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Changelog | Richard van der Hoff | 2019-04-25 | 1 | -0/+1 |
| * | | | | | | | Add --no-pep-517 to README instructions | Richard van der Hoff | 2019-04-25 | 1 | -2/+2 |
| * | | | | | | | set PIP_USE_PEP517 = False for tests | Richard van der Hoff | 2019-04-25 | 1 | -0/+5 |
* | | | | | | | | Fix handling of SYNAPSE_NO_TLS in docker image (#5005) | *=0=1=4=* | 2019-04-25 | 3 | -2/+16 |
|/ / / / / / / | |||||
* | | | | | | | Config option for verifying federation certificates (MSC 1711) (#4967) | Andrew Morgan | 2019-04-25 | 8 | -17/+158 |
* | | | | | | | Remove log error for .well-known/matrix/client (#4972) | Michael Kaye | 2019-04-24 | 2 | -1/+2 |
* | | | | | | | Prevent "producer not unregistered" message (#5009) | Amber Brown | 2019-04-24 | 2 | -0/+5 |
* | | | | | | | Merge pull request #5077 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-18 | 2 | -2/+7 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Don't crash on lack of expiry templates | Brendan Abolivier | 2019-04-18 | 2 | -2/+7 |
* | | | | | | | Merge remote-tracking branch 'origin/master' into develop | Richard van der Hoff | 2019-04-17 | 1 | -4/+24 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Update debian install docs for new key and repo (#5074) | Richard van der Hoff | 2019-04-17 | 1 | -5/+25 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #5073 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-17 | 8 | -26/+246 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou... | Erik Johnston | 2019-04-17 | 216 | -10038/+5057 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #5047 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-17 | 17 | -43/+699 |
|\ \ \ \ \ \ | |||||
* \ \ \ \ \ \ | Merge pull request #5071 from matrix-org/babolivier/3pid-check | Brendan Abolivier | 2019-04-17 | 2 | -0/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make sure we're not registering the same 3pid twice | Brendan Abolivier | 2019-04-17 | 2 | -0/+19 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #5070 from matrix-org/erikj/postpath | Erik Johnston | 2019-04-17 | 2 | -8/+9 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Newsfile | Erik Johnston | 2019-04-16 | 1 | -0/+1 |
| * | | | | | | Remove usage of request.postpath | Erik Johnston | 2019-04-16 | 1 | -8/+8 |
* | | | | | | | Merge pull request #5065 from matrix-org/erikj/fix_versions | Erik Johnston | 2019-04-16 | 2 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Newsfile | Erik Johnston | 2019-04-15 | 1 | -0/+1 |
| * | | | | | | | VersionRestServlet doesn't take a param | Erik Johnston | 2019-04-15 | 1 | -1/+1 |
* | | | | | | | | Use packages.matrix.org for packages (#5067) | Travis Ralston | 2019-04-16 | 2 | -3/+4 |
* | | | | | | | | Add systemd-python to optional dependencies (#4339) | Silke Hofstra | 2019-04-16 | 4 | -10/+13 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #5063 from matrix-org/erikj/move_endpoints | Erik Johnston | 2019-04-15 | 4 | -4/+21 |
|\| | | | | | | |||||
| * | | | | | | Only handle GET requests for /push_rules | Erik Johnston | 2019-04-15 | 2 | -0/+10 |
| * | | | | | | Newsfile | Erik Johnston | 2019-04-15 | 1 | -0/+1 |
| * | | | | | | Move some rest endpoints to client reader | Erik Johnston | 2019-04-15 | 2 | -4/+10 |
* | | | | | | | update grafana dashboard | Richard van der Hoff | 2019-04-13 | 1 | -5211/+1 |
* | | | | | | | Remove periods from copyright headers (#5046) | Andrew Morgan | 2019-04-11 | 12 | -11/+12 |
* | | | | | | | Merge pull request #5033 from matrix-org/erikj/fix_schema_delta | Erik Johnston | 2019-04-10 | 2 | -1/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Newsfile | Erik Johnston | 2019-04-09 | 1 | -0/+1 |
| * | | | | | | | Fix schema upgrade when dropping tables | Erik Johnston | 2019-04-09 | 1 | -1/+3 |
* | | | | | | | | Fix disappearing exceptions in manhole. (#5035) | Richard van der Hoff | 2019-04-10 | 2 | -2/+58 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #5027 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-09 | 9 | -3/+143 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #5030 from matrix-org/rav/rewrite_g_s_v_k | Richard van der Hoff | 2019-04-09 | 5 | -91/+136 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2019-04-09 | 1 | -0/+1 |
| * | | | | | | | Rewrite Datastore.get_server_verify_keys | Richard van der Hoff | 2019-04-09 | 3 | -52/+113 |
| * | | | | | | | Rewrite test_keys as a HomeserverTestCase | Richard van der Hoff | 2019-04-08 | 1 | -19/+15 |
| * | | | | | | | Replace SlavedKeyStore with a shim | Richard van der Hoff | 2019-04-08 | 1 | -14/+4 |
| * | | | | | | | Remove redundant merged_keys dict | Richard van der Hoff | 2019-04-08 | 1 | -8/+5 |
* | | | | | | | | Bump psycopg requirement (#5032) | Richard van der Hoff | 2019-04-09 | 2 | -1/+4 |
|/ / / / / / / | |||||
* | | | | | | | Remove unused server_tls_certificates functions (#5028) | Richard van der Hoff | 2019-04-08 | 6 | -63/+7 |
* | | | | | | | add context to phonehome stats (#5020) | Neil Johnson | 2019-04-08 | 4 | -1/+9 |
* | | | | | | | Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeys | Richard van der Hoff | 2019-04-08 | 3 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix from_server buglet in get_keys_from_perspectives | Richard van der Hoff | 2019-04-08 | 3 | -1/+3 |
* | | | | | | | | drop tables listed in #1830 (#4992) | Neil Johnson | 2019-04-08 | 26 | -757/+43 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #5001 from matrix-org/rav/keyring_cleanups | Richard van der Hoff | 2019-04-08 | 4 | -33/+181 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | changelog | Richard van der Hoff | 2019-04-04 | 1 | -0/+1 |
| * | | | | | | | Hoist server_name check out of process_v2_response | Richard van der Hoff | 2019-04-04 | 1 | -13/+7 |
| * | | | | | | | Clean up Keyring.process_v2_response | Richard van der Hoff | 2019-04-04 | 1 | -23/+46 |
| * | | | | | | | test for get_keys_from_perspectives | Richard van der Hoff | 2019-04-04 | 1 | -0/+67 |
| * | | | | | | | add a test for get_keys_from_server | Richard van der Hoff | 2019-04-04 | 1 | -0/+63 |
| * | | | | | | | Fix docstring on get_server_keys_json | Richard van der Hoff | 2019-04-04 | 1 | -2/+2 |
* | | | | | | | | Add config option to block users from looking up 3PIDs (#5010) | Brendan Abolivier | 2019-04-04 | 6 | -1/+81 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Clean up the database pagination code (#5007) | Amber Brown | 2019-04-05 | 3 | -67/+64 |
* | | | | | | | Merge pull request #5002 from matrix-org/erikj/delete_group | Erik Johnston | 2019-04-04 | 6 | -0/+275 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Newsfile | Erik Johnston | 2019-04-03 | 1 | -0/+1 |
| * | | | | | | | Add unit test for deleting groups | Erik Johnston | 2019-04-03 | 1 | -0/+124 |
| * | | | | | | | Add admin API for group deletion | Erik Johnston | 2019-04-03 | 2 | -0/+40 |
| * | | | | | | | Add functions to delete a group | Erik Johnston | 2019-04-03 | 2 | -0/+110 |
* | | | | | | | | Prevent kicking users who aren't in the room (#4999) | Andrew Morgan | 2019-04-04 | 2 | -0/+10 |
* | | | | | | | | Avoid redundant URL encoding (#4555) | Marcel Krüger | 2019-04-04 | 2 | -1/+2 |
* | | | | | | | | Merge pull request #5004 from ajensenwaud/develop | Erik Johnston | 2019-04-04 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix issue #4596 | Anders | 2019-04-03 | 2 | -1/+2 |
* | | | | | | | | | Correct default POSTGRES_USER in Docker README (#4987) | *=0=1=4=* | 2019-04-04 | 2 | -2/+4 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Fix grammar and document get_current_users_in_room (#4998) | Andrew Morgan | 2019-04-03 | 13 | -20/+32 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Rewrite KeyringTestCase as a HomeServerTestCase (#4986) | Richard van der Hoff | 2019-04-03 | 2 | -107/+105 |
* | | | | | | | Remove presence lists (#4989) | Neil Johnson | 2019-04-03 | 9 | -456/+23 |
* | | | | | | | Merge pull request #4982 from matrix-org/erikj/msc1915 | Erik Johnston | 2019-04-03 | 7 | -17/+216 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Correctly handle id_server param | Erik Johnston | 2019-04-02 | 1 | -0/+1 |
| * | | | | | | | Remove threepid binding if id server returns 400/404/501 | Erik Johnston | 2019-04-02 | 1 | -9/+10 |
| * | | | | | | | Fixup docstrings | Erik Johnston | 2019-04-02 | 3 | -7/+9 |
| * | | | | | | | Newsfile | Erik Johnston | 2019-04-01 | 1 | -0/+1 |
| * | | | | | | | Add unbind API to /r0 as it is now stabalised | Erik Johnston | 2019-04-01 | 1 | -1/+1 |
| * | | | | | | | Grandfather in existing user threepids | Erik Johnston | 2019-04-01 | 2 | -0/+37 |
| * | | | | | | | Allowing specifying IS to use in unbind API. | Erik Johnston | 2019-04-01 | 4 | -8/+20 |
| * | | | | | | | For unbind poke IS used during binding of 3PID | Erik Johnston | 2019-04-01 | 1 | -9/+35 |