Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com:matrix-org/synapse into state-chache | Erik Johnston | 2015-02-10 | 1 | -1/+2 |
|\ | | | | | | | | | | | Conflicts: synapse/app/homeserver.py synapse/state.py | ||||
| * | Time how long we're spending on the database thread | Erik Johnston | 2015-02-09 | 1 | -0/+2 |
| | | |||||
| * | Log when we receive a request, when we send a response and how long it took ↵ | Erik Johnston | 2015-02-09 | 1 | -1/+1 |
| | | | | | | | | to process it. | ||||
* | | Bug fixes. | Erik Johnston | 2015-02-06 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'develop' into pushers | David Baker | 2015-01-28 | 1 | -4/+8 |
|\ | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py | ||||
| * | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 1 | -1/+6 |
| | | |||||
| * | Merge rest servlets into the client json resource object | Mark Haines | 2015-01-23 | 1 | -3/+2 |
| | | |||||
* | | Merge branch 'develop' into pushers | David Baker | 2015-01-22 | 1 | -4/+11 |
|\| | | | | | | | | | Conflicts: synapse/rest/__init__.py | ||||
| * | Move rest APIs back under the rest directory | Mark Haines | 2015-01-22 | 1 | -2/+2 |
| | | |||||
| * | Fix pyflakes errors | Mark Haines | 2015-01-19 | 1 | -1/+1 |
| | | |||||
| * | Fix syntax | Mark Haines | 2015-01-19 | 1 | -2/+3 |
| | | |||||
| * | Allow ':memory:' as the database path for sqlite3 | Mark Haines | 2015-01-19 | 1 | -1/+7 |
| | | |||||
* | | Merge branch 'develop' into pushers | David Baker | 2015-01-13 | 3 | -4/+12 |
|\| | |||||
| * | Check the existance and versions of necessary modules when starting synapse, ↵ | Mark Haines | 2015-01-08 | 1 | -0/+5 |
| | | | | | | | | log which modules are used | ||||
| * | Log server version on startup | Erik Johnston | 2015-01-07 | 1 | -0/+3 |
| | | |||||
| * | Merge branch 'master' into develop | Mark Haines | 2015-01-06 | 1 | -1/+1 |
| |\ | |||||
| | * | improve error msg | Matthew Hodgson | 2014-12-24 | 1 | -1/+1 |
| | | | |||||
| * | | Update copyright notices | Mark Haines | 2015-01-06 | 3 | -3/+3 |
| |/ | |||||
* | | Merge branch 'develop' into pushers | David Baker | 2014-12-18 | 1 | -5/+17 |
|\| | | | | | | | | | | | | | Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py | ||||
| * | Make failure to run appropraite upgrade scripts more helpful. | Erik Johnston | 2014-12-16 | 1 | -3/+10 |
| | | |||||
| * | Get uploads working with new media repo | Mark Haines | 2014-12-02 | 1 | -2/+7 |
| | | |||||
* | | Merge branch 'develop' into pushers | David Baker | 2014-11-20 | 1 | -1/+1 |
|\| | |||||
| * | Merge branch 'develop' into http_client_refactor | David Baker | 2014-11-20 | 2 | -8/+15 |
| |\ | |||||
| * | | Separate out the matrix http client completely because just about all of its ↵ | David Baker | 2014-11-20 | 1 | -1/+1 |
| | | | | | | | | | | | | code it now separate from the simple case we need for standard HTTP(S) | ||||
* | | | Merge branch 'develop' into pushers | David Baker | 2014-11-20 | 2 | -8/+15 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix pep8 codestyle warnings | Mark Haines | 2014-11-20 | 2 | -5/+12 |
| | | | |||||
| * | | Use module loggers rather than the root logger. Exceptions caused by bad ↵ | Mark Haines | 2014-11-20 | 1 | -3/+3 |
| | | | | | | | | | | | | clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str' | ||||
* | | | Merge branch 'http_client_refactor' into pushers | David Baker | 2014-11-20 | 1 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Refactor the HTTP clients a little. | David Baker | 2014-11-20 | 1 | -2/+2 |
| |/ | |||||
* / | Start creating a module to do generic notifications (just prints them to ↵ | David Baker | 2014-11-19 | 1 | -0/+2 |
|/ | | | | stdout currently!) | ||||
* | Revert accidental commit of bad file | Erik Johnston | 2014-11-18 | 1 | -37/+24 |
| | |||||
* | Fix auth to correctly handle initial creation of rooms | Erik Johnston | 2014-11-18 | 1 | -24/+37 |
| | |||||
* | Stop before starting when restarting | Mark Haines | 2014-11-17 | 1 | -1/+1 |
| | |||||
* | Merge branch 'develop' into request_logging | Mark Haines | 2014-11-14 | 2 | -2/+74 |
|\ | | | | | | | | | | | | | Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py | ||||
| * | SYN-138: Rewrite synctl in python and include it in the python distribution | Mark Haines | 2014-11-13 | 1 | -0/+66 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-11-07 | 1 | -1/+4 |
| |\ | | | | | | | | | | federation_authorization | ||||
| | * | Determine webclient path by the python module it is contained in | Mark Haines | 2014-11-04 | 1 | -1/+4 |
| | | | |||||
| * | | Add option to not bind to HTTPS port. This is useful if running behind an ↵ | Erik Johnston | 2014-11-03 | 1 | -1/+4 |
| |/ | | | | | | | ssl load balancer | ||||
* | | Remove unused 'context' variables to appease pyflakes | Mark Haines | 2014-10-30 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'develop' into request_logging | Mark Haines | 2014-10-30 | 1 | -1/+0 |
|\| | | | | | | | | | Conflicts: synapse/config/logger.py | ||||
| * | Fix pep8 warnings | Mark Haines | 2014-10-30 | 1 | -1/+0 |
| | | |||||
* | | Add a request-id to each log line | Mark Haines | 2014-10-30 | 1 | -2/+10 |
|/ | |||||
* | Merge branch develop into server2server_signing | Mark Haines | 2014-10-13 | 1 | -2/+2 |
|\ | | | | | | | | | Conflicts: synapse/app/homeserver.py | ||||
| * | Split PlainHttpClient into separate clients for talking to Identity servers ↵ | Mark Haines | 2014-10-02 | 1 | -2/+2 |
| | | | | | | | | and talking to Capatcha servers | ||||
* | | Add a _matrix/key/v1 resource with the verification keys of the local server | Mark Haines | 2014-09-23 | 1 | -2/+8 |
|/ | |||||
* | prepare_database() on db_conn, not plain name, so we can pass in the ↵ | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -1/+9 |
| | | | | connection from outside | ||||
* | Make sure not to open our TCP ports until /after/ the DB is nicely prepared ↵ | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -1/+2 |
| | | | | ready for use | ||||
* | No need for a tiny run() function any more, just use reactor.run() directly | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -6/+2 |
| | |||||
* | Move database preparing code out of homserver.py into storage where it belongs | Paul "LeoNerd" Evans | 2014-09-10 | 1 | -64/+9 |
| | |||||
* | Generate m.room.aliases event when the HS creates a room alias | Erik Johnston | 2014-09-05 | 1 | -1/+1 |
| | |||||
* | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 2 | -2/+2 |
| | | | | hasn't been incorporated in time for launch. | ||||
* | Store SQL DDL deltas as well; attempt to upgrade the database on startup if ↵ | Paul "LeoNerd" Evans | 2014-09-03 | 1 | -7/+15 |
| | | | | it's too old | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-09-03 | 1 | -1/+2 |
|\ | | | | | | | | | | | Conflicts: synapse/http/server.py synapse/http/content_repository.py | ||||
| * | move contentrepo class to it's own file | Mark Haines | 2014-09-03 | 1 | -1/+2 |
| | | |||||
* | | Add option to change content repo location | Erik Johnston | 2014-09-03 | 1 | -1/+4 |
|/ | |||||
* | Add ratelimiting function to basehandler | Mark Haines | 2014-09-02 | 1 | -0/+1 |
| | |||||
* | Add unsecure listener port to homeserver | Mark Haines | 2014-09-01 | 1 | -6/+12 |
| | |||||
* | That was a breaking db change. You need to recreate the databases. (In ↵ | Erik Johnston | 2014-09-01 | 1 | -1/+1 |
| | | | | reality, it's enough to just run the im.sql through your db and change the schema version) | ||||
* | Enable SSL for s2s http client | Mark Haines | 2014-09-01 | 1 | -1/+1 |
| | |||||
* | Listen using SSL | Mark Haines | 2014-09-01 | 1 | -1/+7 |
| | |||||
* | Fix homeserver config parsing | Mark Haines | 2014-09-01 | 1 | -13/+9 |
| | |||||
* | Add config tree to synapse. Add support for reading config from a file | Mark Haines | 2014-08-31 | 1 | -71/+18 |
| | |||||
* | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-27 | 1 | -20/+45 |
|\ | |||||
| * | A reliable logger.info() message /after/ the TCP port has been opened and is ↵ | Paul "LeoNerd" Evans | 2014-08-27 | 1 | -0/+1 |
| | | | | | | | | listening; this is essential for avoiding races in wrapper scripts e.g. integration testing | ||||
| * | Use SQLite's PRAGMA user_version to check if the database file really ↵ | Paul "LeoNerd" Evans | 2014-08-27 | 1 | -6/+28 |
| | | | | | | | | matches the schema we have in mind | ||||
| * | Neater database setup at application startup time; only .connect() it once, ↵ | Paul "LeoNerd" Evans | 2014-08-27 | 1 | -17/+19 |
| | | | | | | | | not once per schema file; don't build the db_pool twice | ||||
* | | Remove call to get_federation from homeserver | Mark Haines | 2014-08-27 | 1 | -4/+0 |
|/ | |||||
* | Add the ability to turn on the twisted manhole telnet service. | Erik Johnston | 2014-08-26 | 1 | -0/+10 |
| | |||||
* | For the content repo, don't just use homeserver.hostname as that might not ↵ | Erik Johnston | 2014-08-24 | 1 | -0/+7 |
| | | | | 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 | -2/+3 |
| | | | | upload. Update the webclient to use new content repo api. | ||||
* | host a webclient by default | Matthew Hodgson | 2014-08-21 | 1 | -2/+2 |
| | |||||
* | Implemented GETs for the ContentRepoResource. It all actually appears to be ↵ | Kegan Dougal | 2014-08-18 | 1 | -2/+2 |
| | | | | working. | ||||
* | Auth content uploads. Added a mapping function from request > filename. ↵ | Kegan Dougal | 2014-08-18 | 1 | -1/+1 |
| | | | | 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 | -3/+9 |
| | | | | FileUploadResource. Added stub methods. | ||||
* | Change relative db paths to absolute paths in case we daemonize. | Erik Johnston | 2014-08-14 | 1 | -2/+9 |
| | |||||
* | chmod +x homeserver.py | Paul "LeoNerd" Evans | 2014-08-14 | 1 | -0/+0 |
| | |||||
* | Added web client prefix | Kegan Dougal | 2014-08-14 | 1 | -3/+3 |
| | |||||
* | Added a urls module for keeping client and federation prefixes. | Kegan Dougal | 2014-08-14 | 1 | -3/+2 |
| | |||||
* | If the web client is enabled, automatically redirect root '/' to the web ↵ | Kegan Dougal | 2014-08-14 | 1 | -4/+13 |
| | | | | client path. | ||||
* | Fixed dynamic resource mapping to clobber dummy Resources with the actual ↵ | Kegan Dougal | 2014-08-14 | 1 | -5/+27 |
| | | | | desired Resource in the event of a collision (as is the case for '/matrix/client' and '/matrix/client/api/v1') | ||||
* | Honour the -w flag to enable the web client at /matrix/client | Kegan Dougal | 2014-08-14 | 1 | -5/+8 |
| | |||||
* | Removed http_server from HomeServer. Updated unit tests to use either ↵ | Kegan Dougal | 2014-08-14 | 1 | -3/+1 |
| | | | | resource_for_federation or resource_for_client depending on what is being tested. | ||||
* | Make federation use resource_for_federation as well. | Kegan Dougal | 2014-08-14 | 1 | -1/+3 |
| | |||||
* | Start phasing out HttpServer: we should be using Resources instead. Added ↵ | Kegan Dougal | 2014-08-14 | 1 | -2/+75 |
| | | | | 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. | ||||
* | Don't pass host_web_client flag to register_servlets, it needs to be a ↵ | Kegan Dougal | 2014-08-13 | 1 | -1/+1 |
| | | | | Resource not a RestServlet. | ||||
* | Merge branch 'master' of github.com:matrix-org/synapse | Kegan Dougal | 2014-08-13 | 1 | -3/+2 |
|\ | |||||
| * | Fix logging verbosity parsing code | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -3/+2 |
| | | |||||
* | | Merge branch 'master' of github.com:matrix-org/synapse | Kegan Dougal | 2014-08-13 | 1 | -3/+3 |
|\| | |||||
| * | verbose by default please | Matthew Hodgson | 2014-08-13 | 1 | -3/+3 |
| | | |||||
* | | Added a -w flag which will host the web client if specified. Currently this ↵ | Kegan Dougal | 2014-08-13 | 1 | -1/+3 |
|/ | | | | just delegates to the webclient RestServlet. | ||||
* | add in whitespace after copyright statements to improve legibility | Matthew Hodgson | 2014-08-13 | 2 | -1/+2 |
| | |||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 2 | -0/+186 |