Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into pushers | David Baker | 2015-01-22 | 1 | -1/+0 |
|\ | | | | | | | | | Conflicts: synapse/rest/__init__.py | ||||
| * | Finish renaming "context" to "room_id" in federation codebase | Mark Haines | 2015-01-16 | 1 | -1/+0 |
| | | |||||
* | | Oops: second part of commit dc938606 | David Baker | 2015-01-22 | 1 | -6/+2 |
| | | |||||
* | | Merge branch 'develop' into pushers | David Baker | 2015-01-13 | 7 | -12/+42 |
|\| | |||||
| * | SYN-231: User agent header broken | Mark Haines | 2015-01-08 | 1 | -3/+3 |
| | | |||||
| * | Update copyright notices | Mark Haines | 2015-01-06 | 7 | -8/+8 |
| | | |||||
| * | Set a content-length for JSON responses | Mark Haines | 2015-01-06 | 1 | -0/+1 |
| | | |||||
| * | Include version in User-Agent and Server headers | Mark Haines | 2014-12-22 | 4 | -6/+35 |
| | | |||||
* | | Merge branch 'develop' into pushers | David Baker | 2014-12-18 | 3 | -235/+129 |
|\| | | | | | | | | | | | | | Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py | ||||
| * | Fix tests and remove debug logging | Erik Johnston | 2014-12-12 | 1 | -4/+0 |
| | | |||||
| * | Consistently url decode and decode as utf 8 the URL parts | Erik Johnston | 2014-12-12 | 1 | -1/+11 |
| | | |||||
| * | Limit the size of images that are thumbnailed serverside. Limit the size of ↵ | Mark Haines | 2014-12-11 | 1 | -6/+19 |
| | | | | | | | | file that a server will download from a remote server | ||||
| * | Merge branch 'develop' into media_repository | Mark Haines | 2014-12-10 | 1 | -9/+26 |
| |\ | |||||
| | * | turn back on per-request transaction retries, so that every time we try to ↵ | Matthew Hodgson | 2014-12-10 | 1 | -4/+3 |
| | | | | | | | | | | | | hit a dead server we actually end up hammering 5 times :| | ||||
| | * | Code style. | Erik Johnston | 2014-12-10 | 1 | -8/+21 |
| | | | |||||
| | * | add errbacks to enqueue_pdu deferreds; change logging for failed federation ↵ | Matthew Hodgson | 2014-12-10 | 1 | -2/+2 |
| | | | | | | | | | | | | sends to warn rather than exception | ||||
| | * | squidge to 79 columns as per pep8 | Matthew Hodgson | 2014-12-10 | 1 | -3/+4 |
| | | | |||||
| | * | track replication destination health, and perform exponential back-off when ↵ | Matthew Hodgson | 2014-12-07 | 1 | -6/+10 |
| | | | | | | | | | | | | sending transactions. does *not* yet retry transactions, but drops them on the floor if waiting for a server to recover. | ||||
| * | | Implement download support for media_repository | Mark Haines | 2014-12-04 | 1 | -5/+68 |
| | | | |||||
| * | | Get uploads working with new media repo | Mark Haines | 2014-12-02 | 1 | -2/+2 |
| | | | |||||
| * | | Write the upload portion of version 1 of the media repository | Mark Haines | 2014-12-02 | 2 | -219/+14 |
| |/ | |||||
* | | Merge branch 'develop' into pushers | David Baker | 2014-12-02 | 1 | -2/+2 |
|\| | |||||
| * | typos | Matthew Hodgson | 2014-11-24 | 1 | -2/+2 |
| | | |||||
* | | More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP ↵ | David Baker | 2014-11-21 | 1 | -0/+19 |
|/ | | | | pokes work or not yet but the retry semantics are pretty good. | ||||
* | Fix pep8 and pyflakes warnings | Mark Haines | 2014-11-20 | 3 | -7/+8 |
| | |||||
* | Merge branch 'develop' into http_client_refactor | David Baker | 2014-11-20 | 2 | -8/+9 |
|\ | |||||
| * | Fix pep8 codestyle warnings | Mark Haines | 2014-11-20 | 2 | -8/+9 |
| | | |||||
| * | Use module loggers rather than the root logger. Exceptions caused by bad ↵ | Mark Haines | 2014-11-20 | 1 | -1/+1 |
| | | | | | | | | clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str' | ||||
* | | Separate out the matrix http client completely because just about all of its ↵ | David Baker | 2014-11-20 | 3 | -323/+338 |
| | | | | | | | | code it now separate from the simple case we need for standard HTTP(S) | ||||
* | | Refactor the HTTP clients a little. | David Baker | 2014-11-20 | 1 | -79/+75 |
| | | |||||
* | | CaptchaServerHttpClient should extend the base, not matrix http client. | David Baker | 2014-11-20 | 1 | -1/+1 |
|/ | |||||
* | SYN-141: Encode query params as UTF-8. | Mark Haines | 2014-11-18 | 1 | -1/+7 |
| | |||||
* | Merge branch 'develop' into request_logging | Mark Haines | 2014-11-14 | 1 | -0/+8 |
|\ | | | | | | | | | | | | | Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py | ||||
| * | apply some cache headers to try to make the content repo less nutso | Matthew Hodgson | 2014-11-11 | 1 | -0/+8 |
| | | |||||
* | | Merge branch 'develop' into request_logging | Mark Haines | 2014-10-30 | 3 | -11/+7 |
|\| | | | | | | | | | Conflicts: synapse/config/logger.py | ||||
| * | Fix pep8 warnings | Mark Haines | 2014-10-30 | 3 | -12/+10 |
| | | |||||
* | | Add a request-id to each log line | Mark Haines | 2014-10-30 | 2 | -12/+27 |
|/ | |||||
* | Add get_json method to 3pid http client. Better logging for errors in 3pid ↵ | Mark Haines | 2014-10-20 | 1 | -1/+39 |
| | | | | requests | ||||
* | remove debugging logging for signing requests | Mark Haines | 2014-10-14 | 1 | -4/+0 |
| | |||||
* | Verify signatures for server2server requests | Mark Haines | 2014-10-13 | 1 | -3/+7 |
| | |||||
* | SYN-75 sign at the request level rather than the transaction level | Mark Haines | 2014-10-13 | 1 | -7/+45 |
| | |||||
* | Merge branch 'develop' into server2server_signing | Mark Haines | 2014-10-13 | 1 | -11/+35 |
|\ | |||||
| * | Replace on_send_callback with something a bit clearer so that we can sign ↵ | Mark Haines | 2014-10-13 | 1 | -11/+35 |
| | | | | | | | | messages | ||||
* | | Merge branch develop into server2server_signing | Mark Haines | 2014-10-13 | 1 | -154/+136 |
|\| | | | | | | | | | Conflicts: synapse/app/homeserver.py | ||||
| * | Fix pyflakes errors | Mark Haines | 2014-10-02 | 1 | -8/+2 |
| | | |||||
| * | Add a keyword argument to get_json to avoid retrying on DNS failures. Rather ↵ | Mark Haines | 2014-10-02 | 1 | -8/+1 |
| | | | | | | | | than passing MatrixHttpClient.RETRY_DNS_LOOKUP_FAILURES as a fake query string parameter | ||||
| * | Split PlainHttpClient into separate clients for talking to Identity servers ↵ | Mark Haines | 2014-10-02 | 1 | -144/+146 |
| | | | | | | | | and talking to Capatcha servers | ||||
| * | remove "red", "blue" and "green" server_name mappings | Mark Haines | 2014-10-01 | 1 | -7/+0 |
| | | |||||
* | | Fix a few pyflakes errors in the server_key_resource | Mark Haines | 2014-09-23 | 1 | -5/+1 |
| | | |||||
* | | Add a _matrix/key/v1 resource with the verification keys of the local server | Mark Haines | 2014-09-23 | 1 | -0/+93 |
|/ | |||||
* | Fix 'age' key to update on retries | Erik Johnston | 2014-09-15 | 1 | -3/+10 |
| | |||||
* | Captchas now work on registration. Missing x-forwarded-for config arg ↵ | Kegan Dougal | 2014-09-05 | 1 | -1/+27 |
| | | | | support. Missing reloading a new captcha on the web client / displaying a sensible error message. | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into develop | David Baker | 2014-09-03 | 5 | -169/+232 |
|\ | | | | | | | | | Conflicts: synapse/http/client.py | ||||
| * | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 5 | -5/+5 |
| | | | | | | | | hasn't been incorporated in time for launch. | ||||
| * | Limit the size of uploads | Mark Haines | 2014-09-03 | 1 | -0/+14 |
| | | |||||
| * | Make retrying requests on DNS failures configurable, and turn off retrying ↵ | Kegan Dougal | 2014-09-03 | 1 | -6/+19 |
| | | | | | | | | only in directory.get_association | ||||
| * | hs: Updated synapse.http.client to handle DNSLookupErrors and bail immediately. | Kegan Dougal | 2014-09-03 | 1 | -1/+6 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-03 | 2 | -163/+193 |
| |\ | | | | | | | | | | | | | | | | Conflicts: synapse/http/server.py synapse/http/content_repository.py | ||||
| | * | move contentrepo class to it's own file | Mark Haines | 2014-09-03 | 2 | -162/+192 |
| | | | |||||
| * | | Add option to change content repo location | Erik Johnston | 2014-09-03 | 1 | -3/+4 |
| |/ | |||||
* / | Add support for registering with a threepid to the HS (get credentials from ↵ | David Baker | 2014-09-03 | 1 | -5/+35 |
|/ | | | | the client and check them against an ID server). | ||||
* | Merge branch 'master' into develop | Erik Johnston | 2014-09-03 | 1 | -2/+2 |
|\ | |||||
| * | Update default endpoint port to match the default ports in the config | Erik Johnston | 2014-09-02 | 1 | -2/+2 |
| | | |||||
* | | Set status message for ratelimit error responses | Mark Haines | 2014-09-03 | 1 | -5/+9 |
|/ | |||||
* | given everything's apparently gone https:// by default for c-s, change this ↵ | Matthew Hodgson | 2014-09-01 | 1 | -1/+5 |
| | | | | hardcoding... | ||||
* | Fix SSL for federation http client | Mark Haines | 2014-09-01 | 2 | -2/+2 |
| | |||||
* | Enable SSL for s2s http client | Mark Haines | 2014-09-01 | 1 | -2/+6 |
| | |||||
* | missed a s#/matrix#/_matrix/g | Matthew Hodgson | 2014-08-31 | 1 | -1/+1 |
| | |||||
* | For the content repo, don't just use homeserver.hostname as that might not ↵ | Erik Johnston | 2014-08-24 | 1 | -1/+3 |
| | | | | include the port due to SRV. | ||||
* | Make the content repo work with in daemon mode. Return the full url on ↵ | Erik Johnston | 2014-08-22 | 1 | -6/+20 |
| | | | | upload. Update the webclient to use new content repo api. | ||||
* | Reduce the amount of incredibly spammy stack traces. Expected errors (e.g. ↵ | Kegan Dougal | 2014-08-19 | 1 | -1/+13 |
| | | | | SynapseErrors) shouldn't have their full trace logged every time. Don't send responses to disconnected requests. | ||||
* | Small amounts of cleanup and bonus round comments. | Kegan Dougal | 2014-08-18 | 1 | -4/+8 |
| | |||||
* | Implemented GETs for the ContentRepoResource. It all actually appears to be ↵ | Kegan Dougal | 2014-08-18 | 1 | -11/+60 |
| | | | | working. | ||||
* | hs: Make the uploads directory if it doesn't exist. Namespace uploads by the ↵ | Kegan Dougal | 2014-08-18 | 1 | -5/+46 |
| | | | | base64 encoded user id of the uploader. Make a reasonable attempt to retry clashing upload paths. Try to guess a sensible file extension depending on the content type. | ||||
* | Auth content uploads. Added a mapping function from request > filename. ↵ | Kegan Dougal | 2014-08-18 | 1 | -12/+32 |
| | | | | Added exception handling for content uploads. webclient: Only prefix the client API path on doRequest, not doBaseRequest (this would've broken the identity server auth too). Added matrixService.uploadContent. May not require mFileUpload anymore. | ||||
* | Added /matrix/content path, HS resource_for_content_repo attribute and ↵ | Kegan Dougal | 2014-08-18 | 1 | -0/+28 |
| | | | | FileUploadResource. Added stub methods. | ||||
* | If the web client is enabled, automatically redirect root '/' to the web ↵ | Kegan Dougal | 2014-08-14 | 1 | -0/+17 |
| | | | | client path. | ||||
* | Removed http_server from HomeServer. Updated unit tests to use either ↵ | Kegan Dougal | 2014-08-14 | 1 | -9/+3 |
| | | | | resource_for_federation or resource_for_client depending on what is being tested. | ||||
* | Start phasing out HttpServer: we should be using Resources instead. Added ↵ | Kegan Dougal | 2014-08-14 | 1 | -0/+5 |
| | | | | resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree. | ||||
* | fix http client GET parameters; somehow missing named param. how could this ↵ | Matthew Hodgson | 2014-08-14 | 1 | -2/+2 |
| | | | | have ever worked!? | ||||
* | Update get_json()'s documentation to match the actual observed behaviour | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -4/+3 |
| | |||||
* | add in whitespace after copyright statements to improve legibility | Matthew Hodgson | 2014-08-13 | 4 | -0/+4 |
| | |||||
* | Just say yes to OPTIONS requests, since we want to turn on CORS headers for ↵ | Erik Johnston | 2014-08-12 | 1 | -0/+5 |
| | | | | all paths | ||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 4 | -0/+612 |