summary refs log tree commit diff
path: root/synapse/api (follow)
Commit message (Expand)AuthorAgeFilesLines
* Implement per-room message retention policiesBrendan Abolivier2019-08-281-0/+2
* Merge branch 'master' into dinsicBrendan Abolivier2019-06-124-11/+24
|\
| * Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-061-0/+9
| * Implement room v5 which enforces signing key validityRichard van der Hoff2019-06-051-5/+5
| * Add a test room version where we enforce key validity (#5348)Richard van der Hoff2019-06-051-7/+13
| * Implement the SHHS complexity API (#5216)Amber Brown2019-05-301-0/+1
| * Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-4/+0
| * Room Statistics (#4338)Amber Brown2019-05-211-0/+1
* | Merge branch 'master' into dinsicBrendan Abolivier2019-06-113-3/+37
|\|
| * Introduce room v4 which updates event ID format. (#5217)Richard van der Hoff2019-05-211-4/+4
| * Fix error handling for rooms whose versions are unknown. (#5219)Richard van der Hoff2019-05-211-1/+15
| * Add a test room version which updates event ID format (#5210)Richard van der Hoff2019-05-201-2/+11
| * Rename relation types to match MSCErik Johnston2019-05-201-2/+2
| * Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-201-0/+8
| |\
| | * Add simple send_relation API and track in DBErik Johnston2019-05-151-0/+8
| * | Limit UserIds to a length that fits in a state key (#5198)ReidAnderson2019-05-201-0/+3
* | | Merge branch 'babolivier/account_validity_send_mail_auth' into dinsic dinsic_2019-06-10Brendan Abolivier2019-06-101-2/+13
|\ \ \
| * | | Better wordingBrendan Abolivier2019-06-101-1/+1
| * | | DocBrendan Abolivier2019-06-101-0/+5
| * | | Don't check whether the user's account is expired on /send_mail requestsBrendan Abolivier2019-06-051-2/+8
| |/ /
* | | Merge pull request #5214 from matrix-org/babolivier/password-policyBrendan Abolivier2019-05-221-1/+25
|\ \ \
| * | | Make error messages more explicitBrendan Abolivier2019-05-211-2/+6
| * | | First implementation of MSC2000Brendan Abolivier2019-05-201-1/+21
| |/ /
* | | Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17Brendan Abolivier2019-05-171-2/+1
|\| |
| * | Drop support for v2_alpha API prefix (#5190)Richard van der Hoff2019-05-151-2/+1
| |/
* | Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14Brendan Abolivier2019-05-142-3/+7
|\|
| * Do checks on aliases for incoming m.room.aliases events (#5128)Brendan Abolivier2019-05-081-0/+3
| * Factor out an "assert_requester_is_admin" function (#5120)Richard van der Hoff2019-05-021-1/+1
| * Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-174-43/+95
| |\
| | * Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-171-2/+3
| | |\
| * | | Add management endpoints for account validityBrendan Abolivier2019-04-171-1/+1
| | |/ | |/|
| * | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-171-2/+3
* | | Move lookup endpoint to CS API (and s/is_server/id_server/)Brendan Abolivier2019-04-301-1/+0
* | | [DINSIC] Add ability to proxy identity lookups (#5048)Andrew Morgan2019-04-161-0/+1
* | | Merge branch 'develop' into dinsicAndrew Morgan2019-04-155-42/+107
|\ \ \ | | |/ | |/|
| * | Remove periods from copyright headers (#5046)Andrew Morgan2019-04-113-3/+3
| * | Merge pull request #5027 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-092-0/+13
| |\|
| | * Add account expiration featureBrendan Abolivier2019-04-092-0/+13
| * | Transfer related groups on room upgrade (#4990)Andrew Morgan2019-04-021-0/+1
| * | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-012-40/+91
| |/
* | Merge branch 'master' of github.com:matrix-org/synapse into dinsicErik Johnston2019-04-051-11/+11
|\|
| * Support 3PID login in password providers (#4931)Andrew Morgan2019-03-261-11/+11
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dinsic-mergedErik Johnston2019-03-212-18/+33
|\|
| * Enforce hs_disabled_message correctlyRichard van der Hoff2019-03-191-3/+5
| * Add ratelimiting on login (#4821)Brendan Abolivier2019-03-151-0/+12
| * Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-051-15/+16
* | FixupsErik Johnston2019-03-151-0/+6
* | Merge branch 'master' of github.com:matrix-org/synapse into erikj/dinsic-merg...Erik Johnston2019-03-155-75/+151
|\|
| * Merge remote-tracking branch 'origin/release-v0.99.0' into developRichard van der Hoff2019-01-301-1/+1
| |\
| | * Update constants.pyNeil Johnson2019-01-301-1/+1
| * | by default include m.room.encryption on invites (#3902)Matthew Hodgson2019-01-301-0/+1
| |/
| * Merge branch 'develop' into neilj/room_capabilitiesNeil Johnson2019-01-303-20/+43
| |\
| | * Enable room version v3Erik Johnston2019-01-291-1/+2
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions...Erik Johnston2019-01-292-12/+3
| | |\
| | | * Implement event format v2Erik Johnston2019-01-291-0/+2
| | | * Remove dead functionErik Johnston2019-01-291-11/+0
| | | * Replace usage of builder.user_id with builder.senderErik Johnston2019-01-291-1/+1
| | * | Drop vdh supportErik Johnston2019-01-291-2/+0
| | * | Finish comment...Erik Johnston2019-01-291-1/+1
| | * | Implement rechecking of redactionsErik Johnston2019-01-291-2/+2
| | * | Add RoomVersions.V3 constant, without enabling itErik Johnston2019-01-291-0/+1
| | |/
| | * Pass through room version to event authErik Johnston2019-01-251-4/+10
| | * Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_roomsAndrew Morgan2019-01-251-0/+14
| | |\
| | | * Update synapse/api/filtering.pyRichard van der Hoff2019-01-241-1/+1
| | | * Ensure new filter is actually createdAndrew Morgan2019-01-221-1/+1
| | | * Fix a bug with single-room search searching all roomsAndrew Morgan2019-01-221-2/+13
| | | * Search for messages across predecessor roomsAndrew Morgan2019-01-181-0/+3
| | * | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2Erik Johnston2019-01-241-0/+13
| | |\ \
| | | * | Add support for persisting event format versionsErik Johnston2019-01-231-0/+13
| * | | | define room dispositions for use in exposing room capabilitiesNeil Johnson2019-01-301-0/+5
| * | | | reflect that rooms v3 is a stable room versionNeil Johnson2019-01-301-0/+1
| * | | | backout v3Neil Johnson2019-01-251-1/+0
| * | | | track unstable room v3Neil Johnson2019-01-251-0/+2
| |/ / /
| * / / Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-221-1/+3
| |/ /
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_inv...Erik Johnston2019-01-211-1/+2
| |\ \
| | * \ Merge pull request #4390 from matrix-org/erikj/versioned_fed_apisErik Johnston2019-01-211-1/+2
| | |\ \
| | * | | Migrate encryption state on room upgrade (#4411)Andrew Morgan2019-01-211-0/+1
| | | |/ | | |/|
| | * | ALL_USER_TYPES should be a tupleNeil Johnson2019-01-151-1/+1
| * | | Add /v2/invite federation APIErik Johnston2019-01-151-0/+1
| | |/ | |/|
| * | Add groundwork for new versions of federation APIsErik Johnston2019-01-151-1/+2
| |/
| * Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1Richard van der Hoff2019-01-101-38/+27
| |\
| | * Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34Richard van der Hoff2019-01-101-38/+27
| | |\
| | | * Skip macaroon check for access tokens in the dbRichard van der Hoff2019-01-101-38/+27
| * | | Refactor request sending to have better excpetions (#4358)Erik Johnston2019-01-081-0/+18
| * | | fix the check for whether `is_url` to match all the other ones in codebase (#...Michael Telatynski2019-01-061-3/+8
| * | | Merge pull request #4307 from matrix-org/erikj/v2_roomsRichard van der Hoff2018-12-241-0/+2
| |\ \ \
| | * | | Add v2 room versionErik Johnston2018-12-181-0/+2
| * | | | create support user (#4141)Neil Johnson2018-12-142-2/+11
| | |/ / | |/| |
| * | | Add an option to enable recording IPs for appservice users (#3831)Travis Ralston2018-12-041-9/+20
| |/ /
| * | Merge pull request #4004 from matrix-org/travis/login-termsTravis Ralston2018-11-011-0/+1
| |\ \
| | * \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-312-1/+1
| | |\ \
| | * \ \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-241-1/+4
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-151-0/+15
| | |\ \ \ \
| | * | | | | Incorporate Dave's work for GDPR login flowsTravis Ralston2018-10-031-0/+1
| * | | | | | Add STATE_V2_TEST room versionErik Johnston2018-11-011-1/+6
| | |_|_|/ / | |/| | | |
| * | | | | Remove deprecated v1 key exchange endpoint (#4119)Amber Brown2018-10-311-1/+0
| * | | | | Basic initial support for room upgradesRichard van der Hoff2018-10-251-0/+1
| | |_|/ / | |/| | |
* | | | | Synchronise account metadata onto another server. (#4145) dinsic_2019-01-11Matthew Hodgson2019-01-111-29/+16
* | | | | merge master into dinsic, again...Matthew Hodgson2018-11-035-17/+68
|\| | | |
| * | | | Allow backslashes in event field filtersRichard van der Hoff2018-10-241-1/+4
| | |/ / | |/| |
| * | | PR feedback pt. 1David Baker2018-10-121-8/+0
| * | | Fix mergefailDavid Baker2018-10-091-1/+1
| * | | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-094-9/+23
| |\| |
| | * | Fix userconsent on Python 3 (#3938)Amber Brown2018-10-021-1/+1
| | * | Replaced all occurences of e.message with str(e)Schnuffle2018-09-271-1/+1
| | * | Implement 'event_format' filter param in /syncRichard van der Hoff2018-09-041-0/+1
| | * | assert rather than warn hhs-4Neil Johnson2018-08-311-3/+2
| | * | move threepid checker to config, add missing yieldsNeil Johnson2018-08-311-2/+11
| | * | fix reference to is_threepid_reservedNeil Johnson2018-08-311-1/+1
| | * | ensure post registration auth checks do not fail erroneouslyNeil Johnson2018-08-311-5/+2
| | * | fix bug where preserved threepid user comes to sign up and server is mau blockedNeil Johnson2018-08-311-1/+9
| | * | Change admin_uri to admin_contact in config and errorsErik Johnston2018-08-242-5/+5
| * | | try to make flake8 and isort happyHubert Chathi2018-09-061-0/+1
| * | | Merge branch 'develop' into e2e_backupsHubert Chathi2018-08-244-12/+113
| |\| |
| | * | Implement trail usersErik Johnston2018-08-231-1/+5
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Erik Johnston2018-08-223-11/+15
| | |\ \
| | | * \ Merge pull request #3673 from matrix-org/erikj/refactor_state_handlerErik Johnston2018-08-221-2/+7
| | | |\ \
| | | | * \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s...Erik Johnston2018-08-202-8/+48
| | | | |\ \
| | | | * | | Add constants for room versionsErik Johnston2018-08-091-2/+7
| | * | | | | Update notice formatErik Johnston2018-08-221-2/+4
| | * | | | | rename error codeNeil Johnson2018-08-182-4/+4
| | * | | | | special case server_notices_mxidNeil Johnson2018-08-181-0/+6
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-172-6/+28
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-171-1/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not...Neil Johnson2018-08-152-9/+18
| | |\ \ \ \ \ \
| | * | | | | | | add new event typesNeil Johnson2018-08-151-0/+1
| | * | | | | | | support server notice state events for resource limitsNeil Johnson2018-08-141-0/+2
| * | | | | | | | blindly incorporate PR review - needs testing & fixingMatthew Hodgson2018-08-121-3/+8
| * | | | | | | | implement /room_keys/version too (untested)Matthew Hodgson2018-08-121-0/+25
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | merge in masterMatthew Hodgson2018-10-225-66/+210
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Port over enough to get some sytests running on Python 3 (#3668)Amber Brown2018-08-202-8/+8
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'develop' into neilj/limit_exceeded_errorNeil Johnson2018-08-171-1/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | call reap on start up and fix under reaping bugNeil Johnson2018-08-161-1/+1
| | | |_|/ / | | |/| | |
| * / | | | add new error type ResourceLimitNeil Johnson2018-08-162-6/+27
| |/ / / /
| * | | | clean up AuthErrorNeil Johnson2018-08-151-7/+3
| * | | | update error codes for resource limitingNeil Johnson2018-08-151-2/+1
| * | | | replace admin_email with admin_uri for greater flexibilityNeil Johnson2018-08-152-7/+7
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_emailNeil Johnson2018-08-141-1/+11
| |\ \ \ \
| | * | | | make comments clearerNeil Johnson2018-08-141-1/+2
| | | |/ / | | |/| |
| | * | | rename _user_last_seen_monthly_activeNeil Johnson2018-08-091-1/+1
| | * | | fix errant parenthesisNeil Johnson2018-08-091-1/+1
| | * | | only block on sync where user is not part of the mau cohortNeil Johnson2018-08-091-2/+11
| | | |/ | | |/|
| * | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-132-4/+17
| * | | Revert "support admin_email config and pass through into blocking errors, ret...Neil Johnson2018-08-132-17/+4
| * | | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-132-4/+17
| |/ /
| * | fix pep8 too many linesNeil Johnson2018-08-081-1/+0
| * | Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-082-0/+34
| |\ \
| | * \ Merge pull request #3654 from matrix-org/rav/room_versionsRichard van der Hoff2018-08-082-0/+33
| | |\ \
| | | * | Don't expose default_room_version as config optRichard van der Hoff2018-08-071-0/+3
| | | * | Enforce compatibility when processing make_join requestsRichard van der Hoff2018-08-031-0/+22
| | | * | Basic support for room versioningRichard van der Hoff2018-08-032-0/+8
| | | |/
| * | | Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/...Neil Johnson2018-08-061-4/+1
| |\| |
| | * | update comments to reflect new sigNeil Johnson2018-08-061-4/+1
| * | | disable HS from configNeil Johnson2018-08-042-0/+5
| |/ /
| * | wip commit - tests failingNeil Johnson2018-08-031-2/+4
| * | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_trackerNeil Johnson2018-08-031-53/+53
| |\|
| | * Merge pull request #3639 from matrix-org/rav/refactor_error_handlingRichard van der Hoff2018-08-021-53/+53
| | |\
| | | * Kill off MatrixCodeMessageExceptionRichard van der Hoff2018-08-011-11/+0
| | | * Refactor code for turning HttpResponseException into SynapseErrorRichard van der Hoff2018-08-011-31/+53
| | | * Be more careful which errors we send back over the C-S APIRichard van der Hoff2018-08-011-11/+0
| * | | do mau checks based on monthly_active_users tableNeil Johnson2018-08-021-0/+13
| * | | insertion into monthly_active_usersNeil Johnson2018-08-021-1/+1
| |/ /
| * | Merge pull request #3630 from matrix-org/neilj/mau_sign_in_log_in_limitsNeil Johnson2018-08-011-0/+1
| |\ \ | | |/ | |/|
| | * limit register and sign in on number of monthly usersNeil Johnson2018-07-301-0/+1
| * | Python 3: Convert some unicode/bytes uses (#3569)Amber Brown2018-08-021-2/+2
| |/
| * Deduplicate redundant lazy-loaded members (#3331)Matthew Hodgson2018-07-261-0/+9
| * Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-241-0/+34
| |\
| | * Merge branch 'develop' into erikj/client_apis_moveErik Johnston2018-07-241-2/+4
| | |\
| | * | Move check_in_room_or_world_readable to AuthErik Johnston2018-07-201-0/+34
| * | | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-07-231-2/+4
| |\ \ \ | | | |/ | | |/|
| | * | Use new gettersErik Johnston2018-07-231-2/+4
| | |/
| * | merge develop pydoc for _get_state_for_groupsMatthew Hodgson2018-07-195-75/+86
| |\|
| * | Merge branch 'develop' into matthew/filter_membersMatthew Hodgson2018-06-042-2/+4
| |\ \
| * | | add lazy_load_members to the filter json schemaMatthew Hodgson2018-05-291-1/+4
| * | | merge developMatthew Hodgson2018-05-295-10/+94
| |\ \ \
| * | | | make lazy_load_members configurable in filtersMatthew Hodgson2018-03-191-0/+6
* | | | | Merge remote-tracking branch 'origin/master' into dinsicDavid Baker2018-07-194-75/+76
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Make auth & transactions more testable (#3499)Amber Brown2018-07-141-62/+62
| * | | | run isortAmber Brown2018-07-094-13/+14
* | | | | Merge remote-tracking branch 'origin/master' into dinsicDavid Baker2018-07-174-4/+14
|\| | | |
| * | | | Implementation of server_aclsRichard van der Hoff2018-07-041-0/+2
| * | | | add ip_range_whitelist parameter to limit where ASes can connect fromMatthew Hodgson2018-06-281-0/+6
| * | | | Attempt to be more performant on PyPy (#3462)Amber Brown2018-06-282-2/+4
| * | | | Don't print invalid access tokens in the logsTravis Ralston2018-06-241-2/+2
* | | | | Merge tag 'v0.31.2' into dinsicMichael Kaye2018-06-224-5/+86
|\| | | |
| * | | | Refactor get_send_level to take a power_levels eventRichard van der Hoff2018-06-141-1/+1
| | |_|/ | |/| |
| * | | Consistently use six's iteritems and wrap lazy keys/values in list() if they'...Amber Brown2018-05-312-2/+4
| | |/ | |/|
| * | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-281-0/+1
| |\ \
| | * | custom error code for not leaving server notices roomRichard van der Hoff2018-05-221-0/+1
| * | | Merge remote-tracking branch 'origin/develop' into 3218-official-promAmber Brown2018-05-222-1/+79
| |\| |
| | * | Reject attempts to send event before privacy consent is givenRichard van der Hoff2018-05-222-1/+79
| * | | replacing portionsAmber Brown2018-05-211-1/+1
| |/ /
* / / Add m.encryption to event typesDavid Baker2018-06-221-0/+2
|/ /
* | Apply some limits to depth to counter abuseRichard van der Hoff2018-05-011-0/+3
* | Use six.itervalues in some placesAdrian Tschira2018-04-151-1/+2
* | Add b prefixes to some strings that are bytes in py3Adrian Tschira2018-04-041-5/+5
* | Use simplejson throughoutRichard van der Hoff2018-03-291-1/+2
* | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2018-03-191-1/+1
|\ \ | |/ |/|
| * Replace ujson with simplejsonErik Johnston2018-03-151-1/+1
* | Add federation_domain_whitelist option (#2820)Matthew Hodgson2018-01-221-0/+26
* | add registrations_require_3pidMatthew Hodgson2018-01-191-0/+1
|/
* Refactor UI auth implementationRichard van der Hoff2017-12-051-0/+16
* Improve comments on get_user_by_access_tokenRichard van der Hoff2017-11-291-1/+5
* Add a config option to block all room invites (#2457)Richard van der Hoff2017-09-191-0/+8
* Merge pull request #2309 from matrix-org/erikj/user_ip_replErik Johnston2017-07-061-1/+1
|\
| * Fix upErik Johnston2017-06-271-1/+1
* | Cache macaroon parse and validationErik Johnston2017-06-291-13/+60
|/
* Batch upsert user ipsErik Johnston2017-06-271-2/+1
* Change is_host_joined to use current_state tableErik Johnston2017-06-091-11/+2
* Use CodeMessageException subclass insteadDavid Baker2017-04-251-0/+11
* use jsonschema.FormatChecker for RoomID and UserID stringspik2017-03-231-18/+27
* Add valid filter tests, flake8, fix typopik2017-03-231-5/+6
* check_valid_filter using JSONSchemapik2017-03-231-93/+158
* Fix a couple of logcontext leaksRichard van der Hoff2017-03-231-3/+2
* CommentErik Johnston2017-03-151-1/+3
* CommentErik Johnston2017-03-151-0/+3
* Format presence events on the edges instead of reformatting them multiple timesErik Johnston2017-03-151-10/+22
* Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2Erik Johnston2017-03-151-0/+2
|\
| * Support registration / login with phone numberDavid Baker2017-03-131-0/+2
* | Address review commentsRichard van der Hoff2017-03-141-5/+14
* | re-refactor exception heirarchyRichard van der Hoff2017-03-141-16/+14
* | Fix routing loop when fetching remote mediaRichard van der Hoff2017-03-131-7/+52
|/
* Revert "Support registration & login with phone number"Erik Johnston2017-03-131-2/+0
* WIP support for msisdn 3pid proxy methodsDavid Baker2017-02-141-0/+2
* Remove a few aspirational but unused constantsDavid Baker2017-02-081-3/+0
* Change resolve_state_groups call site logging to DEBUGErik Johnston2017-01-171-1/+1
* Remove unused functionErik Johnston2017-01-131-3/+0
* Split event auth code into seperate moduleErik Johnston2017-01-131-645/+9
* Split out static auth methods from Auth objectErik Johnston2017-01-101-419/+495
* Fix flake8 and update changelog v0.18.6-rc3Mark Haines2017-01-051-1/+1
* add logging for all the places we call resolve_state_groups. my kingdom for a...Matthew Hodgson2017-01-051-0/+1
* Prevent user tokens being used as guest tokens (#1675)Richard van der Hoff2016-12-061-15/+36
* Rip out more refresh_token codeRichard van der Hoff2016-11-301-3/+2
* Merge pull request #1656 from matrix-org/rav/remove_time_caveatRichard van der Hoff2016-11-301-3/+13
|\
| * CommentsRichard van der Hoff2016-11-301-3/+9
| * Stop putting a time caveat on access tokensRichard van der Hoff2016-11-291-0/+4
* | Merge pull request #1653 from matrix-org/rav/guest_e2eRichard van der Hoff2016-11-291-1/+5
|\ \ | |/ |/|
| * Give guest users a device_idRichard van der Hoff2016-11-251-1/+5
* | Merge pull request #1655 from matrix-org/rav/remove_redundant_macaroon_checksRichard van der Hoff2016-11-251-26/+8
|\ \
| * | Remove redundant list of known caveat prefixesRichard van der Hoff2016-11-241-26/+8
| |/
* / Return early on /sync code paths if a '*' filter is usedKegan Dougal2016-11-221-0/+29
|/
* Merge pull request #1638 from matrix-org/kegan/sync-event-fieldsKegsay2016-11-221-0/+16
|\
| * Glue only_event_fields into the sync rest servletKegan Dougal2016-11-221-0/+1
| * Move event_fields filtering to serialize_eventKegan Dougal2016-11-211-55/+1
| * Add filter_event_fields and filter_field to FilterCollectionKegan Dougal2016-11-211-0/+69
* | Fail with a coherent error message if `/sync?filter=` is invalidKegan Dougal2016-11-211-0/+1
|/
* Merge pull request #1098 from matrix-org/markjh/bearer_tokenMark Haines2016-10-251-9/+37
|\
| * Fix unit testsMark Haines2016-09-121-1/+1
| * Allow clients to supply access_tokens as headersMark Haines2016-09-091-9/+37
* | Merge pull request #1175 from matrix-org/luke/feature-configurable-as-rate-li...Luke Barnard2016-10-201-7/+10
|\ \