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
|
cde840a82c
|
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts:
setup.py
|
2014-12-11 17:48:48 +00:00 |
|
Erik Johnston
|
85574cfbf0
|
Merge pull request #23 from matrix-org/media_repository
Media repository
|
2014-12-11 17:46:23 +00:00 |
|
Erik Johnston
|
3fecacd86b
|
Fix replication tests
|
2014-12-11 17:11:06 +00:00 |
|
Erik Johnston
|
d3eb12c7b8
|
Fix federation test
|
2014-12-11 17:01:27 +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 |
|
Erik Johnston
|
c161b6cf96
|
Fix room creation test
|
2014-12-11 16:43:30 +00:00 |
|
Paul "LeoNerd" Evans
|
3b2cc26053
|
Initial hack at unit tests of room typing REST API
|
2014-12-11 16:03:12 +00:00 |
|
Erik Johnston
|
0b04369238
|
Fix public room joining by making sure replaces_state never points to itself.
|
2014-12-11 15:56:06 +00:00 |
|
Erik Johnston
|
9191292b0f
|
Fix prev_content
|
2014-12-11 15:16:55 +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 |
|
Erik Johnston
|
e72b16f9a3
|
Fix redaction tests
|
2014-12-11 13:38:52 +00:00 |
|
Erik Johnston
|
8cdebce470
|
Fix redactions. Fix 'age' key
|
2014-12-11 13:25:19 +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 |
|
Erik Johnston
|
4d6af0dde3
|
Fix some tests
|
2014-12-10 18:00:57 +00:00 |
|
Erik Johnston
|
4c682143c8
|
.from_string() no longer takes a HS
|
2014-12-10 18:00:49 +00:00 |
|
Erik Johnston
|
02e4c18171
|
Remove dead code
|
2014-12-10 18:00:36 +00:00 |
|
Erik Johnston
|
b245ee34ed
|
Add some basic event validation
|
2014-12-10 17:59:47 +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 |
|
Erik Johnston
|
6a8148f15b
|
Add new event graphing tool
|
2014-12-10 16:10:25 +00:00 |
|
Mark Haines
|
2d265ef3bd
|
import Image as PIL.Image.
|
2014-12-10 16:09:18 +00:00 |
|
Erik Johnston
|
1d2a0040cf
|
Fix bug where we clobbered old state group values
|
2014-12-10 15:55:03 +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 |
|
Erik Johnston
|
cabead6194
|
Actually fix bug when uploading state with empty state_key
|
2014-12-10 14:49:52 +00:00 |
|
Erik Johnston
|
02db7eb209
|
Fix bug when uploading state with empty state_key
|
2014-12-10 14:02:48 +00:00 |
|
Matthew Hodgson
|
8ffbb52eee
|
oops
|
2014-12-10 13:43:34 +00:00 |
|
Erik Johnston
|
aae8a37e63
|
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
|
2014-12-10 13:18:40 +00:00 |
|
Matthew Hodgson
|
32bc2b4fc1
|
update codestyle based on debate on #matrix-dev
|
2014-12-10 13:11:43 +00:00 |