Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 0.99.5.1 v0.99.5.1 | Neil Johnson | 2019-05-22 | 1 | -1/+1 |
* | Revert "0.99.5" | Neil Johnson | 2019-05-22 | 1 | -1/+1 |
* | 0.99.5 | Neil Johnson | 2019-05-22 | 1 | -1/+1 |
* | 0.99.5 v0.99.5 | Neil Johnson | 2019-05-22 | 1 | -1/+1 |
* | Merge commit 'f4c80d70f' into release-v0.99.5 | Richard van der Hoff | 2019-05-21 | 2 | -5/+61 |
|\ | |||||
| * | Merge pull request #5203 from matrix-org/erikj/aggregate_by_sender | Erik Johnston | 2019-05-21 | 1 | -1/+1 |
| |\ | |||||
| | * | Only count aggregations from distinct senders | Erik Johnston | 2019-05-17 | 1 | -1/+1 |
| * | | Merge pull request #5212 from matrix-org/erikj/deny_multiple_reactions | Erik Johnston | 2019-05-21 | 2 | -4/+60 |
| |\ \ | |||||
| | * | | Fix words | Erik Johnston | 2019-05-21 | 1 | -3/+3 |
| | * | | Block attempts to annotate the same event twice | Erik Johnston | 2019-05-20 | 2 | -4/+60 |
* | | | | 0.99.5rc1 | Richard van der Hoff | 2019-05-21 | 1 | -1/+1 |
|/ / / | |||||
* | | | Introduce room v4 which updates event ID format. (#5217) | Richard van der Hoff | 2019-05-21 | 1 | -4/+4 |
* | | | Exclude soft-failed events from fwd-extremity candidates. (#5146) | Richard van der Hoff | 2019-05-21 | 2 | -3/+13 |
* | | | Pin eliot to <1.8 on python 3.5.2 (#5218) | Richard van der Hoff | 2019-05-21 | 1 | -6/+34 |
* | | | Merge pull request #5204 from matrix-org/babolivier/account_validity_expirati... | Brendan Abolivier | 2019-05-21 | 3 | -12/+70 |
|\ \ \ | |||||
| * | | | Doc | Brendan Abolivier | 2019-05-21 | 1 | -0/+8 |
| * | | | Do the select and insert in a single transaction | Brendan Abolivier | 2019-05-21 | 1 | -10/+6 |
| * | | | Add startup background job for account validity | Brendan Abolivier | 2019-05-17 | 2 | -12/+66 |
* | | | | Fix error handling for rooms whose versions are unknown. (#5219) | Richard van der Hoff | 2019-05-21 | 4 | -7/+37 |
| |/ / |/| | | |||||
* | | | Revert "expose SlavedProfileStore to ClientReaderSlavedStore (#5200)" | Richard van der Hoff | 2019-05-20 | 1 | -2/+0 |
* | | | Add a test room version which updates event ID format (#5210) | Richard van der Hoff | 2019-05-20 | 2 | -3/+33 |
* | | | Rename relation types to match MSC | Erik Johnston | 2019-05-20 | 3 | -9/+9 |
* | | | Merge pull request #5209 from matrix-org/erikj/reactions_base | Erik Johnston | 2019-05-20 | 12 | -16/+899 |
|\ \ \ | |||||
| * | | | Correctly update aggregation counts after redaction | Erik Johnston | 2019-05-20 | 2 | -0/+20 |
| | |/ | |/| | |||||
| * | | Fixup bsaed on review comments | Erik Johnston | 2019-05-17 | 3 | -19/+19 |
| * | | Add basic editing support | Erik Johnston | 2019-05-16 | 3 | -6/+85 |
| * | | 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 | 1 | -2/+15 |
| * | | 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 | 4 | -10/+395 |
| * | | 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 |
| * | | Add simple pagination API | Erik Johnston | 2019-05-15 | 2 | -0/+130 |
| * | | Add simple send_relation API and track in DB | Erik Johnston | 2019-05-15 | 7 | -0/+213 |
* | | | Limit UserIds to a length that fits in a state key (#5198) | ReidAnderson | 2019-05-20 | 2 | -1/+13 |
* | | | fix mapping of return values for get_or_register_3pid_guest (#5177) | bytepoets-blo | 2019-05-17 | 1 | -1/+1 |
* | | | Merge pull request #5191 from matrix-org/erikj/refactor_pagination_bounds | Erik Johnston | 2019-05-17 | 1 | -61/+133 |
|\ \ \ | |||||
| * | | | Spelling and clarifications | Erik Johnston | 2019-05-17 | 1 | -5/+9 |
| * | | | Update docstring | Erik Johnston | 2019-05-16 | 1 | -1/+12 |
| |/ / | |||||
| * | | 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 | 1 | -0/+2 |
* | | | Merge pull request #5196 from matrix-org/babolivier/per_room_profiles | Brendan Abolivier | 2019-05-17 | 2 | -0/+20 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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 | 3 | -1/+45 |
* | | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_only | David Baker | 2019-05-16 | 1 | -5/+17 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec... | David Baker | 2019-05-13 | 1 | -1/+0 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec... | David Baker | 2019-05-13 | 2 | -20/+35 |
| |\ \ \ | |||||
| * | | | | Re-order flows so that email auth is done last | David Baker | 2019-05-10 | 1 | -4/+12 |
| * | | | | Comment | David Baker | 2019-05-10 | 1 | -0/+4 |
| * | | | | 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 | 1 | -19/+25 |
* | | | | | Merge pull request #5187 from matrix-org/dbkr/only_check_threepid_not_in_use_... | David Baker | 2019-05-16 | 1 | -18/+22 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | 5 | -91/+104 |
* | | | | | | Drop support for v2_alpha API prefix (#5190) | Richard van der Hoff | 2019-05-15 | 7 | -26/+20 |
* | | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-05-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | 0.99.4 | Richard van der Hoff | 2019-05-15 | 1 | -1/+1 |
* | | | | | | Merge pull request #5183 from matrix-org/erikj/async_serialize_event | Erik Johnston | 2019-05-15 | 12 | -101/+193 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update docstring with correct return type | Erik Johnston | 2019-05-15 | 1 | -1/+1 |
| * | | | | | | Newsfile | Erik Johnston | 2019-05-14 | 1 | -6/+6 |
| * | | | | | | 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 | 5 | -29/+53 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update docstring with correct type | Erik Johnston | 2019-05-15 | 1 | -1/+1 |
| * | | | | | | Expose DataStore._get_events as get_events_as_list | Erik Johnston | 2019-05-14 | 5 | -29/+53 |
| |/ / / / / | |||||
* / / / / / | 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 | 1 | -0/+1 |
* | | | | | Add ability to blacklist ip ranges for federation traffic (#5043) | Andrew Morgan | 2019-05-13 | 3 | -14/+78 |
|/ / / / | |||||
* | | / | 0.99.4rc1 v0.99.4rc1 | Brendan Abolivier | 2019-05-13 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Fix CI after new release of isort | Brendan Abolivier | 2019-05-13 | 1 | -1/+0 |
| |/ |/| | |||||
* | | URL preview blacklisting fixes (#5155) | Andrew Morgan | 2019-05-10 | 2 | -20/+35 |
|/ | |||||
* | 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 |
* | 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 | 2 | -27/+31 |
* | add options to require an access_token to GET /profile and /publicRooms on CS... | Matthew Hodgson | 2019-05-08 | 5 | -12/+114 |
* | Merge pull request #5037 from matrix-org/erikj/limit_inflight_dns | Erik Johnston | 2019-05-08 | 1 | -1/+82 |
|\ | |||||
| * | 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 | 5 | -8/+55 |
* | | Merge pull request #5104 from matrix-org/erikj/ratelimit_3pid_invite | Erik Johnston | 2019-05-07 | 1 | -0/+11 |
|\ \ | |||||
| * | | 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 | 63 | -959/+1158 |
| |\ \ | |||||
| * | | | 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 | 1 | -10/+5 |
* | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-05-03 | 4 | -13/+37 |
|\ \ \ \ | |||||
| * | | | | 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 | 1 | -1/+1 |
| * | | | | pin urllib3 to <1.25 | Richard van der Hoff | 2019-05-03 | 1 | -0/+8 |
| * | | | | 0.99.3.1 | Richard van der Hoff | 2019-05-03 | 1 | -1/+1 |
| * | | | | Merge pull request #5134 from matrix-org/rav/url_preview_blacklist | Richard van der Hoff | 2019-05-03 | 1 | -10/+21 |
| |\ \ \ \ | |||||
| | * | | | | more config comment updates | Richard van der Hoff | 2019-05-03 | 1 | -2/+5 |
| | * | | | | Blacklist 0.0.0.0 and :: by default for URL previews | Richard van der Hoff | 2019-05-03 | 1 | -10/+18 |
| * | | | | | Merge pull request #5133 from matrix-org/rav/systemrandom | Richard van der Hoff | 2019-05-03 | 1 | -2/+7 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Use SystemRandom for token generation | Richard van der Hoff | 2019-05-03 | 1 | -2/+7 |
* | | | | | | Add admin api for sending server_notices (#5121) | Richard van der Hoff | 2019-05-02 | 3 | -3/+118 |
* | | | | | | Merge pull request #5124 from matrix-org/babolivier/aliases | Brendan Abolivier | 2019-05-02 | 3 | -2/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add some limitations to alias creation | Brendan Abolivier | 2019-05-02 | 3 | -2/+34 |
* | | | | | | | Factor out an "assert_requester_is_admin" function (#5120) | Richard van der Hoff | 2019-05-02 | 3 | -76/+80 |
* | | | | | | | fix examples | Richard van der Hoff | 2019-05-01 | 1 | -4/+4 |
* | | | | | | | Move admin api impl to its own package | Richard van der Hoff | 2019-05-01 | 3 | -5/+4 |
* | | | | | | | Move admin API to a new prefix | Richard van der Hoff | 2019-05-01 | 4 | -24/+64 |
* | | | | | | | Move admin API away from ClientV1RestServlet | Richard van der Hoff | 2019-05-01 | 1 | -33/+33 |
|/ / / / / / | |||||
* | | | | | | Add a default .m.rule.tombstone push rule (#4867) | Travis Ralston | 2019-04-29 | 1 | -0/+17 |
* | | | | | | Merge pull request #5100 from matrix-org/rav/verification_hackery | Richard van der Hoff | 2019-04-29 | 2 | -18/+54 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | 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 |
* | | | | | | Fix infinite loop in presence handler | Richard van der Hoff | 2019-04-26 | 2 | -0/+23 |
|/ / / / / | |||||
* | | | | | Config option for verifying federation certificates (MSC 1711) (#4967) | Andrew Morgan | 2019-04-25 | 4 | -15/+121 |
* | | | | | Remove log error for .well-known/matrix/client (#4972) | Michael Kaye | 2019-04-24 | 1 | -1/+1 |
* | | | | | Prevent "producer not unregistered" message (#5009) | Amber Brown | 2019-04-24 | 1 | -0/+4 |
* | | | | | Don't crash on lack of expiry templates | Brendan Abolivier | 2019-04-18 | 1 | -2/+6 |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou... | Erik Johnston | 2019-04-17 | 139 | -4477/+4027 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #5047 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-17 | 14 | -39/+573 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #5071 from matrix-org/babolivier/3pid-check | Brendan Abolivier | 2019-04-17 | 1 | -0/+18 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Make sure we're not registering the same 3pid twice | Brendan Abolivier | 2019-04-17 | 1 | -0/+18 |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #5070 from matrix-org/erikj/postpath | Erik Johnston | 2019-04-17 | 1 | -8/+8 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | 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 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | VersionRestServlet doesn't take a param | Erik Johnston | 2019-04-15 | 1 | -1/+1 |
| * | | | | | | | Add systemd-python to optional dependencies (#4339) | Silke Hofstra | 2019-04-16 | 1 | -5/+9 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #5063 from matrix-org/erikj/move_endpoints | Erik Johnston | 2019-04-15 | 2 | -4/+14 |
| |\| | | | | | |||||
| | * | | | | | Only handle GET requests for /push_rules | Erik Johnston | 2019-04-15 | 1 | -0/+7 |
| | * | | | | | Move some rest endpoints to client reader | Erik Johnston | 2019-04-15 | 1 | -4/+7 |
| * | | | | | | Remove periods from copyright headers (#5046) | Andrew Morgan | 2019-04-11 | 9 | -9/+9 |
| * | | | | | | Merge pull request #5033 from matrix-org/erikj/fix_schema_delta | Erik Johnston | 2019-04-10 | 1 | -1/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | 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 | 1 | -2/+57 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge pull request #5027 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-09 | 5 | -0/+84 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #5030 from matrix-org/rav/rewrite_g_s_v_k | Richard van der Hoff | 2019-04-09 | 3 | -71/+72 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Rewrite Datastore.get_server_verify_keys | Richard van der Hoff | 2019-04-09 | 2 | -49/+63 |
| | * | | | | | | 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 | 1 | -1/+3 |
| |/ / / / / / | |||||
| * | | | | | | Remove unused server_tls_certificates functions (#5028) | Richard van der Hoff | 2019-04-08 | 4 | -62/+5 |
| * | | | | | | add context to phonehome stats (#5020) | Neil Johnson | 2019-04-08 | 2 | -1/+5 |
| * | | | | | | Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeys | Richard van der Hoff | 2019-04-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix from_server buglet in get_keys_from_perspectives | Richard van der Hoff | 2019-04-08 | 1 | -1/+1 |
| * | | | | | | | drop tables listed in #1830 (#4992) | Neil Johnson | 2019-04-08 | 24 | -752/+42 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #5001 from matrix-org/rav/keyring_cleanups | Richard van der Hoff | 2019-04-08 | 2 | -33/+50 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | 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 |
| | * | | | | | | 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 | 2 | -0/+10 |
| | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Clean up the database pagination code (#5007) | Amber Brown | 2019-04-05 | 2 | -67/+63 |
| * | | | | | | Merge pull request #5002 from matrix-org/erikj/delete_group | Erik Johnston | 2019-04-04 | 3 | -0/+136 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add admin API for group deletion | Erik Johnston | 2019-04-03 | 1 | -0/+26 |
| | * | | | | | | 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 | 1 | -0/+9 |
| * | | | | | | | Avoid redundant URL encoding (#4555) | Marcel Krüger | 2019-04-04 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * / / / / / | Fix grammar and document get_current_users_in_room (#4998) | Andrew Morgan | 2019-04-03 | 11 | -18/+29 |
| |/ / / / / | |||||
| * | | | | | Remove presence lists (#4989) | Neil Johnson | 2019-04-03 | 7 | -338/+22 |
| * | | | | | Merge pull request #4982 from matrix-org/erikj/msc1915 | Erik Johnston | 2019-04-03 | 6 | -17/+215 |
| |\ \ \ \ \ | |||||
| | * | | | | | 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 |
| | * | | | | | 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 |
| | * | | | | | Track IS used to bind 3PIDs | Erik Johnston | 2019-04-01 | 3 | -0/+119 |
| * | | | | | | Run black on the rest of the storage module (#4996) | Amber Brown | 2019-04-03 | 41 | -2455/+2130 |
| * | | | | | | Merge pull request #4991 from matrix-org/erikj/stagger_push_startup | Erik Johnston | 2019-04-02 | 4 | -8/+73 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Make starting pushers faster during start up | Erik Johnston | 2019-04-02 | 4 | -8/+73 |
| * | | | | | | | Transfer related groups on room upgrade (#4990) | Andrew Morgan | 2019-04-02 | 2 | -0/+2 |
| * | | | | | | | Add config.signing_key_path. (#4974) | Richard van der Hoff | 2019-04-02 | 1 | -1/+2 |
| |/ / / / / / | |||||
| * | | | | | | Fix sync bug when accepting invites (#4956) | Richard van der Hoff | 2019-04-02 | 3 | -20/+40 |
| * | | | | | | Merge branch 'master' into develop | Neil Johnson | 2019-04-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Collect room-version variations into one place (#4969) | Richard van der Hoff | 2019-04-01 | 18 | -142/+188 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #4955 from matrix-org/rav/merge_state_into_events | Richard van der Hoff | 2019-03-28 | 8 | -49/+140 |
| |\ \ \ \ \ | |||||
| | * | | | | | Combine the CurrentStateDeltaStream into the EventStream | Richard van der Hoff | 2019-03-27 | 5 | -33/+43 |
| | * | | | | | Make EventStream rows have a type | Richard van der Hoff | 2019-03-27 | 4 | -17/+98 |
| * | | | | | | Merge pull request #4954 from matrix-org/rav/refactor_parse_row | Richard van der Hoff | 2019-03-28 | 3 | -5/+21 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'origin/develop' into rav/refactor_parse_row | Richard van der Hoff | 2019-03-28 | 2 | -380/+335 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Skip building a ROW_TYPE when building updates | Richard van der Hoff | 2019-03-27 | 1 | -2/+2 |
| | * | | | | | | Add parse_row method to replication stream class | Richard van der Hoff | 2019-03-27 | 3 | -3/+19 |
| * | | | | | | | remove log line for password (#4965) | Neil Johnson | 2019-03-28 | 1 | -2/+0 |
| * | | | | | | | Allow password providers to bind emails (#4947) | Andrew Morgan | 2019-03-28 | 2 | -4/+22 |
| * | | | | | | | Merge pull request #4942 from matrix-org/erikj/fix_presence | Erik Johnston | 2019-03-28 | 3 | -32/+236 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Use an assert | Erik Johnston | 2019-03-28 | 1 | -2/+1 |
| | * | | | | | | Review comments | Erik Johnston | 2019-03-28 | 1 | -44/+62 |
| | * | | | | | | Use event streams to calculate presence | Erik Johnston | 2019-03-27 | 3 | -32/+219 |
| * | | | | | | | Merge pull request #4953 from matrix-org/rav/refactor_replication_streams | Richard van der Hoff | 2019-03-28 | 6 | -76/+133 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | move FederationStream out to its own file | Richard van der Hoff | 2019-03-27 | 4 | -23/+43 |
| | * | | | | | | move EventsStream out to its own file | Richard van der Hoff | 2019-03-27 | 3 | -23/+42 |
| | * | | | | | | Move replication.tcp.streams into a package | Richard van der Hoff | 2019-03-27 | 3 | -34/+52 |
| * | | | | | | | Run `black` on some storage modules that the stats branch touches (#4959) | Amber Brown | 2019-03-29 | 2 | -380/+335 |
| |/ / / / / / | |||||
| * / / / / / | Fix/improve some docstrings in the replication code. (#4949) | Richard van der Hoff | 2019-03-27 | 2 | -7/+19 |
| |/ / / / / | |||||
* | | | / / | Add management endpoints for account validity | Brendan Abolivier | 2019-04-17 | 5 | -18/+116 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Send out emails with links to extend an account's validity period | Brendan Abolivier | 2019-04-17 | 14 | -39/+573 |
| |_|/ / |/| | | | |||||
* | | | | Add account expiration feature | Brendan Abolivier | 2019-04-09 | 6 | -1/+85 |
| |/ / |/| | | |||||
* | | | 0.99.3 v0.99.3 github/release-v0.99.3 release-v0.99.3 | Neil Johnson | 2019-04-01 | 1 | -1/+1 |
* | | | bump version | Neil Johnson | 2019-03-27 | 1 | -1/+1 |
|/ / | |||||
* | | Support 3PID login in password providers (#4931) | Andrew Morgan | 2019-03-26 | 6 | -26/+122 |
* | | Use the state event amount for userdir import batching, not room count (#4944) | Amber Brown | 2019-03-27 | 1 | -8/+20 |
* | | Make federation endpoints more tolerant of trailing slashes v2 (#4935) | Andrew Morgan | 2019-03-26 | 3 | -8/+9 |
* | | Fix ClientReplicationStreamProtocol.__str__ (#4929) | Richard van der Hoff | 2019-03-25 | 2 | -4/+5 |
* | | Fix bug where read-receipts lost their timestamps (#4927) | Richard van der Hoff | 2019-03-25 | 3 | -12/+30 |
* | | Refactor out state delta handling into its own class (#4917) | Amber Brown | 2019-03-25 | 4 | -110/+151 |
* | | Merge pull request #4869 from matrix-org/erikj/yaml_load | Erik Johnston | 2019-03-22 | 3 | -5/+5 |
|\ \ | |||||
| * | | Use yaml safe_load | Erik Johnston | 2019-03-22 | 3 | -5/+5 |
* | | | Remove trailing slashes from outbound federation requests and retry on 400 (#... | Andrew Morgan | 2019-03-21 | 2 | -17/+89 |
|\ \ \ | |/ / |/| | | |||||
| * | | Clean up backoff_on_404 and metehod calls | Andrew Morgan | 2019-03-21 | 1 | -9/+13 |
| * | | kwargs doesn't like commas on calling funcs either. TIL | Andrew Morgan | 2019-03-20 | 1 | -2/+2 |
| * | | lint | Andrew Morgan | 2019-03-20 | 1 | -2/+6 |
| * | | New test, fix issues | Andrew Morgan | 2019-03-20 | 1 | -49/+28 |
| * | | Fix comments. v0.99.2 -> v0.99.3 | Andrew Morgan | 2019-03-20 | 1 | -5/+5 |
| * | | Just return if not doing any trailing slash shennanigans | Andrew Morgan | 2019-03-20 | 1 | -0/+2 |
| * | | lint | Andrew Morgan | 2019-03-18 | 1 | -1/+1 |
| * | | Better exception handling | Andrew Morgan | 2019-03-18 | 1 | -16/+17 |
| * | | Correct var name | Andrew Morgan | 2019-03-13 | 1 | -2/+2 |
| * | | receiving a 400 caused an exception. handle it | Andrew Morgan | 2019-03-13 | 1 | -5/+12 |
| * | | is this what purgatory feels like | Andrew Morgan | 2019-03-13 | 1 | -3/+3 |
| * | | i should have given up x2 | Andrew Morgan | 2019-03-13 | 1 | -18/+13 |
| * | | i should have given up | Andrew Morgan | 2019-03-13 | 1 | -1/+1 |
| * | | there comes a time when you should give up. but you dont | Andrew Morgan | 2019-03-13 | 1 | -1/+1 |
| * | | as above | Andrew Morgan | 2019-03-13 | 1 | -2/+4 |
| * | | no kwargs today | Andrew Morgan | 2019-03-13 | 1 | -7/+12 |
| * | | Or perhaps I was the one who was drunk | Andrew Morgan | 2019-03-13 | 1 | -6/+3 |
| * | | go home python, you're drunk | Andrew Morgan | 2019-03-13 | 1 | -4/+2 |
| * | | Syntax checker is bork | Andrew Morgan | 2019-03-13 | 1 | -6/+5 |
| * | | Destructure again | Andrew Morgan | 2019-03-13 | 1 | -7/+8 |
| * | | Are you happy now | Andrew Morgan | 2019-03-13 | 1 | -2/+2 |
| * | | Syntax test | Andrew Morgan | 2019-03-13 | 1 | -6/+5 |
| * | | Remove testing code | Andrew Morgan | 2019-03-13 | 1 | -3/+0 |
| * | | Add missing docstring detail | Andrew Morgan | 2019-03-13 | 1 | -1/+1 |
| * | | Fix syntax issues | Andrew Morgan | 2019-03-13 | 1 | -7/+10 |
| * | | Switch to wrapper function around _send_request | Andrew Morgan | 2019-03-13 | 2 | -37/+76 |
| * | | Retry on 400:M_UNRECOGNIZED | Andrew Morgan | 2019-03-13 | 1 | -6/+10 |
| * | | Fix paranthesis indent | Andrew Morgan | 2019-03-13 | 1 | -1/+2 |
| * | | Add workaround note | Andrew Morgan | 2019-03-13 | 1 | -10/+4 |
| * | | Cleaner way of implementing trailing slashes | Andrew Morgan | 2019-03-12 | 2 | -68/+62 |
| * | | Merge branch 'develop' into anoa/trailing_slashes_client | Andrew Morgan | 2019-03-11 | 2 | -9/+9 |
| |\ \ | |||||
| * \ \ | Merge branch 'develop' into anoa/trailing_slashes_client | Andrew Morgan | 2019-03-11 | 4 | -19/+53 |
| |\ \ \ | |||||
| * | | | | lint | Andrew Morgan | 2019-03-08 | 1 | -1/+3 |
| * | | | | Retry certain federation requests on 404 | Andrew Morgan | 2019-03-08 | 2 | -5/+50 |
| * | | | | Remove trailing slashes from outbound federation requests | Andrew Morgan | 2019-03-08 | 1 | -7/+7 |
* | | | | | Merge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms | Erik Johnston | 2019-03-21 | 2 | -2/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Deny peeking into rooms that have been blocked | Erik Johnston | 2019-03-21 | 2 | -2/+11 |
* | | | | | | Merge pull request #4904 from matrix-org/erikj/fix_shutdown | Erik Johnston | 2019-03-21 | 6 | -24/+62 |
|\| | | | | | |||||
| * | | | | | Fix upsert | Erik Johnston | 2019-03-21 | 1 | -0/+1 |
| * | | | | | Revert spurious delete | Erik Johnston | 2019-03-20 | 1 | -0/+4 |
| * | | | | | comment block_room | Erik Johnston | 2019-03-20 | 1 | -0/+9 |
| * | | | | | Use flags | Erik Johnston | 2019-03-20 | 5 | -15/+17 |
| * | | | | | Move requester check into assert_accepted_privacy_policy | Erik Johnston | 2019-03-20 | 1 | -5/+8 |
| * | | | | | Gracefully handle failing to kick user | Erik Johnston | 2019-03-20 | 1 | -19/+27 |
| * | | | | | Log new room ID | Erik Johnston | 2019-03-20 | 1 | -1/+6 |
| * | | | | | Only require consent for events with an associated request | Erik Johnston | 2019-03-20 | 1 | -1/+5 |
| * | | | | | Allow blocking a room multiple times | Erik Johnston | 2019-03-20 | 1 | -2/+4 |
* | | | | | | Merge pull request #4896 from matrix-org/erikj/disable_room_directory | Erik Johnston | 2019-03-21 | 3 | -0/+32 |
|\ \ \ \ \ \ |