64ec3493c1
Merge pull request #745 from matrix-org/erikj/search-index
...
Optimise event_search in postgres
2016-04-22 11:23:49 +01:00
4063fe0283
Update port script
2016-04-22 10:35:53 +01:00
183cacac90
Simplify query and handle finishing correctly
2016-04-22 10:01:57 +01:00
ae571810f2
Order NULLs first
2016-04-21 18:14:18 +01:00
3ddbb1687c
Fix query
2016-04-21 18:02:36 +01:00
8fae3d7b1e
Use special UPDATE syntax
2016-04-21 18:01:49 +01:00
b57dcb4b51
Typo
2016-04-21 17:49:00 +01:00
26db18bc90
Need to do _background_update_progress_txn in actual transaction
2016-04-21 17:45:56 +01:00
b9675ef6e6
Merge pull request #687 from nikriek/jwt-fix
...
Fix issues with JWT login
2016-04-21 17:42:25 +01:00
e395eb1108
Update progress when creating index
2016-04-21 17:39:24 +01:00
3b0fa77f50
Fix SQL statement
2016-04-21 17:37:42 +01:00
129e403487
Create index must be on a conn
2016-04-21 17:35:51 +01:00
a3ac837599
Optionally split out the pushers into a separate process
2016-04-21 17:22:37 +01:00
78741cf025
Merge pull request #743 from matrix-org/markjh/slave_pushers
...
Replicate the pushers
2016-04-21 17:21:29 +01:00
51bb339ab2
Create index concurrently
2016-04-21 17:16:11 +01:00
b743c1237e
Add missing run_upgrade
2016-04-21 17:12:04 +01:00
31719ad124
Merge pull request #744 from matrix-org/markjh/replication_remove_pusher
...
Add a replication endpoint for deleting pushers
2016-04-21 17:10:49 +01:00
565c2edb0a
Fix issues with JWT login
2016-04-21 18:10:48 +02:00
c877f0f034
Optimise event_search in postgres
2016-04-21 16:56:14 +01:00
b15266fe06
Merge pull request #742 from matrix-org/markjh/slave_event_push_actions
...
Replicate push actions
2016-04-21 16:39:04 +01:00
cfe1ff4bdb
Add a replication endpoint for deleting pushers
2016-04-21 16:33:05 +01:00
d4823efad9
Replicate the pushers
2016-04-21 16:18:00 +01:00
9f53491cab
Merge branch 'develop' into markjh/slave_event_push_actions
2016-04-21 16:00:43 +01:00
02a27a6c4f
pip install new python dependencies in jenkins.sh
2016-04-21 16:00:28 +01:00
a611c968cc
Merge branch 'develop' into markjh/slave_event_push_actions
2016-04-21 15:37:01 +01:00
59698906eb
Make jenkins install lxml
2016-04-21 15:36:13 +01:00
c0d8e0eb63
Replicate push actions
2016-04-21 15:25:58 +01:00
68ebb81e86
Merge pull request #740 from matrix-org/erikj/state_cache
...
Always use state cache entry if it exists
2016-04-20 13:52:59 +01:00
5bbc321588
Always use state cache entry if it exists
...
Also check if the resolved state matches an existing state group.
2016-04-20 11:49:10 +01:00
4cf4320593
Add some logging to state resolve_events
2016-04-20 11:06:02 +01:00
eab47ea1e5
Merge pull request #739 from matrix-org/erikj/cache_get_state_groups_for_groups
...
Add cache to _get_state_groups_from_groups
2016-04-19 17:37:19 +01:00
f52dd35ac3
Merge pull request #738 from matrix-org/markjh/slaved_receipts
...
Add a slaved receipts store
2016-04-19 17:31:59 +01:00
61c7edfd34
Add cache to _get_state_groups_from_groups
2016-04-19 17:22:03 +01:00
5bbd424ee0
Add a slaved receipts store
2016-04-19 17:14:08 +01:00
6ac40f7b65
Merge pull request #737 from matrix-org/erikj/spider_ssl_factory
...
Use tls_server_context_factory for SpiderEndpoint
2016-04-19 16:22:05 +01:00
f505575f69
Make InsecureInterceptableContextFactory work with SpiderEndpoint
2016-04-19 16:08:14 +01:00
4084c58aa1
Merge pull request #736 from matrix-org/markjh/slave_invited_rooms_for_user
...
Replicate get_invited_rooms_for_user
2016-04-19 15:46:00 +01:00
e99365f601
Replicate get_invited_rooms_for_user
2016-04-19 15:22:14 +01:00
e8884e5e9c
Add self.media_repo to PreviewUrlResource
2016-04-19 14:51:34 +01:00
a7001c311b
_make_dirs was moved to MediaRepository
2016-04-19 14:49:31 +01:00
9181e2f4c7
Add store to PreviewUrlResource
2016-04-19 14:48:24 +01:00
fb76a81ff7
Reorder imports
2016-04-19 14:45:05 +01:00
48af68ba8e
Merge pull request #735 from matrix-org/erikj/media_resource_cleanup
...
Split out BaseMediaResource into MediaRepository
2016-04-19 13:56:59 +01:00
0c93df89b6
Move MediaRepository to media_repository module
2016-04-19 11:31:43 +01:00
43f0941e8f
Split out BaseMediaResource into MediaRepository
...
This is so that a single MediaRepository can be shared across all
resources, rather than having a "copy" per resource.
In particular this allows us to guard against both the thumbnail and
download resource triggering a download of remote content at the same
time.
2016-04-19 11:24:59 +01:00
481119f7d6
Merge pull request #734 from matrix-org/erikj/measure
...
Create log context in Measure if one doesn't exist
2016-04-18 19:03:57 +01:00
eb8619e256
Create log context in Measure if one doesn't exist
2016-04-18 16:08:32 +01:00
4ef7a25c10
Merge pull request #733 from matrix-org/erikj/make_member_timeout
...
Lower timeout for make_membership_event
2016-04-18 15:08:05 +01:00
3727a15764
Merge pull request #732 from matrix-org/erikj/login
...
Simplify _check_password
2016-04-18 15:07:57 +01:00
aaabbd3e9e
explicitly pass in the charset from Content-Type to lxml to fix cyrillic woes better
2016-04-15 14:32:25 +01:00
Erik Johnston