| Commit message (Expand) | Author | Age | Files | Lines |
* | bump up image quality a bit more as it looks crap | Matthew Hodgson | 2015-07-14 | 1 | -1/+1 |
* | Merge pull request #193 from matrix-org/erikj/bulk_persist_event | Erik Johnston | 2015-07-14 | 7 | -376/+503 |
|\ |
|
| * | Remove commented out code | Erik Johnston | 2015-07-10 | 1 | -14/+0 |
| * | Add bulk insert events API | Erik Johnston | 2015-06-25 | 8 | -374/+521 |
* | | Close, but no cigar. | David Baker | 2015-07-14 | 1 | -2/+2 |
* | | Merge pull request #196 from matrix-org/erikj/room_history | Erik Johnston | 2015-07-10 | 8 | -4/+235 |
|\ \ |
|
| * | | Add comment | Erik Johnston | 2015-07-09 | 1 | -0/+4 |
| * | | Add m.room.history_visibility to newly created rooms' m.room.power_levels | Erik Johnston | 2015-07-06 | 2 | -0/+2 |
| * | | Rename key and values for m.room.history_visibility. Support 'invited' value | Erik Johnston | 2015-07-06 | 4 | -24/+61 |
| * | | Filter and redact events that the other server doesn't have permission to see... | Erik Johnston | 2015-07-03 | 1 | -0/+44 |
| * | | Respect m.room.history_visibility in v2_alpha sync API | Erik Johnston | 2015-07-03 | 1 | -0/+33 |
| * | | Add m.room.history_visibility to list of auth events | Erik Johnston | 2015-07-03 | 2 | -1/+3 |
| * | | Make v1 initial syncs respect room history ACL | Erik Johnston | 2015-07-02 | 1 | -17/+34 |
| * | | Add basic impl for room history ACL on GET /messages client API | Erik Johnston | 2015-07-02 | 3 | -3/+95 |
* | | | Merge pull request #194 from matrix-org/erikj/bulk_verify_sigs | Erik Johnston | 2015-07-10 | 4 | -214/+491 |
|\ \ \ |
|
| * | | | Wait for previous attempts at fetching keys for a given server before trying ... | Erik Johnston | 2015-06-26 | 1 | -15/+68 |
| * | | | Implement bulk verify_signed_json API | Erik Johnston | 2015-06-26 | 4 | -217/+441 |
| | |/
| |/| |
|
* | | | Uniquely name unique constraint | Erik Johnston | 2015-07-10 | 1 | -2/+2 |
* | | | Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-management | Erik Johnston | 2015-07-10 | 5 | -2/+441 |
|\ \ \ |
|
| * | | | Assume that each device for a user has only one of each type of key | Mark Haines | 2015-07-10 | 1 | -3/+3 |
| * | | | Don't bother with a timeout for one time keys on the server. | Mark Haines | 2015-07-09 | 3 | -33/+13 |
| * | | | Only remove one time keys when new one time keys are added | Mark Haines | 2015-07-08 | 1 | -7/+7 |
| * | | | Merge branch 'mjark/missing_regex_group' into markjh/client-end-to-end-key-ma... | Mark Haines | 2015-07-06 | 1 | -1/+1 |
| |\ \ \ |
|
| * | | | | Add client API for uploading and querying keys for end to end encryption | Mark Haines | 2015-07-06 | 2 | -1/+290 |
| * | | | | Add store for client end to end keys | Mark Haines | 2015-07-06 | 3 | -1/+171 |
* | | | | | Small tweaks to SAML2 configuration. | Erik Johnston | 2015-07-10 | 2 | -22/+34 |
* | | | | | Add Muthu Subramanian to AUTHORS | Erik Johnston | 2015-07-10 | 1 | -0/+3 |
* | | | | | Merge pull request #201 from EricssonResearch/msba/saml2-develop | Erik Johnston | 2015-07-10 | 5 | -3/+149 |
|\ \ \ \ \ |
|
| * | | | | | Make SAML2 optional and add some references/comments | Muthu Subramanian | 2015-07-09 | 2 | -4/+23 |
| * | | | | | code beautify | Muthu Subramanian | 2015-07-09 | 1 | -9/+4 |
| * | | | | | code beautify | Muthu Subramanian | 2015-07-08 | 3 | -2/+3 |
| * | | | | | code beautify | Muthu Subramanian | 2015-07-08 | 1 | -10/+23 |
| * | | | | | Integrate SAML2 basic authentication - uses pysaml2 | Muthu Subramanian | 2015-07-08 | 5 | -4/+122 |
| | |_|_|/
| |/| | | |
|
* | | | | | We don't want semicolons. | Erik Johnston | 2015-07-09 | 1 | -1/+1 |
* | | | | | remove the tls_certificate_chain_path param and simply support tls_certificat... | Matthew Hodgson | 2015-07-09 | 2 | -24/+10 |
* | | | | | document tls_certificate_chain_path more clearly | Matthew Hodgson | 2015-07-09 | 1 | -0/+5 |
* | | | | | oops, context.tls_certificate_chain_file() expects a file, not a certificate. | Matthew Hodgson | 2015-07-08 | 2 | -6/+3 |
* | | | | | typo | Matthew Hodgson | 2015-07-08 | 1 | -1/+1 |
* | | | | | *cough* | Matthew Hodgson | 2015-07-08 | 1 | -2/+3 |
* | | | | | add new optional config for tls_certificate_chain_path for folks with interme... | Matthew Hodgson | 2015-07-08 | 2 | -3/+19 |
* | | | | | Merge pull request #197 from matrix-org/mjark/missing_regex_group | Erik Johnston | 2015-07-07 | 1 | -1/+1 |
|\ \ \ \ \
| |_|/ / /
|/| | / /
| | |/ /
| |/| | |
|
| * | | | Don't 500 if a group is missing from the regex | Mark Haines | 2015-07-06 | 1 | -1/+1 |
|/ / / |
|
* | | | Don't explode if we don't recognize one of the event_ids in the backfill request | Erik Johnston | 2015-07-06 | 1 | -2/+4 |
* | | | Merge pull request #195 from matrix-org/erikj/content_disposition | Erik Johnston | 2015-07-03 | 5 | -15/+57 |
|\ \ \
| |/ /
|/| | |
|
| * | | If user supplies filename in URL when downloading from media repo, use that n... | Erik Johnston | 2015-07-03 | 3 | -9/+14 |
| * | | Enforce ascii filenames for uploads | Erik Johnston | 2015-06-30 | 3 | -1/+15 |
| * | | Add Content-Disposition headers to media repo v1 downloads | Erik Johnston | 2015-06-30 | 3 | -7/+30 |
|/ / |
|
* / | Oops: underride rule had an identifier with override in it. | David Baker | 2015-06-23 | 1 | -1/+1 |
|/ |
|
* | Batch SELECTs in _get_auth_chain_ids_txn | Erik Johnston | 2015-06-23 | 1 | -3/+11 |
* | Fix typo | Erik Johnston | 2015-06-19 | 1 | -1/+1 |
* | Merge pull request #192 from matrix-org/erikj/fix_log_context | Erik Johnston | 2015-06-19 | 3 | -52/+68 |
|\ |
|
| * | Fix log context when sending requests | Erik Johnston | 2015-06-19 | 3 | -52/+68 |
* | | Merge pull request #190 from matrix-org/erikj/syn-412 | Erik Johnston | 2015-06-19 | 3 | -73/+78 |
|\ \
| |/
|/| |
|
| * | Add comment on cancellation of observers | Erik Johnston | 2015-06-19 | 1 | -0/+3 |
| * | PEP8 | Erik Johnston | 2015-06-18 | 1 | -2/+3 |
| * | Documentation | Erik Johnston | 2015-06-18 | 1 | -4/+11 |
| * | Don't bother proxying lookups on _NotificationListener to underlying deferred | Erik Johnston | 2015-06-18 | 1 | -10/+2 |
| * | Refactor the notifier.wait_for_events code to be clearer. Add _NotifierUserSt... | Erik Johnston | 2015-06-18 | 3 | -70/+73 |
| * | Fix notifier leak | Erik Johnston | 2015-06-18 | 1 | -21/+20 |
* | | Merge pull request #189 from matrix-org/erikj/room_init_sync | Erik Johnston | 2015-06-19 | 2 | -35/+45 |
|\ \ |
|
| * | | Use another deferred list | Erik Johnston | 2015-06-16 | 1 | -18/+27 |
| * | | Use DeferredList | Erik Johnston | 2015-06-16 | 1 | -9/+9 |
| * | | Don't do unecessary db ops in presence.get_state | Erik Johnston | 2015-06-16 | 2 | -14/+15 |
| |/ |
|
* | | Merge pull request #187 from matrix-org/erikj/sanitize_logging | Erik Johnston | 2015-06-19 | 7 | -127/+209 |
|\ \ |
|
| * | | Remove stale debug lines | Erik Johnston | 2015-06-19 | 1 | -10/+0 |
| * | | Add site_tag to logger | Erik Johnston | 2015-06-19 | 1 | -2/+2 |
| * | | Add IDs to outbound transactions | Erik Johnston | 2015-06-19 | 1 | -53/+71 |
| * | | Remove access_token from synapse.rest.client.v1.transactions {get,store}_resp... | Erik Johnston | 2015-06-16 | 1 | -3/+3 |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sanitize_l... | Erik Johnston | 2015-06-15 | 3 | -5/+11 |
| |\| |
|
| * | | Disable twisted access logging. Move access logging to SynapseRequest object | Erik Johnston | 2015-06-15 | 2 | -75/+79 |
| * | | Log more when we have processed the request | Erik Johnston | 2015-06-15 | 4 | -4/+23 |
| * | | Create SynapseRequest that overrides __repr__ to not print access_token | Erik Johnston | 2015-06-15 | 2 | -17/+46 |
| * | | Merge branch 'erikj/listeners_config' into erikj/sanitize_logging | Erik Johnston | 2015-06-15 | 6 | -210/+329 |
| |\ \ |
|
| * | | | Make http.server request logging more verbose, but redact access_tokens | Erik Johnston | 2015-06-15 | 1 | -2/+12 |
| * | | | Log requests and responses sent via http.client | Erik Johnston | 2015-06-15 | 1 | -3/+15 |
* | | | | Add Eric Myhre to AUTHORS | Erik Johnston | 2015-06-19 | 1 | -0/+4 |
* | | | | Merge pull request #191 from heavenlyhash/configurable-upload-dir | Erik Johnston | 2015-06-19 | 2 | -2/+6 |
|\ \ \ \ |
|
| * | | | | Make upload dir a configurable path. | Eric Myhre | 2015-06-18 | 2 | -2/+6 |
|/ / / / |
|
* | | | | Fix bug where synapse was sending AS user queries incorrectly. | Kegan Dougal | 2015-06-17 | 2 | -1/+44 |
* | | | | Correct -H SERVER_NAME in config-missing complaint message | Paul "LeoNerd" Evans | 2015-06-16 | 1 | -2/+2 |
| |_|/
|/| | |
|
* | | | Merge pull request #185 from matrix-org/erikj/listeners_config | Erik Johnston | 2015-06-15 | 6 | -210/+329 |
|\ \ \
| | |/
| |/| |
|
| * | | Remove redundant newline | Erik Johnston | 2015-06-15 | 1 | -2/+1 |
| * | | Document listener config. Remove deprecated config options | Erik Johnston | 2015-06-15 | 2 | -36/+42 |
| * | | Add backwards compat support for metrics, manhole and webclient config options | Erik Johnston | 2015-06-12 | 3 | -16/+27 |
| * | | Fix tests | Erik Johnston | 2015-06-12 | 1 | -0/+2 |
| * | | PEP8 | Erik Johnston | 2015-06-12 | 1 | -3/+3 |
| * | | Correctly handle x_forwaded listener option | Erik Johnston | 2015-06-12 | 3 | -14/+31 |
| * | | Use config.listeners | Erik Johnston | 2015-06-12 | 2 | -96/+168 |
| * | | Fix up create_resource_tree | Erik Johnston | 2015-06-12 | 1 | -104/+100 |
| * | | Begin changing the config format | Erik Johnston | 2015-06-11 | 1 | -8/+24 |
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-06-15 | 3 | -5/+11 |
|\ \ \
| |_|/
|/| | |
|
| * | | Merge pull request #186 from matrix-org/hotfixes-v0.9.2-r2 v0.9.2-r2 | Erik Johnston | 2015-06-15 | 3 | -1/+7 |
| |\ \ |
|
| | * | | Changelog | Erik Johnston | 2015-06-15 | 1 | -0/+5 |
| | * | | Bump version | Erik Johnston | 2015-06-15 | 1 | -1/+1 |
| | * | | Merge branch 'master' of github.com:matrix-org/synapse into hotfixes-v0.9.2-r2 | Erik Johnston | 2015-06-15 | 3 | -5/+6 |
| |/| |
|/|/ / |
|
| * | | Merge pull request #184 from matrix-org/hotfixes-v0.9.2-r1 v0.9.2-r1 | Erik Johnston | 2015-06-13 | 2 | -1/+2 |
| |\ \ |
|
| | * | | Bump version | Erik Johnston | 2015-06-13 | 1 | -1/+1 |
| | * | | Add a dummy.sql into delta/20 as pip isn't packinging the pushers.py | Erik Johnston | 2015-06-13 | 1 | -0/+1 |
| |/ / |
|
| * | | Merge branch 'release-v0.9.2' v0.9.2 | Erik Johnston | 2015-06-12 | 33 | -281/+547 |
| |\ \ |
|
| | * | | Mention config option name | Erik Johnston | 2015-06-12 | 1 | -1/+1 |
| | * | | s/some/certain | Erik Johnston | 2015-06-12 | 1 | -1/+1 |
| | * | | Update change log | Erik Johnston | 2015-06-12 | 1 | -3/+3 |
| * | | | Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse v0.9.1 | Erik Johnston | 2015-05-26 | 64 | -1280/+2527 |
| |\ \ \ |
|
* | \ \ \ | Merge pull request #183 from intelfx/install-python-schema-deltas | Matthew Hodgson | 2015-06-13 | 1 | -0/+1 |
|\ \ \ \ \ |
|
| * | | | | | MANIFEST.in: include python schema delta scripts (we now have one in 20/) | Ivan Shapovalov | 2015-06-13 | 1 | -0/+1 |
|/ / / / / |
|
* | | | | | Merge branch 'release-v0.9.2' into develop | Erik Johnston | 2015-06-11 | 3 | -2/+25 |
|\ \ \ \ \
| | |_|/ /
| |/| | /
| |_|_|/
|/| | | |
|
| * | | | Update change log | Erik Johnston | 2015-06-11 | 1 | -0/+23 |
| * | | | Bump schema version | Erik Johnston | 2015-06-11 | 1 | -1/+1 |
| * | | | Bump version | Erik Johnston | 2015-06-11 | 1 | -1/+1 |
|/ / / |
|
* | | | Catch any exceptions in the pusher loop. Use a lower timeout for pushers so w... | David Baker | 2015-06-05 | 1 | -112/+133 |
* | | | pep8 | David Baker | 2015-06-04 | 1 | -1/+0 |
* | | | Add script to (re)convert the pushers table to changing the unique key. Also ... | David Baker | 2015-06-04 | 3 | -2/+79 |
* | | | Merge pull request #175 from matrix-org/erikj/thumbnail_thread | Erik Johnston | 2015-06-03 | 1 | -45/+53 |
|\ \ \ |
|
| * | | | Thumbnail images on a seperate thread | Erik Johnston | 2015-06-02 | 1 | -45/+53 |
* | | | | Merge pull request #176 from matrix-org/erikj/backfill_auth | Erik Johnston | 2015-06-03 | 2 | -8/+50 |
|\ \ \ \ |
|
| * | | | | Rephrase log line | Erik Johnston | 2015-06-02 | 1 | -1/+1 |
| * | | | | Don't about JSON when warning about content tampering | Erik Johnston | 2015-06-02 | 1 | -7/+4 |
| * | | | | Add a timeout | Erik Johnston | 2015-06-02 | 1 | -0/+1 |
| * | | | | Handle the fact we might be missing auth events | Erik Johnston | 2015-06-02 | 1 | -15/+19 |
| * | | | | Add some logging | Erik Johnston | 2015-06-02 | 1 | -0/+5 |
| * | | | | Correctly look up auth_events | Erik Johnston | 2015-06-02 | 1 | -9/+12 |
| * | | | | Don't process events we've already processed. Remember to process state events | Erik Johnston | 2015-06-02 | 1 | -0/+22 |
| * | | | | Correctly pass in auth_events | Erik Johnston | 2015-06-01 | 1 | -1/+11 |
| |/ / / |
|
* | | | | Merge pull request #180 from matrix-org/erikj/prev_state_context | Erik Johnston | 2015-06-03 | 3 | -5/+5 |
|\ \ \ \ |
|
| * | | | | Don't needlessly compute prev_state | Erik Johnston | 2015-06-03 | 3 | -5/+5 |
* | | | | | Merge pull request #179 from matrix-org/erikj/state_group_outliers | Erik Johnston | 2015-06-03 | 3 | -6/+22 |
|\ \ \ \ \ |
|
| * | | | | | Comment | Erik Johnston | 2015-06-03 | 1 | -0/+3 |
| * | | | | | Don't needlessly compute context | Erik Johnston | 2015-06-03 | 3 | -6/+19 |
| |/ / / / |
|
* | | | | | Merge pull request #178 from matrix-org/erikj/cache_state_groups | Erik Johnston | 2015-06-03 | 4 | -58/+93 |
|\ \ \ \ \ |
|
| * | | | | | Add cache to get_state_groups | Erik Johnston | 2015-06-03 | 1 | -8/+12 |
| * | | | | | Caches should be bound to instances. | Erik Johnston | 2015-06-03 | 3 | -50/+81 |
| |/ / / / |
|
* | | | | | Merge pull request #177 from matrix-org/erikj/content_repo_http_client | Erik Johnston | 2015-06-03 | 1 | -1/+2 |
|\ \ \ \ \ |
|
| * | | | | | SYN-403: Make content repository use its own http client. | Erik Johnston | 2015-06-03 | 1 | -1/+2 |
| |/ / / / |
|
* | | | | | Merge pull request #174 from matrix-org/erikj/compress_option | Erik Johnston | 2015-06-03 | 2 | -2/+14 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Add config option to disable compression of http responses | Erik Johnston | 2015-06-01 | 2 | -2/+14 |
* | | | | | Log where a request came from in federation | Erik Johnston | 2015-06-02 | 1 | -0/+2 |
| |/ / /
|/| | | |
|
* | | | | Don't explode if we don't have the event | Erik Johnston | 2015-06-01 | 1 | -1/+3 |
|/ / / |
|
* | | | Merge pull request #172 from intelfx/contrib-systemd | Erik Johnston | 2015-05-31 | 1 | -0/+2 |
|\ \ \ |
|
| * | | | contrib/systemd: log_config.yaml: do not disable existing loggers | Ivan Shapovalov | 2015-05-31 | 1 | -0/+2 |
|/ / / |
|
* | | | Merge pull request #170 from matrix-org/markjh/SYT-8-recaptcha | Mark Haines | 2015-05-29 | 2 | -1/+5 |
|\ \ \ |
|
| * \ \ | Merge branch 'develop' into markjh/SYT-8-recaptcha | Mark Haines | 2015-05-29 | 5 | -16/+12 |
| |\ \ \ |
|
| * | | | | Add config for setting the recaptcha verify api endpoint, so we can test it i... | Mark Haines | 2015-05-29 | 2 | -3/+7 |
* | | | | | Remove log line | Erik Johnston | 2015-05-29 | 1 | -1/+0 |
* | | | | | Don't copy twice | Erik Johnston | 2015-05-29 | 1 | -1/+1 |
* | | | | | Merge pull request #169 from matrix-org/erikj/ultrajson | Erik Johnston | 2015-05-29 | 8 | -20/+47 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | Bump syutil version | Erik Johnston | 2015-05-29 | 1 | -3/+3 |
| * | | | | Add config option to turn off freezing events. Use new encode_json api and uj... | Erik Johnston | 2015-05-29 | 8 | -17/+44 |
|/ / / / |
|
* | | | | SYN-395: Fix CAPTCHA, don't double decode json | Erik Johnston | 2015-05-28 | 1 | -2/+3 |
* | | | | Correctly pass connection pool parameter | Erik Johnston | 2015-05-28 | 2 | -2/+2 |
* | | | | Merge pull request #168 from matrix-org/erikj/conn_pool | Erik Johnston | 2015-05-28 | 2 | -4/+9 |
|\ \ \ \ |
|
| * | | | | Up maxPersistentPerHost count | Erik Johnston | 2015-05-28 | 2 | -0/+2 |
| * | | | | Add connection pooling to SimpleHttpClient | Erik Johnston | 2015-05-28 | 1 | -2/+4 |
| * | | | | Use connection pool for federation connections | Erik Johnston | 2015-05-28 | 1 | -2/+3 |
* | | | | | Merge pull request #167 from matrix-org/erikj/deep_copy_removal | Erik Johnston | 2015-05-28 | 1 | -11/+1 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Unused import | Erik Johnston | 2015-05-28 | 1 | -2/+0 |
| * | | | | Remove a deep copy | Erik Johnston | 2015-05-28 | 1 | -9/+1 |
|/ / / / |
|
* / / / | Registration should be disabled by default | Erik Johnston | 2015-05-28 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-05-26 | 4 | -3/+30 |
|\ \ \
| | |/
| |/| |
|
| * | | changelog | Erik Johnston | 2015-05-26 | 1 | -2/+2 |
| * | | Iterate over the user_streams not the user_ids | Mark Haines | 2015-05-26 | 1 | -1/+1 |
| * | | Merge branch 'bugs/SYN-390' into release-v0.9.1 | Mark Haines | 2015-05-26 | 1 | -1/+1 |
| |\ \ |
|
| | * | | Take a dict of the rule, not the rule list | Mark Haines | 2015-05-26 | 1 | -1/+1 |
| * | | | changelog | Erik Johnston | 2015-05-26 | 1 | -1/+1 |
| * | | | changelog | Erik Johnston | 2015-05-26 | 1 | -2/+4 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1 | Erik Johnston | 2015-05-26 | 1 | -4/+7 |
| |\ \ \
| |/ / /
|/| | | |
|
* | | | | Merge pull request #166 from matrix-org/bugs/SYN-390 | Mark Haines | 2015-05-26 | 1 | -4/+7 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | SYN-390: Don't modify the dictionary returned from the database here either | Mark Haines | 2015-05-26 | 1 | -4/+7 |
| | * | | changelog | Erik Johnston | 2015-05-26 | 1 | -0/+25 |
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.9.1 | Erik Johnston | 2015-05-26 | 1 | -5/+8 |
| | |\ \
| |_|/ /
|/| | | |
|
* | | | | Merge pull request #165 from matrix-org/bugs/SYN-390 | Erik Johnston | 2015-05-26 | 1 | -5/+8 |
|\| | | |
|
| * | | | SYN-390: Don't modify the dictionary returned from the data store | Mark Haines | 2015-05-26 | 1 | -5/+8 |
| | |/
| |/| |
|
| | * | Bump version | Erik Johnston | 2015-05-22 | 1 | -1/+1 |
| |/
|/| |
|
* | | Merge pull request #163 from matrix-org/markjh/presence_list_cache | Mark Haines | 2015-05-22 | 5 | -34/+65 |
|\ \ |
|
| * | | Fix the presence tests | Mark Haines | 2015-05-22 | 3 | -17/+23 |
| * | | Add a cache for getting the presence list for a user | Mark Haines | 2015-05-22 | 2 | -17/+42 |
* | | | Merge pull request #164 from matrix-org/markjh/pusher_performance_2 | Mark Haines | 2015-05-22 | 1 | -1/+17 |
|\ \ \ |
|
| * | | | Add a cache for get_push rules for user, fix cache invalidation | Mark Haines | 2015-05-22 | 1 | -1/+17 |
* | | | | Merge pull request #162 from matrix-org/erikj/backfill_fixes | Mark Haines | 2015-05-22 | 3 | -94/+153 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Remove redundant for loop | Erik Johnston | 2015-05-22 | 1 | -3/+0 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_f... | Erik Johnston | 2015-05-22 | 26 | -143/+258 |
| |\ \ \
| |/ / /
|/| | | |
|
* | | | | Merge pull request #156 from matrix-org/erikj/join_perf | Mark Haines | 2015-05-22 | 6 | -41/+92 |
|\ \ \ \ |
|
| * | | | | Add doc strings | Erik Johnston | 2015-05-22 | 3 | -0/+7 |
* | | | | | Merge pull request #159 from matrix-org/erikj/metrics_interface_config | Mark Haines | 2015-05-22 | 2 | -3/+10 |
|\ \ \ \ \ |
|
| * | | | | | s/metric_interface/metric_bind_host/ | Erik Johnston | 2015-05-22 | 2 | -5/+5 |
| * | | | | | 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 | 2 | -2/+6 |
* | | | | | | Merge pull request #157 from matrix-org/markjh/presence_performance | Mark Haines | 2015-05-22 | 3 | -71/+108 |
|\ \ \ \ \ \ |
|
| * | | | | | | Remove spurious TODO comment | Mark Haines | 2015-05-22 | 1 | -1/+0 |
| * | | | | | | Removed unused 'is_visible' method | Mark Haines | 2015-05-20 | 1 | -27/+0 |
| * | | | | | | Fix the presence tests | Mark Haines | 2015-05-20 | 2 | -10/+6 |
| * | | | | | | Clean up the presence_list checking logic a bit | Mark Haines | 2015-05-20 | 1 | -12/+9 |
| * | | | | | | Speed up the get_pagination_rows as well | Mark Haines | 2015-05-18 | 1 | -3/+17 |
| * | | | | | | Cache the most recent serial for each room | Mark Haines | 2015-05-18 | 1 | -6/+22 |
| * | | | | | | Move updating the serial and state of the presence cache into a single function | Mark Haines | 2015-05-18 | 1 | -17/+43 |
| * | | | | | | Merge branch 'notifier_performance' into markjh/presence_performance | Mark Haines | 2015-05-18 | 13 | -160/+295 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | Add more doc string, reduce C+P boilerplate for getting room list | Mark Haines | 2015-05-18 | 1 | -6/+22 |
* | | | | | | | | Merge pull request #160 from matrix-org/markjh/appservice_performance | Mark Haines | 2015-05-22 | 3 | -20/+8 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Remove unused import | Mark Haines | 2015-05-22 | 1 | -1/+1 |
| * | | | | | | | | Make the appservice use 'users_in_room' rather than get_room_members since it... | Mark Haines | 2015-05-22 | 3 | -19/+7 |
| | |_|_|_|_|/ /
| |/| | | | | | |
|
* | | | | | | | | Merge pull request #161 from matrix-org/erikj/txn_logging_fix | Mark Haines | 2015-05-22 | 2 | -11/+28 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Log origin and stats of incoming transactions | Erik Johnston | 2015-05-22 | 1 | -0/+8 |
| * | | | | | | | | Add txn_id to some log lines | Erik Johnston | 2015-05-22 | 1 | -6/+11 |
| * | | | | | | | | Log less lines at INFO level, but include more helpful information | Erik Johnston | 2015-05-22 | 1 | -6/+10 |
|/ / / / / / / / |
|
* | | | / / / / | Invalidate the get_latest_event_ids_in_room cache when deleting from event_fo... | Mark Haines | 2015-05-22 | 1 | -0/+1 |
| |_|_|/ / / /
|/| | | | | | |
|
* | | | | | | | Revert register_new_matrix_user to use v1 api | Erik Johnston | 2015-05-22 | 1 | -2/+3 |
|/ / / / / / |
|
* | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-05-22 | 11 | -36/+93 |
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | Changelog v0.9.0-r5 | Erik Johnston | 2015-05-21 | 1 | -0/+6 |
| * | | | | | Merge branch 'hotfixes-v0.9.0-r5' of github.com:matrix-org/synapse | Erik Johnston | 2015-05-21 | 10 | -36/+87 |
| |\ \ \ \ \ |
|
| | * | | | | | Bump version | Erik Johnston | 2015-05-21 | 1 | -1/+1 |
| | * | | | | | Merge branch 'markjh/pusher_performance_master' of github.com:matrix-org/syna... | Erik Johnston | 2015-05-21 | 9 | -35/+86 |
| |/| | | | | |
|
| | * | | | | | Don't try to use a txn when not in one, remove spurious debug logging | Mark Haines | 2015-05-21 | 2 | -5/+1 |
| | * | | | | | Add caches for things requested by the pushers | Mark Haines | 2015-05-21 | 7 | -33/+44 |
| | * | | | | | Add a cache for get_current_state with state_key | Mark Haines | 2015-05-21 | 5 | -2/+46 |
| |/ / / / / |
|
| * | | | | | Merge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse v0.9.0-r4 | Erik Johnston | 2015-05-11 | 3 | -58/+55 |
| |\ \ \ \ \ |
|
| | | | | | * | Actually return something from lambda | Erik Johnston | 2015-05-21 | 1 | -1/+1 |
| | | | | | * | Sort backfill events | Erik Johnston | 2015-05-21 | 1 | -1/+5 |
| | | | | | * | Remove dead code | Erik Johnston | 2015-05-21 | 1 | -5/+0 |
| | | | | | * | Only get non-state | Erik Johnston | 2015-05-21 | 1 | -1/+2 |
| | | | | | * | Skip events we've already seen | Erik Johnston | 2015-05-21 | 1 | -0/+3 |
| | | | | | * | Correctly prepopulate queue | Erik Johnston | 2015-05-21 | 1 | -2/+10 |
| | | | | | * | Don't prepopulate event_results | Erik Johnston | 2015-05-21 | 1 | -1/+1 |
| | | | | | * | Don't readd things that are already in event_results | Erik Johnston | 2015-05-21 | 1 | -1/+2 |
| | | | | | * | PriorityQueue gives lowest first | Erik Johnston | 2015-05-21 | 1 | -2/+2 |
| | | | | | * | Correctly capture Queue.Empty exception | Erik Johnston | 2015-05-21 | 1 | -2/+5 |
| | | | | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_f... | Erik Johnston | 2015-05-21 | 2 | -1/+7 |
| | | | | | |\
| |_|_|_|_|_|/
|/| | | | | | |
|
* | | | | | | | Oops, get_rooms_for_user returns a namedtuple, not a room_id | Mark Haines | 2015-05-21 | 2 | -1/+7 |
| | | | | | * | Merge branch 'erikj/join_perf' of github.com:matrix-org/synapse into erikj/ba... | Erik Johnston | 2015-05-21 | 13 | -189/+581 |
| | | | | | |\
| | | | | | |/
| | | | | |/| |
|
| | | | | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf | Erik Johnston | 2015-05-21 | 13 | -189/+581 |
| | | | | |\ \
| |_|_|_|_|/ /
|/| | | | | | |
|
* | | | | | | | Merge pull request #155 from matrix-org/erikj/perf | Erik Johnston | 2015-05-21 | 13 | -189/+581 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | s/for events/for requests for events/ | Erik Johnston | 2015-05-21 | 1 | -1/+1 |
| * | | | | | | | s/for events/for requests for events/ | Erik Johnston | 2015-05-21 | 1 | -1/+1 |
| * | | | | | | | Add comments | Erik Johnston | 2015-05-21 | 1 | -3/+14 |
| * | | | | | | | Split up _get_events into defer and txn versions | Erik Johnston | 2015-05-20 | 1 | -24/+35 |
| * | | | | | | | Make not return a deferred _get_event_from_row_txn | Erik Johnston | 2015-05-20 | 1 | -20/+5 |
| * | | | | | | | PEP8 | Erik Johnston | 2015-05-20 | 1 | -2/+2 |
| * | | | | | | | Split out _get_event_from_row back into defer and _txn version | Erik Johnston | 2015-05-20 | 1 | -11/+57 |
| * | | | | | | | Comments and shuffle of functions | Erik Johnston | 2015-05-18 | 1 | -38/+42 |
| * | | | | | | | Remove unused metric | Erik Johnston | 2015-05-18 | 1 | -1/+0 |
| * | | | | | | | Remove rejected events if we don't want rejected events | Erik Johnston | 2015-05-18 | 1 | -0/+3 |
| * | | | | | | | Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into erikj/... | Erik Johnston | 2015-05-18 | 9 | -277/+314 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | Remove pointless newline | Erik Johnston | 2015-05-18 | 1 | -1/+0 |
| * | | | | | | | | Newline, remove debug logging | Erik Johnston | 2015-05-18 | 3 | -4/+1 |
| * | | | | | | | | Remove debug logging | Erik Johnston | 2015-05-18 | 1 | -8/+0 |
| * | | | | | | | | PEP8 | Erik Johnston | 2015-05-15 | 2 | -2/+1 |
| * | | | | | | | | Revert limiting of fetching, it didn't help perf. | Erik Johnston | 2015-05-15 | 1 | -9/+2 |
| * | | | | | | | | init j | Erik Johnston | 2015-05-15 | 1 | -0/+1 |
| * | | | | | | | | Don't completely drain the list | Erik Johnston | 2015-05-15 | 1 | -2/+9 |
| * | | | | | | | | Don't fetch prev_content for current_state | Erik Johnston | 2015-05-15 | 1 | -1/+1 |
| * | | | | | | | | Err, defer.gatherResults ftw | Erik Johnston | 2015-05-15 | 1 | -21/+12 |
| * | | | | | | | | Make store.get_current_state fetch events asyncly | Erik Johnston | 2015-05-15 | 2 | -4/+4 |