summary refs log tree commit diff
path: root/synapse/rest/client (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6949 from matrix-org/rav/list_room_aliases_peekableRichard van der Hoff2020-02-191-6/+6
|\
| * Add `allow_departed_users` param to `check_in_room_or_world_readable`Richard van der Hoff2020-02-191-6/+6
* | Move MSC2432 stuff onto unstable prefix (#6948)Richard van der Hoff2020-02-192-1/+9
|/
* Implement GET /_matrix/client/r0/rooms/{roomId}/aliases (#6939)Richard van der Hoff2020-02-181-0/+23
* Remove m.lazy_load_members from unstable features since it is in CS r0.5.0 (#...Aaron Raimist2020-02-131-1/+0
* MSC2260: Block direct sends of m.room.aliases events (#6794)Richard van der Hoff2020-01-301-0/+12
* Add `rooms.room_version` column (#6729)Erik Johnston2020-01-271-1/+2
* Validate client_secret parameter (#6767)Andrew Morgan2020-01-242-5/+21
* Admin API to list, filter and sort rooms (#6720)Andrew Morgan2020-01-221-1/+1
* Fixup synapse.rest to pass mypy (#6732)Erik Johnston2020-01-204-9/+17
* Fix `/events/:event_id` deprecated API. (#6731)Erik Johnston2020-01-201-1/+1
* Add org.matrix.e2e_cross_signing to unstable_features in /versions as per MSC...Neil Johnson2020-01-161-0/+2
* Remove duplicate session check in web fallback servlet (#6702)Andrew Morgan2020-01-151-4/+0
* Clean up startup for the pusher (#6558)Richard van der Hoff2019-12-181-17/+16
* Back out change preventing setting null avatar URLsErik Johnston2019-12-111-6/+6
* Better errors regarding changing avatar_url (#6497)Andrew Morgan2019-12-091-3/+8
* Port rest.client.v2Erik Johnston2019-12-0523-505/+361
* Port rest/v1 to async/awaitErik Johnston2019-12-0510-166/+117
* Merge branch 'develop' into babolivier/context_filtersBrendan Abolivier2019-12-044-22/+104
|\
| * Add User-Interactive Auth to /account/3pid/add (#6119)Andrew Morgan2019-11-291-0/+5
| * MSC2367 Allow reason field on all member eventsErik Johnston2019-11-281-1/+1
| * add etag and count to key backup endpoints (#5858)Hubert Chathi2019-11-271-4/+4
| * LintBrendan Abolivier2019-11-201-1/+3
| * Apply suggestions from code reviewErik Johnston2019-11-181-1/+1
| * Only do `rc_login` ratelimiting on succesful login.Erik Johnston2019-11-061-18/+93
* | Update copyrightsBrendan Abolivier2019-11-051-0/+3
|/
* Merge pull request #6301 from matrix-org/babolivier/msc2326Brendan Abolivier2019-11-011-0/+3
|\
| * Add unstable feature flagBrendan Abolivier2019-11-011-0/+3
* | Support for routing outbound HTTP requests via a proxy (#6239)Richard van der Hoff2019-11-011-1/+1
* | Update black to 19.10b0 (#6304)Amber Brown2019-11-013-10/+11
* | Remove usage of deprecated logger.warn method from codebase (#6271)Andrew Morgan2019-10-314-14/+14
* | Merge pull request #6280 from matrix-org/erikj/receipts_async_awaitErik Johnston2019-10-302-15/+9
|\ \
| * | Port receipt and read markers to async/waitErik Johnston2019-10-292-15/+9
| |/
* / Port room rest handlers to async/awaitErik Johnston2019-10-291-94/+72
|/
* Address codestyle concernsMichael Kaye2019-10-241-1/+6
* Delay printf until logging is required.Michael Kaye2019-10-241-3/+3
* Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-10-188-224/+481
|\
| * Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-10-188-224/+481
| |\
| | * Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_versionHubert Chathi2019-10-111-1/+1
| | |\
| | | * make version optional in body of e2e backup version updateHubert Chathi2019-10-091-1/+1
| | * | cas: support setting display name (#6114)Valérian Rousset2019-10-111-1/+3
| | * | send 404 as http-status when filter-id is unknown to the server (#2380)krombel2019-10-102-22/+31
| | |/
| | * Land improved room list based on room stats (#6019)Erik Johnston2019-10-021-0/+8
| | * Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-spanErik Johnston2019-09-271-0/+18
| | |\
| | | * isortErik Johnston2019-09-251-1/+1
| | | * Add tags for event_id and txn_id in event sendingErik Johnston2019-09-251-0/+18
| | * | Kill off half-implemented password-reset via sms (#6101)Richard van der Hoff2019-09-261-64/+1
| | * | Stop advertising unsupported flows for registration (#6107)Richard van der Hoff2019-09-251-3/+29
| | * | Refactor code for calculating registration flows (#6106)Richard van der Hoff2019-09-251-62/+62
| | |/
| | * Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_workRichard van der Hoff2019-09-243-75/+316
| | |\
| | | * Add an unstable feature flag for separate add/bind 3pid APIs (#6044)Andrew Morgan2019-09-231-0/+2
| | | * Add m.id_access_token to /versions unstable_features (MSC2264) (#5974)Andrew Morgan2019-09-231-0/+3
| | | * Add m.require_identity_server to /versions unstable_flags (#5972)Andrew Morgan2019-09-231-1/+13
| | | * Add POST submit_token endpoint for MSISDN (#6078)Andrew Morgan2019-09-231-2/+45
| | | * Implement MSC2290 (#6043)Andrew Morgan2019-09-232-72/+95
| | | * Disable /register/available if registration is disabled (#6082)Andrew Morgan2019-09-231-0/+5
| | | * Allow HS to send emails when adding an email to the HS (#6042)Andrew Morgan2019-09-202-51/+225
| | | * Remove trailing slash ability from password reset's submit_token endpoint (#6...Andrew Morgan2019-09-201-1/+1
| | | * Drop support for bind param on POST /account/3pid (MSC2290) (#6067)Andrew Morgan2019-09-201-4/+0
| | | * Use unstable prefix for 3PID unbind API (#6062)J. Ryan Stinnett2019-09-191-1/+1
| | | * Remove POST method from password reset submit_token endpoint (#6056)Andrew Morgan2019-09-191-17/+0
| | * | Merge branch 'develop' into rav/saml_mapping_workRichard van der Hoff2019-09-1933-384/+525
| | |\|
| | | * Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)Andrew Morgan2019-09-111-0/+1
| | | * Add changelogAndrew Morgan2019-09-101-1/+1
| | | * Use account_threepid_delegate for 3pid validationAndrew Morgan2019-09-101-1/+2
| | * | Record mappings from saml users in an external tableRichard van der Hoff2019-09-131-0/+14
| * | | Merge branch 'develop' into uhoreg/e2e_cross-signing_mergedHubert Chathi2019-09-074-167/+345
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'develop' into cross-signing_sig_uploadHubert Chathi2019-09-074-167/+345
|\ \ \ \ | | |/ / | |/| |
| * | | Apply suggestions from code reviewAndrew Morgan2019-09-062-2/+2
| * | | Fix destructuring assumption bugAndrew Morgan2019-09-062-2/+2
| * | | Allow Synapse to send registration emails + choose Synapse or an external ser...Andrew Morgan2019-09-064-161/+305
| * | | Switch to using v2 Identity Service APIs other than lookup (MSC 2140) (#5892)Andrew Morgan2019-09-051-6/+7
| * | | Add POST /_matrix/client/r0/account/3pid/unbind (MSC2140) (#5980)Andrew Morgan2019-09-051-0/+33
* | | | update with newer coding styleHubert Chathi2019-09-041-2/+2
* | | | make black happyHubert Chathi2019-09-041-0/+1
* | | | allow uploading signatures of master key signed by devicesHubert Chathi2019-09-041-1/+1
* | | | implement device signature uploading/fetchingHubert Chathi2019-09-041-0/+50
| |/ / |/| |
* | | Merge branch 'develop' into cross-signing_keysHubert Chathi2019-09-0431-165/+164
|\| |
| * | Remove bind_email and bind_msisdn (#5964)Andrew Morgan2019-09-041-2/+0
| * | Remove double return statements (#5962)Andrew Morgan2019-09-032-3/+0
| * | Opentrace device lists (#5853)Jorik Schellekens2019-09-032-2/+6
| * | Revert "Add m.id_access_token flag (#5930)" (#5945)Andrew Morgan2019-08-301-6/+1
| * | Remove unnecessary parentheses around return statements (#5931)Andrew Morgan2019-08-3030-158/+158
| * | Add m.id_access_token flag (#5930)Andrew Morgan2019-08-301-1/+6
* | | Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keysHubert Chathi2019-08-285-67/+46
|\| |
| * | Merge pull request #5877 from Awesome-Technologies/remove_shared_secret_regis...Richard van der Hoff2019-08-221-53/+4
| |\ \
| | * | Remove shared secret registration from client/r0/register endpointManuel Stahl2019-08-221-53/+4
| * | | Revert "Add "require_consent" parameter for registration"Brendan Abolivier2019-08-221-4/+1
| * | | Add "require_consent" parameter for registrationHalf-Shot2019-08-221-1/+4
| * | | Opentrace e2e keys (#5855)Jorik Schellekens2019-08-221-1/+12
| |/ /
| * / Fix up password reset template config names (#5863)Andrew Morgan2019-08-151-2/+2
| |/
| * Return 404 instead of 403 when retrieving an event without perms (#5798)Andrew Morgan2019-08-061-3/+11
| * LintBrendan Abolivier2019-08-011-4/+2
| * Allow defining HTML templates to serve the user on account renewalBrendan Abolivier2019-08-011-6/+17
* | apply PR review suggestionsHubert Chathi2019-08-211-1/+1
* | Merge branch 'cross-signing_hidden' into cross-signing_keysHubert Chathi2019-08-0134-236/+247
|\|
| * Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-242-7/+32
| |\
| | * Fix servlet metric names (#5734)Jorik Schellekens2019-07-242-7/+32
| * | Replace returnValue with return (#5736)Amber Brown2019-07-2334-229/+215
| |/
* / allow uploading keys for cross-signingHubert Chathi2019-07-251-3/+43
|/
* Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2019-07-181-32/+43
* Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-112-4/+15
* Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-101-2/+12
* Include the original event in /relations (#5626)Andrew Morgan2019-07-091-3/+5
* Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-082-16/+9
* Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-081-39/+10
* Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-041-1/+1
* Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-021-8/+46
|\
| * Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-011-1/+1
| |\
| * | rename BaseSSORedirectServlet for consistencyRichard van der Hoff2019-06-271-3/+3
| * | Move all the saml stuff out to a centralised handlerRichard van der Hoff2019-06-261-11/+2
| * | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-2636-862/+709
| |\ \
| * | | Code cleanups and simplifications.Richard van der Hoff2019-06-111-42/+41
| * | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-1038-311/+529
| |\ \ \
| * | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-021-0/+46
* | | | | Fix JWT login with new users (#5586)PauRE2019-07-021-6/+3
| |_|_|/ |/| | |
* | | | Fix JWT login (#5555)PauRE2019-06-271-1/+1
| |_|/ |/| |
* | | Split public rooms directory auth config in twoBrendan Abolivier2019-06-241-1/+1
* | | Run Black. (#5482)Amber Brown2019-06-2036-854/+688
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-06-111-4/+5
|\ \ \
| * | | Change password reset links to /_matrix.Erik Johnston2019-06-111-4/+5
* | | | Don't warn user about password reset disabling through config code (#5387)Andrew Morgan2019-06-111-4/+15
| |_|/ |/| |
* | | Merge pull request #5363 from matrix-org/babolivier/account_validity_send_mai...Brendan Abolivier2019-06-101-1/+1
|\ \ \ | |/ / |/| |
| * | Don't check whether the user's account is expired on /send_mail requestsBrendan Abolivier2019-06-051-1/+1
* | | Add ability to perform password reset via email without trusting the identity...Andrew Morgan2019-06-061-5/+238
* | | Neilj/add r0.5 to versions (#5360)Neil Johnson2019-06-051-0/+1
* | | Hawkowl/fix missing auth (#5328)Amber Brown2019-06-041-0/+1
* | | Unify v1 and v2 REST client APIs (#5226)Amber Brown2019-06-0337-305/+287
| |/ |/|
* | Fix ignored filter field in `/messages` endpointEisha Chen-yen-su2019-05-301-0/+2
* | Merge pull request #5256 from aaronraimist/logout-correct-errorErik Johnston2019-05-301-18/+9
|\ \
| * | LintAaron Raimist2019-05-291-2/+0
| * | Get rid of try exceptAaron Raimist2019-05-271-16/+9
| * | Show correct error when logging out and access token is missingAaron Raimist2019-05-241-4/+4
* | | Serve CAS login over r0 (#5286)Amber Brown2019-05-301-2/+2
|/ /
* | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_eventsErik Johnston2019-05-241-0/+3
|\ \
| * | Don't bundle events in /sync or /eventsErik Johnston2019-05-211-0/+3
* | | Add config option for setting homeserver's default room version (#5223)Andrew Morgan2019-05-231-2/+3
|/ /
* | Merge pull request #5209 from matrix-org/erikj/reactions_baseErik Johnston2019-05-201-0/+338
|\ \
| * | Move parsing of tokens out of storage layerErik Johnston2019-05-161-0/+19
| * | Check that event is visible in new APIsErik Johnston2019-05-161-2/+15
| * | Add aggregations APIErik Johnston2019-05-161-1/+140
| * | Actually implement idempotencyErik Johnston2019-05-151-1/+8
| * | Add simple pagination APIErik Johnston2019-05-151-0/+50
| * | Add simple send_relation API and track in DBErik Johnston2019-05-151-0/+110
* | | Merge pull request #5174 from matrix-org/dbkr/add_dummy_flow_to_recaptcha_onlyDavid Baker2019-05-161-5/+17
|\ \ \ | |_|/ |/| |
| * | Re-order flows so that email auth is done lastDavid Baker2019-05-101-4/+12
| * | CommentDavid Baker2019-05-101-0/+4
| * | Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
* | | Merge pull request #5187 from matrix-org/dbkr/only_check_threepid_not_in_use_...David Baker2019-05-161-18/+22
|\ \ \
| * | | Only check 3pids not in use when registeringDavid Baker2019-05-141-18/+22
| |/ /
* | | Make all the rate limiting options more consistent (#5181)Amber Brown2019-05-151-10/+13
* | | Drop support for v2_alpha API prefix (#5190)Richard van der Hoff2019-05-156-24/+19
| |/ |/|
* | NewsfileErik Johnston2019-05-141-6/+6
* | Allow client event serialization to be asyncErik Johnston2019-05-144-43/+48
|/
* Revert 085ae346ace418e0fc043ac5f568f85ebf80038eDavid Baker2019-05-101-1/+1
* Add a DUMMY stage to captcha-only registration flowDavid Baker2019-05-101-1/+1
* add options to require an access_token to GET /profile and /publicRooms on CS...Matthew Hodgson2019-05-082-12/+34
* Move admin api impl to its own packageRichard van der Hoff2019-05-011-896/+0
* Move admin API to a new prefixRichard van der Hoff2019-05-011-20/+50
* Move admin API away from ClientV1RestServletRichard van der Hoff2019-05-011-33/+33
* Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/accou...Erik Johnston2019-04-177-87/+68
|\
| * Merge pull request #5047 from matrix-org/babolivier/account_expirationBrendan Abolivier2019-04-171-0/+62
| |\
| * \ Merge pull request #5071 from matrix-org/babolivier/3pid-checkBrendan Abolivier2019-04-171-0/+18
| |\ \
| | * | Make sure we're not registering the same 3pid twiceBrendan Abolivier2019-04-171-0/+18
| * | | Remove usage of request.postpathErik Johnston2019-04-161-8/+8
| * | | Only handle GET requests for /push_rulesErik Johnston2019-04-151-0/+7
| * | | Add admin API for group deletionErik Johnston2019-04-031-0/+26
| * | | Fix grammar and document get_current_users_in_room (#4998)Andrew Morgan2019-04-031-1/+1
| * | | Remove presence lists (#4989)Neil Johnson2019-04-031-67/+0
| * | | Merge pull request #4982 from matrix-org/erikj/msc1915Erik Johnston2019-04-031-2/+3
| |\ \ \
| | * | | Add unbind API to /r0 as it is now stabalisedErik Johnston2019-04-011-1/+1
| | * | | Allowing specifying IS to use in unbind API.Erik Johnston2019-04-011-1/+2
| * | | | Collect room-version variations into one place (#4969)Richard van der Hoff2019-04-012-7/+5
| |/ / /
| * / / remove log line for password (#4965)Neil Johnson2019-03-281-2/+0
| |/ /
* | / Add management endpoints for account validityBrendan Abolivier2019-04-172-1/+69
| |/ |/|
* | Send out emails with links to extend an account's validity periodBrendan Abolivier2019-04-171-0/+62
|/
* Support 3PID login in password providers (#4931)Andrew Morgan2019-03-261-4/+45
* Merge pull request #4904 from matrix-org/erikj/fix_shutdownErik Johnston2019-03-211-20/+35
|\
| * Use flagsErik Johnston2019-03-201-2/+4
| * Gracefully handle failing to kick userErik Johnston2019-03-201-19/+27
| * Log new room IDErik Johnston2019-03-201-1/+6
* | Add option to disable searching in the user dirErik Johnston2019-03-191-0/+6
|/
* Add ratelimiting on login (#4821)Brendan Abolivier2019-03-152-2/+12
* Send message after room has been shutdownErik Johnston2019-03-061-11/+11
* Make registration ratelimiter separate from the main events oneBrendan Abolivier2019-03-061-1/+1
* Revert "Split ratelimiters in two (one for events, one for registration)"Brendan Abolivier2019-03-061-1/+1
* Split ratelimiters in two (one for events, one for registration)Brendan Abolivier2019-03-051-1/+1
* Merge pull request #4772 from jbweston/jbweston/server-version-apiErik Johnston2019-03-051-0/+23
|\
| * Add 'server_version' endpoint to admin APIJoseph Weston2019-03-011-0/+23
* | Add rate-limiting on registration (#4735)Brendan Abolivier2019-03-051-4/+29
|/
* switch from google.com to recaptcha.net for reCAPTCHA (#4731)Matthew Hodgson2019-02-251-1/+1
* Fix registration on workers (#4682)Erik Johnston2019-02-203-137/+14
* Move register_device into handlerErik Johnston2019-02-182-84/+24
* Update docsErik Johnston2019-02-181-1/+1
* Split out registration to workerErik Johnston2019-02-181-27/+46
* Merge pull request #4580 from matrix-org/uhoreg/e2e_backup_add_updatingErik Johnston2019-02-111-0/+34
|\
| * make sure version is in body and wrap in linearizer queueHubert Chathi2019-02-081-1/+2
| * add new endpoint to update backup versionsHubert Chathi2019-02-061-0/+33
* | Allow "unavailable" presence status for /sync (#4592)Valentin Anger2019-02-082-1/+2
|/
* Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into ...Neil Johnson2019-01-301-4/+4
|\
| * Merge branch 'develop' into neilj/room_capabilitiesNeil Johnson2019-01-301-4/+4
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg...Andrew Morgan2019-01-251-13/+10
| | |\
| | * | Fix typosAndrew Morgan2019-01-221-4/+4
* | | | isortNeil Johnson2019-01-301-2/+1
|/ / /
* | | formatting and use constants where availableNeil Johnson2019-01-301-19/+17
* | | Populate default room version from ConstantsNeil Johnson2019-01-301-1/+2
* | | reflect that rooms v3 is a stable room versionNeil Johnson2019-01-301-0/+1
* | | rework format of change password capabilityNeil Johnson2019-01-291-1/+3
* | | support change_password in capabilities end-pointNeil Johnson2019-01-291-2/+12
* | | enforce auth for capabilities endpointNeil Johnson2019-01-291-10/+17
* | | backout v3Neil Johnson2019-01-251-1/+0
* | | Support room version capabilities in CS API (MSC1804)Neil Johnson2019-01-251-0/+49
| |/ |/|
* | move guard out of is_threepid_reserved and into register.pyNeil Johnson2019-01-221-4/+5
* | Fix None guard in config.server.is_threepid_reservedNeil Johnson2019-01-221-1/+3
* | Config option to disable requesting MSISDN on registrationNeil Johnson2019-01-211-11/+5
|/
* Add GET account data routes (#4303)Travis Ralston2019-01-071-1/+33
* Remove v1 only REST APIs now we don't ship matrix console (#4334)Amber Brown2018-12-293-434/+0
* Return well_known in /login response (#4319)Richard van der Hoff2018-12-241-7/+11
* create support user (#4141)Neil Johnson2018-12-141-1/+10
* Initialise user displayname from SAML2 data (#4272)Richard van der Hoff2018-12-071-0/+5
* Factor SSO success handling out of CAS login (#4264)Richard van der Hoff2018-12-071-29/+76
* Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-061-67/+2
* Fix non-ASCII pushrules (#4248)Amber Brown2018-12-041-12/+23
* fix type errorAmber Brown2018-12-031-1/+1
* Neilj/fix autojoin (#4223)Neil Johnson2018-11-281-0/+1
* Support m.login.sso (#4220)Richard van der Hoff2018-11-271-4/+9
* Fix fallback auth on Python 3 (#4197)Amber Brown2018-11-191-22/+16
* Remove duplicate slashes in generated consent URLsTravis Ralston2018-11-151-2/+2
* Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-061-1/+1
* handle empty backups according to latest spec proposal (#4123)Hubert Chathi2018-11-051-3/+18
* Include a version query string arg for the consent routeTravis Ralston2018-10-311-2/+4
* Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-312-1/+91
|\
| * Address review commentsRichard van der Hoff2018-10-261-5/+16
| * Basic initial support for room upgradesRichard van der Hoff2018-10-251-0/+78
| * Refactor state group lookup to reduce DB hits (#4011)Erik Johnston2018-10-251-1/+2
* | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-242-33/+6
|\|
| * Fix a number of flake8 errorsRichard van der Hoff2018-10-241-1/+1
| * Clean up room alias creationErik Johnston2018-10-191-32/+5
* | pep8Travis Ralston2018-10-152-13/+2
* | Merge branch 'develop' into travis/login-termsTravis Ralston2018-10-151-0/+372
|\|
| * missed oneDavid Baker2018-10-121-0/+1
| * Don't mangle exceptionsDavid Baker2018-10-121-4/+2
| * Split /room_keys/version into 2 servletsDavid Baker2018-10-121-9/+21
| * PR feedback pt. 1David Baker2018-10-121-1/+1
| * isortDavid Baker2018-10-091-1/+1
| * Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backupsDavid Baker2018-10-0913-77/+144
| |\
| * | WIP e2e key backupsDavid Baker2018-09-131-4/+10
| * | try to make flake8 and isort happyHubert Chathi2018-09-061-1/+4
| * | Merge branch 'develop' into e2e_backupsHubert Chathi2018-08-248-68/+74
| |\ \
| * | | missing importMatthew Hodgson2018-08-121-1/+1