| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #6301 from matrix-org/babolivier/msc2326 | Brendan Abolivier | 2019-11-01 | 2 | -2/+20 |
|\ |
|
| * | Incorporate review | Brendan Abolivier | 2019-11-01 | 2 | -2/+2 |
| * | Lint | Brendan Abolivier | 2019-11-01 | 1 | -0/+1 |
| * | Incorporate review | Brendan Abolivier | 2019-11-01 | 2 | -3/+8 |
| * | Add unit tests | Brendan Abolivier | 2019-10-30 | 1 | -1/+1 |
| * | Implement filtering | Brendan Abolivier | 2019-10-30 | 1 | -2/+11 |
| * | Store labels for new events | Brendan Abolivier | 2019-10-30 | 1 | -0/+3 |
* | | Remove usage of deprecated logger.warn method from codebase (#6271) | Andrew Morgan | 2019-10-31 | 1 | -1/+1 |
|/ |
|
* | Option to suppress resource exceeded alerting (#6173) | Neil Johnson | 2019-10-24 | 2 | -3/+16 |
* | Remove Auth.check method (#6217) | Richard van der Hoff | 2019-10-18 | 1 | -18/+1 |
* | Merge branch 'uhoreg/e2e_cross-signing_merged' into develop | Hubert Chathi | 2019-10-18 | 1 | -0/+1 |
|\ |
|
| * | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged | Hubert Chathi | 2019-10-18 | 3 | -5/+18 |
| |\ |
|
| * \ | Merge branch 'develop' into cross-signing_keys | Hubert Chathi | 2019-09-04 | 1 | -8/+7 |
| |\ \ |
|
| * \ \ | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys | Hubert Chathi | 2019-08-28 | 3 | -2/+8 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'cross-signing_hidden' into cross-signing_keys | Hubert Chathi | 2019-08-01 | 2 | -48/+26 |
| |\ \ \ \ |
|
| * | | | | | allow uploading keys for cross-signing | Hubert Chathi | 2019-07-25 | 1 | -0/+1 |
* | | | | | | rip out some unreachable code | Richard van der Hoff | 2019-10-17 | 1 | -2/+0 |
| |_|_|_|/
|/| | | | |
|
* | | | | | Fix up some typechecking (#6150) | Amber Brown | 2019-10-02 | 2 | -2/+6 |
* | | | | | Add device and appservice tags | Erik Johnston | 2019-09-25 | 1 | -0/+3 |
* | | | | | Don't create new span for get_user_by_req | Erik Johnston | 2019-09-25 | 1 | -1/+0 |
* | | | | | Ensure support users can be registered even if MAU limit is reached | Jason Robinson | 2019-09-11 | 1 | -2/+9 |
| |_|_|/
|/| | | |
|
* | | | | Remove double return statements (#5962) | Andrew Morgan | 2019-09-03 | 1 | -1/+0 |
* | | | | Remove unnecessary parentheses around return statements (#5931) | Andrew Morgan | 2019-08-30 | 1 | -7/+7 |
| |_|/
|/| | |
|
* | | | Add bot type | Half-Shot | 2019-08-23 | 1 | -1/+2 |
* | | | Opentracing misc (#5856) | Jorik Schellekens | 2019-08-16 | 1 | -0/+4 |
* | | | Change user deactivated errcode to USER_DEACTIVATED and use it (#5686) | Andrew Morgan | 2019-07-31 | 1 | -1/+2 |
| |/
|/| |
|
* | | Remove non-functional 'expire_access_token' setting (#5782) | Richard van der Hoff | 2019-07-30 | 1 | -23/+5 |
* | | Replace returnValue with return (#5736) | Amber Brown | 2019-07-23 | 2 | -25/+21 |
|/ |
|
* | Ignore redactions of m.room.create events (#5701) | Richard van der Hoff | 2019-07-17 | 1 | -15/+0 |
* | Return a different error from Invalid Password when a user is deactivated (#5... | Andrew Morgan | 2019-07-15 | 1 | -0/+16 |
* | Implement access token expiry (#5660) | Richard van der Hoff | 2019-07-12 | 2 | -1/+19 |
* | Clean up exception handling for access_tokens (#5656) | Richard van der Hoff | 2019-07-11 | 2 | -89/+71 |
* | Run Black. (#5482) | Amber Brown | 2019-06-20 | 7 | -337/+231 |
* | Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai... | Brendan Abolivier | 2019-06-10 | 1 | -2/+13 |
|\ |
|
| * | Better wording | Brendan Abolivier | 2019-06-10 | 1 | -1/+1 |
| * | Doc | Brendan Abolivier | 2019-06-10 | 1 | -0/+5 |
| * | Don't check whether the user's account is expired on /send_mail requests | Brendan Abolivier | 2019-06-05 | 1 | -2/+8 |
* | | Add ability to perform password reset via email without trusting the identity... | Andrew Morgan | 2019-06-06 | 1 | -0/+9 |
* | | Implement room v5 which enforces signing key validity | Richard van der Hoff | 2019-06-05 | 1 | -5/+5 |
* | | Add a test room version where we enforce key validity (#5348) | Richard van der Hoff | 2019-06-05 | 1 | -7/+13 |
* | | Implement the SHHS complexity API (#5216) | Amber Brown | 2019-05-30 | 1 | -0/+1 |
* | | Add config option for setting homeserver's default room version (#5223) | Andrew Morgan | 2019-05-23 | 1 | -4/+0 |
* | | Room Statistics (#4338) | Amber Brown | 2019-05-21 | 1 | -0/+1 |
* | | Introduce room v4 which updates event ID format. (#5217) | Richard van der Hoff | 2019-05-21 | 1 | -4/+4 |
* | | Fix error handling for rooms whose versions are unknown. (#5219) | Richard van der Hoff | 2019-05-21 | 1 | -1/+15 |
* | | Add a test room version which updates event ID format (#5210) | Richard van der Hoff | 2019-05-20 | 1 | -2/+11 |
* | | Rename relation types to match MSC | Erik Johnston | 2019-05-20 | 1 | -2/+2 |
* | | Merge pull request #5209 from matrix-org/erikj/reactions_base | Erik Johnston | 2019-05-20 | 1 | -0/+8 |
|\ \ |
|
| * | | Add simple send_relation API and track in DB | Erik Johnston | 2019-05-15 | 1 | -0/+8 |
* | | | Limit UserIds to a length that fits in a state key (#5198) | ReidAnderson | 2019-05-20 | 1 | -0/+3 |
| |/
|/| |
|
* | | Drop support for v2_alpha API prefix (#5190) | Richard van der Hoff | 2019-05-15 | 1 | -2/+1 |
|/ |
|
* | Do checks on aliases for incoming m.room.aliases events (#5128) | Brendan Abolivier | 2019-05-08 | 1 | -0/+3 |
* | Factor out an "assert_requester_is_admin" function (#5120) | Richard van der Hoff | 2019-05-02 | 1 | -1/+1 |
* | Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou... | Erik Johnston | 2019-04-17 | 4 | -43/+95 |
|\ |
|
| * | Merge pull request #5047 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-17 | 1 | -2/+3 |
| |\ |
|
| * | | Remove periods from copyright headers (#5046) | Andrew Morgan | 2019-04-11 | 3 | -3/+3 |
| * | | Merge pull request #5027 from matrix-org/babolivier/account_expiration | Brendan Abolivier | 2019-04-09 | 2 | -0/+13 |
| |\ \ |
|
| * | | | Transfer related groups on room upgrade (#4990) | Andrew Morgan | 2019-04-02 | 1 | -0/+1 |
| * | | | Collect room-version variations into one place (#4969) | Richard van der Hoff | 2019-04-01 | 2 | -40/+91 |
* | | | | Add management endpoints for account validity | Brendan Abolivier | 2019-04-17 | 1 | -1/+1 |
| |_|/
|/| | |
|
* | | | Send out emails with links to extend an account's validity period | Brendan Abolivier | 2019-04-17 | 1 | -2/+3 |
| |/
|/| |
|
* | | Add account expiration feature | Brendan Abolivier | 2019-04-09 | 2 | -0/+13 |
|/ |
|
* | Support 3PID login in password providers (#4931) | Andrew Morgan | 2019-03-26 | 1 | -11/+11 |
* | Enforce hs_disabled_message correctly | Richard van der Hoff | 2019-03-19 | 1 | -3/+5 |
* | Add ratelimiting on login (#4821) | Brendan Abolivier | 2019-03-15 | 1 | -0/+12 |
* | Add rate-limiting on registration (#4735) | Brendan Abolivier | 2019-03-05 | 1 | -15/+16 |
* | Merge remote-tracking branch 'origin/release-v0.99.0' into develop | Richard van der Hoff | 2019-01-30 | 1 | -1/+1 |
|\ |
|
| * | Update constants.py | Neil Johnson | 2019-01-30 | 1 | -1/+1 |
* | | by default include m.room.encryption on invites (#3902) | Matthew Hodgson | 2019-01-30 | 1 | -0/+1 |
|/ |
|
* | Merge branch 'develop' into neilj/room_capabilities | Neil Johnson | 2019-01-30 | 3 | -20/+43 |
|\ |
|
| * | Enable room version v3 | Erik Johnston | 2019-01-29 | 1 | -1/+2 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions... | Erik Johnston | 2019-01-29 | 2 | -12/+3 |
| |\ |
|
| | * | Implement event format v2 | Erik Johnston | 2019-01-29 | 1 | -0/+2 |
| | * | Remove dead function | Erik Johnston | 2019-01-29 | 1 | -11/+0 |
| | * | Replace usage of builder.user_id with builder.sender | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| * | | Drop vdh support | Erik Johnston | 2019-01-29 | 1 | -2/+0 |
| * | | Finish comment... | Erik Johnston | 2019-01-29 | 1 | -1/+1 |
| * | | Implement rechecking of redactions | Erik Johnston | 2019-01-29 | 1 | -2/+2 |
| * | | Add RoomVersions.V3 constant, without enabling it | Erik Johnston | 2019-01-29 | 1 | -0/+1 |
| |/ |
|
| * | Pass through room version to event auth | Erik Johnston | 2019-01-25 | 1 | -4/+10 |
| * | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_rooms | Andrew Morgan | 2019-01-25 | 1 | -0/+14 |
| |\ |
|
| | * | Update synapse/api/filtering.py | Richard van der Hoff | 2019-01-24 | 1 | -1/+1 |
| | * | Ensure new filter is actually created | Andrew Morgan | 2019-01-22 | 1 | -1/+1 |
| | * | Fix a bug with single-room search searching all rooms | Andrew Morgan | 2019-01-22 | 1 | -2/+13 |
| | * | Search for messages across predecessor rooms | Andrew Morgan | 2019-01-18 | 1 | -0/+3 |
| * | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2 | Erik Johnston | 2019-01-24 | 1 | -0/+13 |
| |\ \ |
|
| | * | | Add support for persisting event format versions | Erik Johnston | 2019-01-23 | 1 | -0/+13 |
* | | | | define room dispositions for use in exposing room capabilities | Neil Johnson | 2019-01-30 | 1 | -0/+5 |
* | | | | reflect that rooms v3 is a stable room version | Neil Johnson | 2019-01-30 | 1 | -0/+1 |
* | | | | backout v3 | Neil Johnson | 2019-01-25 | 1 | -1/+0 |
* | | | | track unstable room v3 | Neil Johnson | 2019-01-25 | 1 | -0/+2 |
|/ / / |
|
* / / | Fix None guard in config.server.is_threepid_reserved | Neil Johnson | 2019-01-22 | 1 | -1/+3 |
|/ / |
|
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_inv... | Erik Johnston | 2019-01-21 | 1 | -1/+2 |
|\ \ |
|
| * \ | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis | Erik Johnston | 2019-01-21 | 1 | -1/+2 |
| |\ \ |
|
| * | | | Migrate encryption state on room upgrade (#4411) | Andrew Morgan | 2019-01-21 | 1 | -0/+1 |
| | |/
| |/| |
|
| * | | ALL_USER_TYPES should be a tuple | Neil Johnson | 2019-01-15 | 1 | -1/+1 |
* | | | Add /v2/invite federation API | Erik Johnston | 2019-01-15 | 1 | -0/+1 |
| |/
|/| |
|
* | | Add groundwork for new versions of federation APIs | Erik Johnston | 2019-01-15 | 1 | -1/+2 |
|/ |
|
* | Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1 | Richard van der Hoff | 2019-01-10 | 1 | -38/+27 |
|\ |
|
| * | Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34 | Richard van der Hoff | 2019-01-10 | 1 | -38/+27 |
| |\ |
|
| | * | Skip macaroon check for access tokens in the db | Richard van der Hoff | 2019-01-10 | 1 | -38/+27 |
* | | | Refactor request sending to have better excpetions (#4358) | Erik Johnston | 2019-01-08 | 1 | -0/+18 |
* | | | fix the check for whether `is_url` to match all the other ones in codebase (#... | Michael Telatynski | 2019-01-06 | 1 | -3/+8 |
* | | | Merge pull request #4307 from matrix-org/erikj/v2_rooms | Richard van der Hoff | 2018-12-24 | 1 | -0/+2 |
|\ \ \ |
|
| * | | | Add v2 room version | Erik Johnston | 2018-12-18 | 1 | -0/+2 |
* | | | | create support user (#4141) | Neil Johnson | 2018-12-14 | 2 | -2/+11 |
| |/ /
|/| | |
|
* | | | Add an option to enable recording IPs for appservice users (#3831) | Travis Ralston | 2018-12-04 | 1 | -9/+20 |
|/ / |
|
* | | Merge pull request #4004 from matrix-org/travis/login-terms | Travis Ralston | 2018-11-01 | 1 | -0/+1 |
|\ \ |
|
| * \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 2 | -1/+1 |
| |\ \ |
|
| * \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 1 | -1/+4 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-15 | 1 | -0/+15 |
| |\ \ \ \ |
|
| * | | | | | Incorporate Dave's work for GDPR login flows | Travis Ralston | 2018-10-03 | 1 | -0/+1 |
* | | | | | | Add STATE_V2_TEST room version | Erik Johnston | 2018-11-01 | 1 | -1/+6 |
| |_|_|/ /
|/| | | | |
|
* | | | | | Remove deprecated v1 key exchange endpoint (#4119) | Amber Brown | 2018-10-31 | 1 | -1/+0 |
* | | | | | Basic initial support for room upgrades | Richard van der Hoff | 2018-10-25 | 1 | -0/+1 |
| |_|/ /
|/| | | |
|
* | | | | Allow backslashes in event field filters | Richard van der Hoff | 2018-10-24 | 1 | -1/+4 |
| |/ /
|/| | |
|
* | | | PR feedback pt. 1 | David Baker | 2018-10-12 | 1 | -8/+0 |
* | | | Fix mergefail | David Baker | 2018-10-09 | 1 | -1/+1 |
* | | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups | David Baker | 2018-10-09 | 4 | -9/+23 |
|\| | |
|
| * | | Fix userconsent on Python 3 (#3938) | Amber Brown | 2018-10-02 | 1 | -1/+1 |
| * | | Replaced all occurences of e.message with str(e) | Schnuffle | 2018-09-27 | 1 | -1/+1 |
| * | | Implement 'event_format' filter param in /sync | Richard van der Hoff | 2018-09-04 | 1 | -0/+1 |
| * | | assert rather than warn hhs-4 | Neil Johnson | 2018-08-31 | 1 | -3/+2 |
| * | | move threepid checker to config, add missing yields | Neil Johnson | 2018-08-31 | 1 | -2/+11 |
| * | | fix reference to is_threepid_reserved | Neil Johnson | 2018-08-31 | 1 | -1/+1 |
| * | | ensure post registration auth checks do not fail erroneously | Neil Johnson | 2018-08-31 | 1 | -5/+2 |
| * | | fix bug where preserved threepid user comes to sign up and server is mau blocked | Neil Johnson | 2018-08-31 | 1 | -1/+9 |
| * | | Change admin_uri to admin_contact in config and errors | Erik Johnston | 2018-08-24 | 2 | -5/+5 |
* | | | try to make flake8 and isort happy | Hubert Chathi | 2018-09-06 | 1 | -0/+1 |
* | | | Merge branch 'develop' into e2e_backups | Hubert Chathi | 2018-08-24 | 4 | -12/+113 |
|\| | |
|
| * | | Implement trail users | Erik Johnston | 2018-08-23 | 1 | -1/+5 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Erik Johnston | 2018-08-22 | 3 | -11/+15 |
| |\ \ |
|
| | * \ | Merge pull request #3673 from matrix-org/erikj/refactor_state_handler | Erik Johnston | 2018-08-22 | 1 | -2/+7 |
| | |\ \ |
|
| | | * \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... | Erik Johnston | 2018-08-20 | 2 | -8/+48 |
| | | |\ \ |
|
| | | * | | | Add constants for room versions | Erik Johnston | 2018-08-09 | 1 | -2/+7 |
| | * | | | | Port over enough to get some sytests running on Python 3 (#3668) | Amber Brown | 2018-08-20 | 2 | -8/+8 |
| | | |/ /
| | |/| | |
|
| * | | | | Update notice format | Erik Johnston | 2018-08-22 | 1 | -2/+4 |
| * | | | | rename error code | Neil Johnson | 2018-08-18 | 2 | -4/+4 |
| * | | | | special case server_notices_mxid | Neil Johnson | 2018-08-18 | 1 | -0/+6 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-17 | 2 | -6/+28 |
| |\| | | |
|
| | * | | | Merge branch 'develop' into neilj/limit_exceeded_error | Neil Johnson | 2018-08-17 | 1 | -1/+2 |
| | |\ \ \ |
|
| | * | | | | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 2 | -6/+27 |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-17 | 1 | -1/+1 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | call reap on start up and fix under reaping bug | Neil Johnson | 2018-08-16 | 1 | -1/+1 |
| | |/ / / |
|
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... | Neil Johnson | 2018-08-15 | 2 | -9/+18 |
| |\| | | |
|
| | * | | | clean up AuthError | Neil Johnson | 2018-08-15 | 1 | -7/+3 |
| | * | | | update error codes for resource limiting | Neil Johnson | 2018-08-15 | 1 | -2/+1 |
| | * | | | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 2 | -7/+7 |
| | * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email | Neil Johnson | 2018-08-14 | 1 | -1/+11 |
| | |\ \ \ |
|
| | | * | | | make comments clearer | Neil Johnson | 2018-08-14 | 1 | -1/+2 |
| | * | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 2 | -4/+17 |
| | * | | | | Revert "support admin_email config and pass through into blocking errors, ret... | Neil Johnson | 2018-08-13 | 2 | -17/+4 |
| | * | | | | support admin_email config and pass through into blocking errors, return Auth... | Neil Johnson | 2018-08-13 | 2 | -4/+17 |
| | | |/ /
| | |/| | |
|
| * | | | | add new event types | Neil Johnson | 2018-08-15 | 1 | -0/+1 |
| * | | | | support server notice state events for resource limits | Neil Johnson | 2018-08-14 | 1 | -0/+2 |
| | |/ /
| |/| | |
|
| * | | | rename _user_last_seen_monthly_active | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| * | | | fix errant parenthesis | Neil Johnson | 2018-08-09 | 1 | -1/+1 |
| * | | | only block on sync where user is not part of the mau cohort | Neil Johnson | 2018-08-09 | 1 | -2/+11 |
| |/ / |
|
| * | | fix pep8 too many lines | Neil Johnson | 2018-08-08 | 1 | -1/+0 |
| * | | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 2 | -0/+34 |
| |\ \ |
|
| | * \ | Merge pull request #3654 from matrix-org/rav/room_versions | Richard van der Hoff | 2018-08-08 | 2 | -0/+33 |
| | |\ \ |
|
| | | * | | Don't expose default_room_version as config opt | Richard van der Hoff | 2018-08-07 | 1 | -0/+3 |
| | | * | | Enforce compatibility when processing make_join requests | Richard van der Hoff | 2018-08-03 | 1 | -0/+22 |
| | | * | | Basic support for room versioning | Richard van der Hoff | 2018-08-03 | 2 | -0/+8 |
| | | |/ |
|
| * | | | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/... | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| |\| | |
|
| | * | | update comments to reflect new sig | Neil Johnson | 2018-08-06 | 1 | -4/+1 |
| * | | | disable HS from config | Neil Johnson | 2018-08-04 | 2 | -0/+5 |
| |/ / |
|
| * | | wip commit - tests failing | Neil Johnson | 2018-08-03 | 1 | -2/+4 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker | Neil Johnson | 2018-08-03 | 1 | -53/+53 |
| |\| |
|
| * | | do mau checks based on monthly_active_users table | Neil Johnson | 2018-08-02 | 1 | -0/+13 |
| * | | insertion into monthly_active_users | Neil Johnson | 2018-08-02 | 1 | -1/+1 |
* | | | blindly incorporate PR review - needs testing & fixing | Matthew Hodgson | 2018-08-12 | 1 | -3/+8 |
* | | | implement /room_keys/version too (untested) | Matthew Hodgson | 2018-08-12 | 1 | -0/+25 |
| |/
|/| |
|
* | | Merge pull request #3639 from matrix-org/rav/refactor_error_handling | Richard van der Hoff | 2018-08-02 | 1 | -53/+53 |
|\ \
| |/
|/| |
|
| * | Kill off MatrixCodeMessageException | Richard van der Hoff | 2018-08-01 | 1 | -11/+0 |
| * | Refactor code for turning HttpResponseException into SynapseError | Richard van der Hoff | 2018-08-01 | 1 | -31/+53 |
| * | Be more careful which errors we send back over the C-S API | Richard van der Hoff | 2018-08-01 | 1 | -11/+0 |
* | | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limits | Neil Johnson | 2018-08-01 | 1 | -0/+1 |
|\ \
| |/
|/| |
|
| * | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 1 | -0/+1 |
* | | Python 3: Convert some unicode/bytes uses (#3569) | Amber Brown | 2018-08-02 | 1 | -2/+2 |
|/ |
|
* | Deduplicate redundant lazy-loaded members (#3331) | Matthew Hodgson | 2018-07-26 | 1 | -0/+9 |
* | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-24 | 1 | -0/+34 |
|\ |
|
| * | Merge branch 'develop' into erikj/client_apis_move | Erik Johnston | 2018-07-24 | 1 | -2/+4 |
| |\ |
|
| * | | Move check_in_room_or_world_readable to Auth | Erik Johnston | 2018-07-20 | 1 | -0/+34 |
* | | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-07-23 | 1 | -2/+4 |
|\ \ \
| | |/
| |/| |
|
| * | | Use new getters | Erik Johnston | 2018-07-23 | 1 | -2/+4 |
| |/ |
|
* | | merge develop pydoc for _get_state_for_groups | Matthew Hodgson | 2018-07-19 | 5 | -75/+86 |
|\| |
|
| * | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 1 | -62/+62 |
| * | run isort | Amber Brown | 2018-07-09 | 4 | -13/+14 |
| * | Implementation of server_acls | Richard van der Hoff | 2018-07-04 | 1 | -0/+2 |
| * | add ip_range_whitelist parameter to limit where ASes can connect from | Matthew Hodgson | 2018-06-28 | 1 | -0/+6 |
| * | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 2 | -2/+4 |
| * | Don't print invalid access tokens in the logs | Travis Ralston | 2018-06-24 | 1 | -2/+2 |
| * | Refactor get_send_level to take a power_levels event | Richard van der Hoff | 2018-06-14 | 1 | -1/+1 |
* | | Merge branch 'develop' into matthew/filter_members | Matthew Hodgson | 2018-06-04 | 2 | -2/+4 |
|\| |
|
| * | Consistently use six's iteritems and wrap lazy keys/values in list() if they'... | Amber Brown | 2018-05-31 | 2 | -2/+4 |
* | | add lazy_load_members to the filter json schema | Matthew Hodgson | 2018-05-29 | 1 | -1/+4 |
* | | merge develop | Matthew Hodgson | 2018-05-29 | 5 | -10/+94 |
|\| |
|
| * | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-28 | 1 | -0/+1 |
| |\ |
|
| | * | custom error code for not leaving server notices room | Richard van der Hoff | 2018-05-22 | 1 | -0/+1 |
| * | | Merge remote-tracking branch 'origin/develop' into 3218-official-prom | Amber Brown | 2018-05-22 | 2 | -1/+79 |
| |\| |
|
| | * | Reject attempts to send event before privacy consent is given | Richard van der Hoff | 2018-05-22 | 2 | -1/+79 |
| * | | replacing portions | Amber Brown | 2018-05-21 | 1 | -1/+1 |
| |/ |
|
| * | Apply some limits to depth to counter abuse | Richard van der Hoff | 2018-05-01 | 1 | -0/+3 |
| * | Use six.itervalues in some places | Adrian Tschira | 2018-04-15 | 1 | -1/+2 |
| * | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 1 | -5/+5 |
| * | Use simplejson throughout | Richard van der Hoff | 2018-03-29 | 1 | -1/+2 |
| * | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-03-19 | 1 | -1/+1 |
| |\ |
|
| | * | Replace ujson with simplejson | Erik Johnston | 2018-03-15 | 1 | -1/+1 |
* | | | make lazy_load_members configurable in filters | Matthew Hodgson | 2018-03-19 | 1 | -0/+6 |
|/ / |
|
* | | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 1 | -0/+26 |
* | | add registrations_require_3pid | Matthew Hodgson | 2018-01-19 | 1 | -0/+1 |
|/ |
|
* | Refactor UI auth implementation | Richard van der Hoff | 2017-12-05 | 1 | -0/+16 |
* | Improve comments on get_user_by_access_token | Richard van der Hoff | 2017-11-29 | 1 | -1/+5 |
* | Add a config option to block all room invites (#2457) | Richard van der Hoff | 2017-09-19 | 1 | -0/+8 |
* | Merge pull request #2309 from matrix-org/erikj/user_ip_repl | Erik Johnston | 2017-07-06 | 1 | -1/+1 |
|\ |
|
| * | Fix up | Erik Johnston | 2017-06-27 | 1 | -1/+1 |
* | | Cache macaroon parse and validation | Erik Johnston | 2017-06-29 | 1 | -13/+60 |
|/ |
|
* | Batch upsert user ips | Erik Johnston | 2017-06-27 | 1 | -2/+1 |
* | Change is_host_joined to use current_state table | Erik Johnston | 2017-06-09 | 1 | -11/+2 |
* | Use CodeMessageException subclass instead | David Baker | 2017-04-25 | 1 | -0/+11 |
* | use jsonschema.FormatChecker for RoomID and UserID strings | pik | 2017-03-23 | 1 | -18/+27 |
* | Add valid filter tests, flake8, fix typo | pik | 2017-03-23 | 1 | -5/+6 |
* | check_valid_filter using JSONSchema | pik | 2017-03-23 | 1 | -93/+158 |
* | Fix a couple of logcontext leaks | Richard van der Hoff | 2017-03-23 | 1 | -3/+2 |
* | Comment | Erik Johnston | 2017-03-15 | 1 | -1/+3 |
* | Comment | Erik Johnston | 2017-03-15 | 1 | -0/+3 |
* | Format presence events on the edges instead of reformatting them multiple times | Erik Johnston | 2017-03-15 | 1 | -10/+22 |
* | Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2 | Erik Johnston | 2017-03-15 | 1 | -0/+2 |
|\ |
|
| * | Support registration / login with phone number | David Baker | 2017-03-13 | 1 | -0/+2 |
* | | Address review comments | Richard van der Hoff | 2017-03-14 | 1 | -5/+14 |
* | | re-refactor exception heirarchy | Richard van der Hoff | 2017-03-14 | 1 | -16/+14 |
* | | Fix routing loop when fetching remote media | Richard van der Hoff | 2017-03-13 | 1 | -7/+52 |
|/ |
|
* | Revert "Support registration & login with phone number" | Erik Johnston | 2017-03-13 | 1 | -2/+0 |
* | WIP support for msisdn 3pid proxy methods | David Baker | 2017-02-14 | 1 | -0/+2 |
* | Remove a few aspirational but unused constants | David Baker | 2017-02-08 | 1 | -3/+0 |
* | Change resolve_state_groups call site logging to DEBUG | Erik Johnston | 2017-01-17 | 1 | -1/+1 |
* | Remove unused function | Erik Johnston | 2017-01-13 | 1 | -3/+0 |
* | Split event auth code into seperate module | Erik Johnston | 2017-01-13 | 1 | -645/+9 |
* | Split out static auth methods from Auth object | Erik Johnston | 2017-01-10 | 1 | -419/+495 |
* | Fix flake8 and update changelog v0.18.6-rc3 | Mark Haines | 2017-01-05 | 1 | -1/+1 |
* | add logging for all the places we call resolve_state_groups. my kingdom for a... | Matthew Hodgson | 2017-01-05 | 1 | -0/+1 |
* | Prevent user tokens being used as guest tokens (#1675) | Richard van der Hoff | 2016-12-06 | 1 | -15/+36 |
* | Rip out more refresh_token code | Richard van der Hoff | 2016-11-30 | 1 | -3/+2 |
* | Merge pull request #1656 from matrix-org/rav/remove_time_caveat | Richard van der Hoff | 2016-11-30 | 1 | -3/+13 |
|\ |
|
| * | Comments | Richard van der Hoff | 2016-11-30 | 1 | -3/+9 |
| * | Stop putting a time caveat on access tokens | Richard van der Hoff | 2016-11-29 | 1 | -0/+4 |
* | | Merge pull request #1653 from matrix-org/rav/guest_e2e | Richard van der Hoff | 2016-11-29 | 1 | -1/+5 |
|\ \
| |/
|/| |
|
| * | Give guest users a device_id | Richard van der Hoff | 2016-11-25 | 1 | -1/+5 |
* | | Merge pull request #1655 from matrix-org/rav/remove_redundant_macaroon_checks | Richard van der Hoff | 2016-11-25 | 1 | -26/+8 |
|\ \ |
|