Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into markjh/split_out_site.py | Mark Haines | 2016-04-22 | 1 | -82/+7 |
|\ | | | | | | | | | Conflicts: synapse/app/homeserver.py | ||||
| * | Split out create_resource_tree to a separate file | Mark Haines | 2016-04-22 | 1 | -82/+7 |
| | | |||||
* | | Move SynapseSite to its own file | Mark Haines | 2016-04-22 | 1 | -130/+3 |
|/ | |||||
* | Optionally split out the pushers into a separate process | Mark Haines | 2016-04-21 | 1 | -0/+208 |
| | |||||
* | Move the versionstring code out of app.homeserver into util | Mark Haines | 2016-04-11 | 1 | -83/+4 |
| | |||||
* | Don't require config to create database | Erik Johnston | 2016-04-06 | 1 | -6/+9 |
| | |||||
* | Use syntax that works on both py2.7 and py3 | Mark Haines | 2016-03-07 | 2 | -4/+4 |
| | |||||
* | Merge pull request #571 from matrix-org/daniel/asids | Daniel Wagner-Hall | 2016-03-03 | 1 | -1/+1 |
|\ | | | | | Mark AS users with their AS's ID | ||||
| * | Mark AS users with their AS's ID | Daniel Wagner-Hall | 2016-02-11 | 1 | -1/+1 |
| | | |||||
* | | Add a /replication API for extracting the updates that happened on | Mark Haines | 2016-03-01 | 1 | -0/+4 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | synapse This is necessary for replicating the data in synapse to be visible to a separate service because presence and typing notifications aren't stored in a database so won't be visible to another process. This API can be used to either get the raw data by requesting the tables themselves or to just receive notifications for updates by following the streams meta-stream. Returns updates for each table requested a JSON array of arrays with a row for each row in the table. Each table is prefixed by a header row with the: name of the table, current stream_id position for the table, number of rows, number of columns and the names of the columns. This is followed by the rows that have been added to the server since the requester last asked. The API has a timeout and is hooked up to the notifier so that a slave can long poll for updates. | ||||
* | Fix up logcontexts | Erik Johnston | 2016-02-08 | 1 | -0/+2 |
| | |||||
* | Host /media/r0 as well as /media/v1 | Daniel Wagner-Hall | 2016-02-05 | 1 | -2/+4 |
| | |||||
* | Error if macaroon key is missing from config | Daniel Wagner-Hall | 2016-02-05 | 1 | -5/+15 |
| | | | | | | | | | | | | | Currently we store all access tokens in the DB, and fall back to that check if we can't validate the macaroon, so our fallback works here, but for guests, their macaroons don't get persisted, so we don't get to find them in the database. Each restart, we generate a new ephemeral key, so guests lose access after each server restart. I tried to fix up the config stuff to be less insane, but gave up, so instead I bolt on yet another piece of custom one-off insanity. Also, add some basic tests for config generation and loading. | ||||
* | Simplify get_rooms | Erik Johnston | 2016-02-03 | 1 | -2/+2 |
| | |||||
* | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 2 | -27/+30 |
| | |||||
* | Merge pull request #534 from matrix-org/erikj/setup | Erik Johnston | 2016-01-28 | 1 | -12/+22 |
|\ | | | | | Add a Homeserver.setup method | ||||
| * | Clean up a bit. Add comment | Erik Johnston | 2016-01-28 | 1 | -6/+7 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup | Erik Johnston | 2016-01-27 | 1 | -1/+1 |
| |\ | |||||
| * | | Add a Homeserver.setup method. | Erik Johnston | 2016-01-26 | 1 | -12/+21 |
| | | | | | | | | | | | | | | | | | | This is for setting up dependencies that require work on startup. This is useful for the DataStore that wants to read a bunch from the database before initiliazing. | ||||
* | | | Remove chdir | Erik Johnston | 2016-01-28 | 1 | -1/+0 |
| |/ |/| | |||||
* | | Don't turn on profiling | Erik Johnston | 2016-01-26 | 1 | -1/+1 |
|/ | |||||
* | Remove redundated BaseHomeServer | Erik Johnston | 2016-01-26 | 1 | -89/+48 |
| | |||||
* | Use compiled regex | Erik Johnston | 2016-01-13 | 1 | -2/+4 |
| | |||||
* | Don't log urlencoded access_tokens | Erik Johnston | 2016-01-08 | 1 | -2/+2 |
| | |||||
* | Turn on core dumps | Erik Johnston | 2016-01-07 | 1 | -2/+5 |
| | |||||
* | Merge pull request #473 from matrix-org/erikj/ssh_manhole | Erik Johnston | 2016-01-07 | 1 | -5/+21 |
|\ | | | | | Change manhole to use ssh | ||||
| * | Change manhole to use ssh | Erik Johnston | 2016-01-07 | 1 | -5/+21 |
| | | |||||
* | | copyrights | Matthew Hodgson | 2016-01-07 | 3 | -3/+3 |
| | | |||||
* | | Add /_matrix/versions to report supported versions | Daniel Wagner-Hall | 2016-01-06 | 1 | -0/+1 |
| | | |||||
* | | Log when starting stats reporting | Daniel Wagner-Hall | 2016-01-06 | 1 | -0/+1 |
| | | |||||
* | | Log on stats scheduling | Daniel Wagner-Hall | 2016-01-06 | 1 | -0/+1 |
|/ | |||||
* | Actually host r0 and unstable prefixes | Daniel Wagner-Hall | 2015-12-08 | 1 | -16/+12 |
| | |||||
* | Track the time spent in the database per request. | Mark Haines | 2015-12-07 | 1 | -1/+6 |
| | | | | and track the number of transactions that request started. | ||||
* | Fix warnings | Mark Haines | 2015-12-04 | 1 | -1/+11 |
| | |||||
* | Run the background updates when starting synapse. | Mark Haines | 2015-11-10 | 1 | -0/+1 |
| | |||||
* | Move static folder into synapse | Erik Johnston | 2015-10-26 | 1 | -1/+3 |
| | | | | | | | This is because otherwise it won't get picked up by python packaging. This also fixes the problem where the "static" folder was found if synapse wasn't started from that directory. | ||||
* | Only turn on the twisted deferred debugging if full_twisted_stacktraces is ↵ | Mark Haines | 2015-10-13 | 1 | -3/+0 |
| | | | | set in the config | ||||
* | Bounce all deferreds through the reactor to make debugging easier. | Mark Haines | 2015-10-13 | 1 | -0/+2 |
| | | | | | | If all deferreds wait a reactor tick before resolving then there is always a chance to add an errback to the deferred so that stacktraces get reported, rather than being discarded. | ||||
* | rename schema_prepare to prepare_database | Erik Johnston | 2015-10-13 | 1 | -1/+1 |
| | |||||
* | Expose error more nicely | Erik Johnston | 2015-10-13 | 1 | -3/+2 |
| | |||||
* | Don't change cwd in synctl | Erik Johnston | 2015-10-01 | 1 | -2/+2 |
| | |||||
* | Merge pull request #288 from matrix-org/markjh/unused_definitions | Mark Haines | 2015-09-28 | 1 | -6/+1 |
|\ | | | | | Remove some of the unused definitions from synapse | ||||
| * | Note that GzipFile was removed in comment that referenced it | Mark Haines | 2015-09-22 | 1 | -0/+1 |
| | | |||||
| * | synapse/app/homeserver.py:GzipFile was unused | Mark Haines | 2015-09-22 | 1 | -6/+0 |
| | | |||||
* | | Fix restart | Daniel Wagner-Hall | 2015-09-24 | 1 | -2/+2 |
| | | |||||
* | | Allow config file path to be configurable in in synctl | Daniel Wagner-Hall | 2015-09-24 | 1 | -24/+26 |
|/ | | | | Also, allow it to be run from directories other than the synapse directory | ||||
* | Catch stats-reporting errors | Daniel Wagner-Hall | 2015-09-22 | 1 | -4/+7 |
| | |||||
* | Implement configurable stats reporting | Daniel Wagner-Hall | 2015-09-22 | 2 | -3/+44 |
| | | | | | | | | | | SYN-287 This requires that HS owners either opt in or out of stats reporting. When --generate-config is passed, --report-stats must be specified If an already-generated config is used, and doesn't have the report_stats key, it is requested to be set. | ||||
* | Merge pull request #267 from matrix-org/markjh/missing_requirements | Mark Haines | 2015-09-18 | 1 | -2/+15 |
|\ | | | | | Print an example "pip install" line for a missing requirement | ||||
| * | Print an example "pip install" line for a missing requirement | Mark Haines | 2015-09-01 | 1 | -2/+15 |
| | | |||||
* | | Merge branch 'daniel/insecureclient' into develop | Daniel Wagner-Hall | 2015-09-09 | 1 | -4/+3 |
|\ \ | |||||
| * | | Fix random formatting | Daniel Wagner-Hall | 2015-09-09 | 1 | -1/+0 |
| | | | |||||
| * | | Allow configuration to ignore invalid SSL certs | Daniel Wagner-Hall | 2015-09-09 | 1 | -4/+4 |
| |/ | | | | | | | | | This will be useful for sytest, and sytest only, hence the aggressive config key name. | ||||
* | | Merge branch 'master' into develop | Mark Haines | 2015-09-07 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | Conflicts: setup.py | ||||
| * | Change log level to info | Erik Johnston | 2015-09-03 | 1 | -1/+1 |
| | | |||||
* | | don't log the whole DB config (including postgres password...) | Matthew Hodgson | 2015-08-29 | 1 | -2/+2 |
|/ | |||||
* | Print the correct pip install line when failing due to lack of ↵ | Erik Johnston | 2015-08-25 | 1 | -3/+4 |
| | | | | matrix-angular-sdk | ||||
* | Update the log message | Erik Johnston | 2015-08-25 | 1 | -5/+10 |
| | |||||
* | Remove dependency on matrix-angular-sdk | Erik Johnston | 2015-08-25 | 1 | -1/+8 |
| | |||||
* | Allow specifying a directory to host a web client from | Erik Johnston | 2015-08-25 | 1 | -3/+5 |
| | |||||
* | Only print the pidfile path on startup if requested by a commandline flag | Paul "LeoNerd" Evans | 2015-08-07 | 1 | -1/+2 |
| | |||||
* | Merge pull request #187 from matrix-org/erikj/sanitize_logging | Erik Johnston | 2015-06-19 | 1 | -15/+88 |
|\ | | | | | Sanitize logging | ||||
| * | Add site_tag to logger | Erik Johnston | 2015-06-19 | 1 | -2/+2 |
| | | |||||
| * | Disable twisted access logging. Move access logging to SynapseRequest object | Erik Johnston | 2015-06-15 | 1 | -17/+47 |
| | | |||||
| * | Log more when we have processed the request | Erik Johnston | 2015-06-15 | 1 | -2/+8 |
| | | |||||
| * | Create SynapseRequest that overrides __repr__ to not print access_token | Erik Johnston | 2015-06-15 | 1 | -6/+43 |
| | | |||||
* | | Make upload dir a configurable path. | Eric Myhre | 2015-06-18 | 1 | -2/+1 |
|/ | | | | | | Fixes SYN-425. Signed-off-by: Eric Myhre <hash@exultant.us> | ||||
* | Add backwards compat support for metrics, manhole and webclient config options | Erik Johnston | 2015-06-12 | 1 | -7/+0 |
| | |||||
* | PEP8 | Erik Johnston | 2015-06-12 | 1 | -3/+3 |
| | |||||
* | Correctly handle x_forwaded listener option | Erik Johnston | 2015-06-12 | 1 | -4/+27 |
| | |||||
* | Use config.listeners | Erik Johnston | 2015-06-12 | 1 | -66/+84 |
| | |||||
* | Fix up create_resource_tree | Erik Johnston | 2015-06-12 | 1 | -104/+100 |
| | |||||
* | Add config option to disable compression of http responses | Erik Johnston | 2015-06-01 | 1 | -2/+8 |
| | |||||
* | Add config option to turn off freezing events. Use new encode_json api and ↵ | Erik Johnston | 2015-05-29 | 1 | -0/+4 |
| | | | | ujson.loads | ||||
* | s/metric_interface/metric_bind_host/ | Erik Johnston | 2015-05-22 | 1 | -2/+2 |
| | |||||
* | Update log line | Erik Johnston | 2015-05-22 | 1 | -1/+4 |
| | |||||
* | Enable changing the interface the metrics listener binds to | Erik Johnston | 2015-05-22 | 1 | -1/+1 |
| | |||||
* | Disable GZip encoding on static file resources as per comment | David Baker | 2015-05-19 | 1 | -1/+7 |
| | |||||
* | Revert accidental commit | Erik Johnston | 2015-05-19 | 1 | -3/+3 |
| | |||||
* | SYN-383: Handle the fact the server might not have signed things | Erik Johnston | 2015-05-19 | 1 | -3/+3 |
| | |||||
* | Support gzip encoding for client, client v2 and web client resources (SYN-176). | David Baker | 2015-05-14 | 1 | -5/+16 |
| | |||||
* | Optional profiling using cProfile | Mark Haines | 2015-05-06 | 1 | -1/+21 |
| | |||||
* | Don't read from the config file before checking it exists | Mark Haines | 2015-05-06 | 1 | -9/+10 |
| | |||||
* | missing import | Mark Haines | 2015-04-30 | 1 | -0/+2 |
| | |||||
* | read the pid_file from the config file in synctl | Mark Haines | 2015-04-30 | 1 | -2/+3 |
| | |||||
* | Merge branch 'develop' into markjh/config_cleanup | Mark Haines | 2015-04-30 | 1 | -3/+36 |
|\ | | | | | | | | | Conflicts: synapse/config/captcha.py | ||||
| * | Do access log using python's logging stuff, just under a separate logger name | David Baker | 2015-04-30 | 1 | -14/+28 |
| | | |||||
| * | Add an access_log | David Baker | 2015-04-30 | 1 | -3/+22 |
| | | | | | | | | SYN-161 #resolve | ||||
| * | Revert previous | Erik Johnston | 2015-04-29 | 1 | -5/+1 |
| | | |||||
| * | Only start pushers when synapse has fully started | Erik Johnston | 2015-04-29 | 1 | -1/+5 |
| | | |||||
* | | remove duplicate parse_size method | Mark Haines | 2015-04-30 | 1 | -1/+0 |
| | | |||||
* | | Manually generate the default config yaml, remove most of the commandline ↵ | Mark Haines | 2015-04-30 | 1 | -4/+2 |
|/ | | | | arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class | ||||
* | Fix whitespace | Mark Haines | 2015-04-29 | 1 | -1/+1 |
| | |||||
* | Check requirements before doing anything else when running the homeserver | Mark Haines | 2015-04-29 | 1 | -1/+4 |
| | |||||
* | Merge pull request #129 from matrix-org/key_distribution | Erik Johnston | 2015-04-29 | 1 | -1/+7 |
|\ | | | | | Key distribution v2 | ||||
| * | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-29 | 1 | -12/+39 |
| |\ | | | | | | | | | | | | | Conflicts: synapse/config/homeserver.py | ||||
| * | | Add a version 2 of the key server api | Mark Haines | 2015-04-14 | 1 | -1/+7 |
| | | | |||||
* | | | Make postgres database error slightly more helpful | Erik Johnston | 2015-04-29 | 1 | -12/+15 |
| | | | |||||
* | | | Check that postgres database has correct charset set | Erik Johnston | 2015-04-29 | 1 | -1/+10 |
| |/ |/| | |||||
* | | Remove unused imports | Erik Johnston | 2015-04-28 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-28 | 1 | -1/+20 |
|\ \ | |||||
| * | | pep8 | David Baker | 2015-04-27 | 1 | -1/+0 |
| | | | |||||
| * | | Run database check before daemonizing, at the cost of database hygiene. | David Baker | 2015-04-27 | 1 | -9/+8 |
| | | | |||||
| * | | rename db method to be more informative | David Baker | 2015-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | Check users in our table aren't on a different domain to the one we're ↵ | David Baker | 2015-04-24 | 1 | -0/+19 |
| |/ | | | | | | | configured with to try & fix SYN-266 | ||||
* | | Remove unused import | Erik Johnston | 2015-04-27 | 1 | -1/+0 |
| | | |||||
* | | Move database configuration into config module | Erik Johnston | 2015-04-27 | 1 | -31/+4 |
| | | |||||
* | | Ensure check_same_thread is enabled for sqlite3 | Erik Johnston | 2015-04-27 | 1 | -0/+1 |
| | | |||||
* | | Remove mysql/maria support | Erik Johnston | 2015-04-15 | 1 | -8/+1 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-15 | 1 | -1/+1 |
|\| | |||||
| * | Move server key api into rest/key/v1 | Mark Haines | 2015-04-14 | 1 | -1/+1 |
| | | |||||
* | | Add support for postgres instead of mysql. Change sql accourdingly. blob + ↵ | Erik Johnston | 2015-04-14 | 1 | -0/+2 |
| | | | | | | | | varbinary -> bytea. No support for UNSIGNED or CREATE INDEX IF NOT EXISTS. | ||||
* | | Use case sensitive collations | Erik Johnston | 2015-04-10 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into mysql | Erik Johnston | 2015-04-07 | 1 | -7/+1 |
|\| | |||||
| * | Pyflakes | Kegan Dougal | 2015-03-31 | 1 | -2/+1 |
| | | |||||
| * | Remove appservice REST servlets | Kegan Dougal | 2015-03-31 | 1 | -5/+0 |
| | | |||||
* | | PEP8 | Erik Johnston | 2015-04-07 | 1 | -5/+2 |
| | | |||||
* | | Explicitly name the __main__ module logger | Erik Johnston | 2015-04-07 | 1 | -1/+1 |
| | | |||||
* | | Fix unicode support | Erik Johnston | 2015-04-02 | 1 | -8/+4 |
| | | |||||
* | | Fix SQLite support | Erik Johnston | 2015-04-01 | 1 | -3/+12 |
| | | |||||
* | | Make work in both Maria and SQLite. Fix tests | Erik Johnston | 2015-04-01 | 1 | -7/+13 |
| | | |||||
* | | Fix unicode database support | Erik Johnston | 2015-03-25 | 1 | -18/+29 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into mysql | Erik Johnston | 2015-03-20 | 1 | -3/+6 |
|\| | |||||
| * | Wire up the webclient option | David Baker | 2015-03-17 | 1 | -3/+5 |
| | | | | | | | | | | | | It existed but was hardcoded to True. Give it an underscore for consistency. Also don't pull in syweb unless we're actually using the web client. | ||||
* | | Make database selection configurable | Erik Johnston | 2015-03-20 | 1 | -11/+33 |
|/ | |||||
* | actually uphold the bind_host parameter. in theory should make ipv6 binds ↵ | Matthew Hodgson | 2015-03-14 | 1 | -2/+7 |
| | | | | work like bind_host: 'fe80::1%lo0' | ||||
* | Option to serve metrics from their own localhost-only TCP port instead of ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -2/+10 |
| | | | | muxed on the main listener | ||||
* | Fold the slightly-odd bind_port/secure_port/etc.. logic into ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -12/+11 |
| | | | | SynapseHomeServer.start_listening() | ||||
* | Build MetricsResource as a specific HomeServer dependency | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -6/+10 |
| | |||||
* | A trivial 'hello world'-style resource on /_synapse/metrics, with optional ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -0/+7 |
| | | | | commandline flag | ||||
* | No need to explicitly pass 'web_client' in to create_resource_tree as it can ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -2/+3 |
| | | | | be found via config | ||||
* | in_thread takes no arguments | Erik Johnston | 2015-03-10 | 1 | -1/+1 |
| | |||||
* | Split out the 'run' from 'setup' | Erik Johnston | 2015-03-10 | 1 | -26/+27 |
| | |||||
* | Add documentation. When starting via twistd respect soft_file_limit config ↵ | Erik Johnston | 2015-03-10 | 1 | -2/+17 |
| | | | | option. | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2015-03-09 | 2 | -29/+134 |
|\ | |||||
| * | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-03-06 | 1 | -53/+56 |
| |\ | |||||
| | * | Don't exit if we can't work out if we're running in a git repo | Erik Johnston | 2015-02-21 | 1 | -53/+56 |
| | | | |||||
| * | | SYN-67: Finish up implementing new database schema management | Erik Johnston | 2015-03-04 | 1 | -1/+4 |
| | | | |||||
| * | | Merge pull request #83 from matrix-org/nofile_limit_config | Erik Johnston | 2015-03-02 | 1 | -8/+26 |
| |\ \ | | | | | | | | | Add config option to set the soft fd limit on start | ||||
| | * | | By default set soft limit to hard limit | Erik Johnston | 2015-02-20 | 1 | -2/+6 |
| | | | | |||||
| | * | | Rename resource variable so as to not shadow module import | Erik Johnston | 2015-02-19 | 1 | -5/+5 |
| | | | | |||||
| | * | | Add config option to set the soft fd limit on start | Erik Johnston | 2015-02-19 | 1 | -3/+17 |
| | |/ | |||||
| * | | Trailing comma | Kegan Dougal | 2015-02-23 | 1 | -1/+1 |
| | | | |||||
| * | | Actually treat this as static content, not random Resources. | Kegan Dougal | 2015-02-23 | 1 | -2/+6 |
| | | | |||||
| * | | Add RegisterFallbackResource to /_matrix/static/client/register | Kegan Dougal | 2015-02-23 | 1 | -0/+2 |
| |/ | | | | | | | | | Try to keep both forms of registration logic (native/fallback) close together for sanity. | ||||
| * | Conform to header spec take two | Erik Johnston | 2015-02-18 | 1 | -1/+1 |
| | | |||||
| * | Make version_string conform to User-Agent and Server spec | Erik Johnston | 2015-02-18 | 1 | -1/+1 |
| | | |||||
| * | pyflakes | Erik Johnston | 2015-02-18 | 1 | -1/+0 |
| | | |||||
| * | When computing git version run git commands in same dir as source files | Erik Johnston | 2015-02-18 | 1 | -0/+5 |
| | | |||||
| * | Generate a version string that includes git details if run from git checkout | Erik Johnston | 2015-02-18 | 1 | -1/+61 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-18 | 1 | -0/+1 |
| |\ | |||||
| | * | Rename _fail_fetch_pdu_cache to _get_pdu_cache | Erik Johnston | 2015-02-18 | 1 | -1/+1 |
| | | | |||||
| | * | Start the get_pdu cache | Erik Johnston | 2015-02-17 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-02-17 | 2 | -2/+4 |
| |\ \ | | |/ | |/| | |||||
| | * | Don't write bytecode | Erik Johnston | 2015-02-17 | 2 | -2/+4 |
| | | | |||||
| * | | Merge pull request #50 from matrix-org/application-services | Mark Haines | 2015-02-13 | 1 | -1/+6 |
| |\ \ | | | | | | | | | Application Services | ||||
| | * \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 1 | -1/+1 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-09 | 1 | -1/+3 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-02 | 1 | -0/+2 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py | ||||
| | * | | | | | Add stub application services REST API. | Kegan Dougal | 2015-01-27 | 1 | -1/+6 |
| | | | | | | | |||||
| * | | | | | | Prepare the database whenever a connection is opened from the db_pool so ↵ | Mark Haines | 2015-02-13 | 1 | -10/+4 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | that in-memory databases will work | ||||
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into state-chache | Erik Johnston | 2015-02-11 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Fix code-style | Mark Haines | 2015-02-10 | 1 | -1/+1 |
| | | |_|/ | | |/| | | |||||
| * | | | | 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 |
| | | | |||||
| * | | Merge branch 'develop' into pushers | David Baker | 2015-01-13 | 3 | -4/+12 |
| |\ \ | |||||
| * \ \ | 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 | ||||
| * \ \ \ | Merge branch 'develop' into pushers | David Baker | 2014-11-20 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' into pushers | David Baker | 2014-11-20 | 2 | -8/+15 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'http_client_refactor' into pushers | 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!) | ||||
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2015-01-22 | 1 | -2/+17 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/app/homeserver.py | ||||
| * | | | | | | | 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 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | 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 |
| | | | | | | | |||||
* | | | | | | | Add twisted Service interface | Erik Johnston | 2015-01-07 | 1 | -3/+18 |
|/ / / / / / | |||||
* | | | | | | 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 |
|/ / / / / | |||||
* | | | | | 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 http_client_refactor | 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' | ||||
* | / | 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) | ||||
* | | Refactor the HTTP clients a little. | David Baker | 2014-11-20 | 1 | -2/+2 |
|/ | |||||
* | 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. |