Erik Johnston
|
4063fe0283
|
Update port script
|
2016-04-22 10:35:53 +01:00 |
|
Erik Johnston
|
183cacac90
|
Simplify query and handle finishing correctly
|
2016-04-22 10:01:57 +01:00 |
|
David Baker
|
19d6b6cd7a
|
Add WIP email template files
|
2016-04-21 19:22:53 +01:00 |
|
David Baker
|
c10ed26c30
|
Flesh out email templating
Mostly WIP porting the room name calculation logic from the web client so our room names in the email mirror the clients.
|
2016-04-21 19:19:07 +01:00 |
|
Erik Johnston
|
ae571810f2
|
Order NULLs first
|
2016-04-21 18:14:18 +01:00 |
|
Erik Johnston
|
3ddbb1687c
|
Fix query
|
2016-04-21 18:02:36 +01:00 |
|
Erik Johnston
|
8fae3d7b1e
|
Use special UPDATE syntax
|
2016-04-21 18:01:49 +01:00 |
|
Erik Johnston
|
b57dcb4b51
|
Typo
|
2016-04-21 17:49:00 +01:00 |
|
Erik Johnston
|
26db18bc90
|
Need to do _background_update_progress_txn in actual transaction
|
2016-04-21 17:45:56 +01:00 |
|
Erik Johnston
|
b9675ef6e6
|
Merge pull request #687 from nikriek/jwt-fix
Fix issues with JWT login
|
2016-04-21 17:42:25 +01:00 |
|
Erik Johnston
|
e395eb1108
|
Update progress when creating index
|
2016-04-21 17:39:24 +01:00 |
|
Erik Johnston
|
3b0fa77f50
|
Fix SQL statement
|
2016-04-21 17:37:42 +01:00 |
|
Erik Johnston
|
129e403487
|
Create index must be on a conn
|
2016-04-21 17:35:51 +01:00 |
|
Mark Haines
|
a3ac837599
|
Optionally split out the pushers into a separate process
|
2016-04-21 17:22:37 +01:00 |
|
Mark Haines
|
78741cf025
|
Merge pull request #743 from matrix-org/markjh/slave_pushers
Replicate the pushers
|
2016-04-21 17:21:29 +01:00 |
|
Erik Johnston
|
51bb339ab2
|
Create index concurrently
|
2016-04-21 17:16:11 +01:00 |
|
Erik Johnston
|
b743c1237e
|
Add missing run_upgrade
|
2016-04-21 17:12:04 +01:00 |
|
Mark Haines
|
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 |
|
Niklas Riekenbrauck
|
565c2edb0a
|
Fix issues with JWT login
|
2016-04-21 18:10:48 +02:00 |
|
Erik Johnston
|
c877f0f034
|
Optimise event_search in postgres
|
2016-04-21 16:56:14 +01:00 |
|
Mark Haines
|
b15266fe06
|
Merge pull request #742 from matrix-org/markjh/slave_event_push_actions
Replicate push actions
|
2016-04-21 16:39:04 +01:00 |
|
Mark Haines
|
cfe1ff4bdb
|
Add a replication endpoint for deleting pushers
|
2016-04-21 16:33:05 +01:00 |
|
Mark Haines
|
d4823efad9
|
Replicate the pushers
|
2016-04-21 16:18:00 +01:00 |
|
Mark Haines
|
9f53491cab
|
Merge branch 'develop' into markjh/slave_event_push_actions
|
2016-04-21 16:00:43 +01:00 |
|
Mark Haines
|
02a27a6c4f
|
pip install new python dependencies in jenkins.sh
|
2016-04-21 16:00:28 +01:00 |
|
Mark Haines
|
a611c968cc
|
Merge branch 'develop' into markjh/slave_event_push_actions
|
2016-04-21 15:37:01 +01:00 |
|
Erik Johnston
|
59698906eb
|
Make jenkins install lxml
|
2016-04-21 15:36:13 +01:00 |
|
Mark Haines
|
c0d8e0eb63
|
Replicate push actions
|
2016-04-21 15:25:58 +01:00 |
|
David Baker
|
2ed0adb075
|
Generate mails from a template
|
2016-04-20 18:35:29 +01:00 |
|
Erik Johnston
|
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 |
|
David Baker
|
05adc6c2de
|
more pep8
|
2016-04-20 13:02:45 +01:00 |
|
David Baker
|
f63bd4ff47
|
Send a rather basic email notif
Also pep8 fixes
|
2016-04-20 13:02:01 +01:00 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
4cf4320593
|
Add some logging to state resolve_events
|
2016-04-20 11:06:02 +01:00 |
|
Erik Johnston
|
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 |
|
Mark Haines
|
f52dd35ac3
|
Merge pull request #738 from matrix-org/markjh/slaved_receipts
Add a slaved receipts store
|
2016-04-19 17:31:59 +01:00 |
|
Erik Johnston
|
61c7edfd34
|
Add cache to _get_state_groups_from_groups
|
2016-04-19 17:22:03 +01:00 |
|
Mark Haines
|
5bbd424ee0
|
Add a slaved receipts store
|
2016-04-19 17:14:08 +01:00 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
f505575f69
|
Make InsecureInterceptableContextFactory work with SpiderEndpoint
|
2016-04-19 16:08:14 +01:00 |
|
Mark Haines
|
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 |
|
Mark Haines
|
e99365f601
|
Replicate get_invited_rooms_for_user
|
2016-04-19 15:22:14 +01:00 |
|
David Baker
|
e2a01455af
|
Add single instance & logging stuff
Copy the stuff over from http pusher that prevents multiple instances of process running at once and sets up logging and measure blocks.
|
2016-04-19 14:52:58 +01:00 |
|
Erik Johnston
|
e8884e5e9c
|
Add self.media_repo to PreviewUrlResource
|
2016-04-19 14:51:34 +01:00 |
|
Erik Johnston
|
a7001c311b
|
_make_dirs was moved to MediaRepository
|
2016-04-19 14:49:31 +01:00 |
|
Erik Johnston
|
9181e2f4c7
|
Add store to PreviewUrlResource
|
2016-04-19 14:48:24 +01:00 |
|
Erik Johnston
|
fb76a81ff7
|
Reorder imports
|
2016-04-19 14:45:05 +01:00 |
|
David Baker
|
07d765209d
|
First bits of emailpusher
Mostly logic of when to send an email
|
2016-04-19 14:24:36 +01:00 |
|
Erik Johnston
|
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 |
|
Erik Johnston
|
0c93df89b6
|
Move MediaRepository to media_repository module
|
2016-04-19 11:31:43 +01:00 |
|