Mark Haines
|
58fa6d3fc6
|
return an mxc uri rather than a content_token.
|
2014-12-15 13:54:10 +00:00 |
|
Paul "LeoNerd" Evans
|
0aa8c08478
|
Merge branch 'develop' into typing_notifications
|
2014-12-15 11:19:30 +00:00 |
|
Erik Johnston
|
3983c7fb0f
|
Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop
|
2014-12-13 18:16:12 +00:00 |
|
Erik Johnston
|
eea58b8076
|
Bump version and change log
|
2014-12-13 18:04:37 +00:00 |
|
Erik Johnston
|
6380ead2ee
|
Fix bug while generating the error message when a file path specified in the config doesn't exist
|
2014-12-13 18:03:01 +00:00 |
|
Paul "LeoNerd" Evans
|
b0bb1756a9
|
Send list of typing user IDs as 'user_ids' list within 'content', so that m.typing stream events have a toplevel content, for consistency with others
|
2014-12-12 11:59:46 +00:00 |
|
Paul "LeoNerd" Evans
|
0b70023373
|
Merge branch 'develop' into typing_notifications
|
2014-12-11 18:35:05 +00:00 |
|
Paul "LeoNerd" Evans
|
57b5094545
|
Merge branch 'develop' of github.com:matrix-org/synapse into develop
|
2014-12-11 18:34:26 +00:00 |
|
Paul "LeoNerd" Evans
|
3e84896481
|
Merge remote-tracking branch 'origin' into typing_notifications
|
2014-12-11 18:33:29 +00:00 |
|
Paul "LeoNerd" Evans
|
cfb963af03
|
When users leave rooms mark them as no longer typing in them
|
2014-12-11 18:33:09 +00:00 |
|
Paul "LeoNerd" Evans
|
f25764943c
|
Add a 'user_left_room' distributor signal analogous to 'user_joined_room'
|
2014-12-11 18:27:01 +00:00 |
|
Mark Haines
|
b3e34a5399
|
Fix typo in media repository doc string
|
2014-12-11 18:21:08 +00:00 |
|
Mark Haines
|
64bf9f54cc
|
Fix media repository doc string to include server_name
|
2014-12-11 18:18:58 +00:00 |
|
Paul "LeoNerd" Evans
|
5ebc994f84
|
Actually auth-check to ensure people can only send typing notifications for rooms they're actually in
|
2014-12-11 18:11:43 +00:00 |
|
Paul "LeoNerd" Evans
|
966c4b2b04
|
Add a sprinkling of logger.debug() into typing notification handler
|
2014-12-11 18:00:15 +00:00 |
|
Paul "LeoNerd" Evans
|
6e1531682b
|
Move typing-notification REST tests into their own .py file
|
2014-12-11 17:54:42 +00:00 |
|
Paul "LeoNerd" Evans
|
1f26e56de0
|
Actually unit-test the event stream around REST typing tests
|
2014-12-11 17:54:42 +00:00 |
|
Erik Johnston
|
85574cfbf0
|
Merge pull request #23 from matrix-org/media_repository
Media repository
|
2014-12-11 17:46:23 +00:00 |
|
Mark Haines
|
03d9024cbc
|
Allow only one download for a given image at a time, so that we don't end up downloading the same image twice if two clients request a remote image at the same time
|
2014-12-11 16:48:11 +00:00 |
|
Paul "LeoNerd" Evans
|
3b2cc26053
|
Initial hack at unit tests of room typing REST API
|
2014-12-11 16:03:12 +00:00 |
|
Mark Haines
|
d80d505b1f
|
Limit the size of images that are thumbnailed serverside. Limit the size of file that a server will download from a remote server
|
2014-12-11 14:19:32 +00:00 |
|
Paul "LeoNerd" Evans
|
0ca072b3b6
|
Initial tiny hack at REST API for setting room typing notification status
|
2014-12-11 10:55:36 +00:00 |
|
Mark Haines
|
ead8fc5e38
|
doc the thumbnail methods
|
2014-12-11 10:41:43 +00:00 |
|
Mark Haines
|
b5eb9124f7
|
Make sure we pass a tuple to string '%' formatting
|
2014-12-11 10:08:09 +00:00 |
|
Paul "LeoNerd" Evans
|
5f49914dee
|
Avoid cyclic dependency in handler setup
|
2014-12-10 21:17:48 +00:00 |
|
Paul "LeoNerd" Evans
|
1a75ff5c23
|
Hook up the event stream to typing notifications
|
2014-12-10 21:01:49 +00:00 |
|
Paul "LeoNerd" Evans
|
4006d58335
|
Store serial numbers per room for typing event stream purposes
|
2014-12-10 20:48:25 +00:00 |
|
Paul "LeoNerd" Evans
|
9eb819e828
|
First hack at implementing timeouts in typing notification handler
|
2014-12-10 19:39:01 +00:00 |
|
Paul "LeoNerd" Evans
|
4551afc6d2
|
Implement .cancel_call_later() in MockClock
|
2014-12-10 19:26:52 +00:00 |
|
Paul "LeoNerd" Evans
|
38da9884e7
|
Implement .call_later() in MockClock
|
2014-12-10 19:24:12 +00:00 |
|
Paul "LeoNerd" Evans
|
be9a8d68e0
|
Trivial test of MockClock()
|
2014-12-10 19:13:50 +00:00 |
|
Mark Haines
|
4f37c0ea9d
|
Merge branch 'develop' into media_repository
|
2014-12-10 16:55:06 +00:00 |
|
Mark Haines
|
7f193b9958
|
update media repository implementation docs
|
2014-12-10 16:54:37 +00:00 |
|
Mark Haines
|
61fc37e467
|
Merge branch 'develop' into media_repository
|
2014-12-10 16:14:17 +00:00 |
|
Mark Haines
|
2d265ef3bd
|
import Image as PIL.Image.
|
2014-12-10 16:09:18 +00:00 |
|
Mark Haines
|
e5275d856e
|
Get the code actually working
|
2014-12-10 15:46:18 +00:00 |
|
Mark Haines
|
cc84d3ea78
|
Thumbnail uploaded and cached images
|
2014-12-10 15:40:52 +00:00 |
|
Matthew Hodgson
|
8ffbb52eee
|
oops
|
2014-12-10 13:43:34 +00:00 |
|
Matthew Hodgson
|
32bc2b4fc1
|
update codestyle based on debate on #matrix-dev
|
2014-12-10 13:11:43 +00:00 |
|
Erik Johnston
|
6497caee7c
|
Merge pull request #22 from matrix-org/federation_retries
Federation retries
|
2014-12-10 10:35:57 +00:00 |
|
Matthew Hodgson
|
0f4dcab238
|
turn back on per-request transaction retries, so that every time we try to hit a dead server we actually end up hammering 5 times :|
|
2014-12-10 10:28:27 +00:00 |
|
Erik Johnston
|
08aceea82e
|
Add newline back in
|
2014-12-10 10:26:12 +00:00 |
|
Erik Johnston
|
f26ec14b21
|
Remove whitespace
|
2014-12-10 10:25:21 +00:00 |
|
Erik Johnston
|
b8d30899b1
|
Code style.
|
2014-12-10 10:16:09 +00:00 |
|
Matthew Hodgson
|
71da2bed55
|
plateau retries after 1h
|
2014-12-10 00:18:44 +00:00 |
|
Matthew Hodgson
|
faf12b64f8
|
add errbacks to enqueue_pdu deferreds; change logging for failed federation sends to warn rather than exception
|
2014-12-10 00:12:51 +00:00 |
|
Matthew Hodgson
|
2b1acb7671
|
squidge to 79 columns as per pep8
|
2014-12-10 00:03:55 +00:00 |
|
Matthew Hodgson
|
8ada2d2018
|
fix UTs by telling all the mock stores about the new methods for tracking retries
|
2014-12-09 23:53:07 +00:00 |
|
Matthew Hodgson
|
c46ce4fca2
|
Merge branch 'develop' into federation_retries
|
2014-12-08 19:37:07 +00:00 |
|
Matthew Hodgson
|
8529fba02d
|
fix a million stupid bugs and make it actually work
|
2014-12-08 19:34:51 +00:00 |
|