Erik Johnston
|
f0583f65e1
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2015-06-15 15:17:47 +01:00 |
|
Erik Johnston
|
44c9102e7a
|
Merge branch 'erikj/listeners_config' into erikj/sanitize_logging
|
2015-06-15 14:45:52 +01:00 |
|
Erik Johnston
|
6a7cf6b41f
|
Merge pull request #186 from matrix-org/hotfixes-v0.9.2-r2
Hotfixes v0.9.2-r2
|
2015-06-15 14:39:46 +01:00 |
|
Erik Johnston
|
2acee97c2b
|
Changelog
|
2015-06-15 14:20:25 +01:00 |
|
Erik Johnston
|
7f7ec84d6f
|
Bump version
|
2015-06-15 14:16:29 +01:00 |
|
Erik Johnston
|
cebde85b94
|
Merge branch 'master' of github.com:matrix-org/synapse into hotfixes-v0.9.2-r2
|
2015-06-15 14:16:12 +01:00 |
|
Erik Johnston
|
f00f8346f1
|
Make http.server request logging more verbose, but redact access_tokens
|
2015-06-15 13:37:58 +01:00 |
|
Erik Johnston
|
83f119a84a
|
Log requests and responses sent via http.client
|
2015-06-15 13:14:12 +01:00 |
|
Erik Johnston
|
9d0326baa6
|
Remove redundant newline
|
2015-06-15 11:27:29 +01:00 |
|
Erik Johnston
|
186f61a3ac
|
Document listener config. Remove deprecated config options
|
2015-06-15 11:25:53 +01:00 |
|
Erik Johnston
|
fe9bac3749
|
Merge pull request #184 from matrix-org/hotfixes-v0.9.2-r1
Hotfixes v0.9.2-r1
|
2015-06-13 12:26:42 +01:00 |
|
Erik Johnston
|
6c01ceb8d0
|
Bump version
|
2015-06-13 12:22:14 +01:00 |
|
Erik Johnston
|
2eda996a63
|
Add a dummy.sql into delta/20 as pip isn't packinging the pushers.py
|
2015-06-13 12:21:58 +01:00 |
|
Matthew Hodgson
|
4706f3964d
|
Merge pull request #183 from intelfx/install-python-schema-deltas
MANIFEST.in: include python schema delta scripts
|
2015-06-13 12:09:17 +01:00 |
|
Ivan Shapovalov
|
4df76b0a5d
|
MANIFEST.in: include python schema delta scripts (we now have one in 20/)
|
2015-06-13 11:08:49 +03:00 |
|
Erik Johnston
|
a005b7269a
|
Add backwards compat support for metrics, manhole and webclient config options
|
2015-06-12 17:44:23 +01:00 |
|
Erik Johnston
|
261ccd7f5f
|
Fix tests
|
2015-06-12 17:17:29 +01:00 |
|
Erik Johnston
|
942e39e87c
|
PEP8
|
2015-06-12 17:13:54 +01:00 |
|
Erik Johnston
|
9c5fc81c2d
|
Correctly handle x_forwaded listener option
|
2015-06-12 17:13:23 +01:00 |
|
Erik Johnston
|
fd2c07bfed
|
Use config.listeners
|
2015-06-12 15:33:07 +01:00 |
|
Erik Johnston
|
405f8c4796
|
Merge branch 'release-v0.9.2'
|
2015-06-12 11:53:03 +01:00 |
|
Erik Johnston
|
c42ed47660
|
Fix up create_resource_tree
|
2015-06-12 11:52:52 +01:00 |
|
Erik Johnston
|
1a87f5f26c
|
Mention config option name
|
2015-06-12 11:46:41 +01:00 |
|
Erik Johnston
|
a3dc31cab9
|
s/some/certain
|
2015-06-12 11:45:13 +01:00 |
|
Erik Johnston
|
4dd47236e7
|
Update change log
|
2015-06-12 11:42:52 +01:00 |
|
Erik Johnston
|
295b400d57
|
Merge branch 'release-v0.9.2' into develop
|
2015-06-11 16:08:48 +01:00 |
|
Erik Johnston
|
716cf144ec
|
Update change log
|
2015-06-11 16:07:06 +01:00 |
|
Erik Johnston
|
1e365e88bd
|
Bump schema version
|
2015-06-11 15:50:39 +01:00 |
|
Erik Johnston
|
2d41dc0069
|
Bump version
|
2015-06-11 15:49:19 +01:00 |
|
Erik Johnston
|
f7f07dc517
|
Begin changing the config format
|
2015-06-11 15:48:52 +01:00 |
|
David Baker
|
b8690dd840
|
Catch any exceptions in the pusher loop. Use a lower timeout for pushers so we can see if they're actually still running.
|
2015-06-05 11:40:22 +01:00 |
|
David Baker
|
da84946de4
|
pep8
|
2015-06-04 16:43:45 +01:00 |
|
David Baker
|
63a7b3ad1e
|
Add script to (re)convert the pushers table to changing the unique key. Also give the python db upgrade scripts the database engine so they can convert parameter strings, and add *args **kwargs to the upgrade function so we can add more args in future and previous scripts will ignore them.
|
2015-06-04 16:16:01 +01:00 |
|
Erik Johnston
|
5730b20c6d
|
Merge pull request #175 from matrix-org/erikj/thumbnail_thread
Thumbnail images on a seperate thread
|
2015-06-03 17:26:56 +01:00 |
|
Erik Johnston
|
8047fd2434
|
Merge pull request #176 from matrix-org/erikj/backfill_auth
Improve backfill.
|
2015-06-03 17:25:37 +01:00 |
|
Erik Johnston
|
3bbd0d0e09
|
Merge pull request #180 from matrix-org/erikj/prev_state_context
Don't needlessly compute prev_state
|
2015-06-03 17:20:56 +01:00 |
|
Erik Johnston
|
9dda396baa
|
Merge pull request #179 from matrix-org/erikj/state_group_outliers
Don't compute EventContext for outliers.
|
2015-06-03 17:20:40 +01:00 |
|
Erik Johnston
|
13ed3b9985
|
Merge pull request #178 from matrix-org/erikj/cache_state_groups
Add cache to get_state_groups.
|
2015-06-03 17:20:33 +01:00 |
|
Erik Johnston
|
bd2cf9d4bf
|
Merge pull request #177 from matrix-org/erikj/content_repo_http_client
SYN-403: Make content repository use its own http client.
|
2015-06-03 17:20:27 +01:00 |
|
Erik Johnston
|
d4902a7ad0
|
Merge pull request #174 from matrix-org/erikj/compress_option
Add config option to disable compression of http responses
|
2015-06-03 17:18:17 +01:00 |
|
Erik Johnston
|
55bf90b9e4
|
Don't needlessly compute prev_state
|
2015-06-03 16:44:24 +01:00 |
|
Erik Johnston
|
53f0bf85d7
|
Comment
|
2015-06-03 16:43:40 +01:00 |
|
Erik Johnston
|
1c3d844e73
|
Don't needlessly compute context
|
2015-06-03 16:41:51 +01:00 |
|
Erik Johnston
|
0d7d9c37b6
|
Add cache to get_state_groups
|
2015-06-03 14:45:55 +01:00 |
|
Erik Johnston
|
d8866d7277
|
Caches should be bound to instances.
Before, caches were global and so different instances of the stores
would share caches. This caused problems in the unit tests.
|
2015-06-03 14:45:17 +01:00 |
|
Erik Johnston
|
2ef2f6d593
|
SYN-403: Make content repository use its own http client.
|
2015-06-03 10:17:37 +01:00 |
|
Erik Johnston
|
3483b78d1a
|
Log where a request came from in federation
|
2015-06-02 18:15:13 +01:00 |
|
Erik Johnston
|
d3ded420b1
|
Rephrase log line
|
2015-06-02 16:30:52 +01:00 |
|
Erik Johnston
|
22716774d5
|
Don't about JSON when warning about content tampering
|
2015-06-02 16:30:52 +01:00 |
|
Erik Johnston
|
5044e6c544
|
Thumbnail images on a seperate thread
|
2015-06-02 15:39:08 +01:00 |