Erik Johnston
|
65b2e49429
|
Fix pyflakes
|
2014-12-15 17:35:37 +00:00 |
|
Erik Johnston
|
9c49054f1d
|
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
|
2014-12-15 17:33:23 +00:00 |
|
Erik Johnston
|
f280929a12
|
Use frozenutils
|
2014-12-15 17:31:36 +00:00 |
|
Erik Johnston
|
009e4b5637
|
User.is_mine is no longer a thing. Use hs.is_mine instead.
|
2014-12-15 17:17:51 +00:00 |
|
Erik Johnston
|
cf6e5f1dbf
|
Rename MessageHandler.handle_event. Add a few comments.
|
2014-12-15 17:01:12 +00:00 |
|
Kegsay
|
67c9585656
|
Update media_repository.py
_ not -
|
2014-12-15 16:57:53 +00:00 |
|
Erik Johnston
|
670dcdfc14
|
Remove unused functions
|
2014-12-15 16:16:58 +00:00 |
|
Paul "LeoNerd" Evans
|
0c1deca574
|
Remember to hook up the typing event stream to the notifier as well
|
2014-12-15 16:14:53 +00:00 |
|
Erik Johnston
|
b75adaedca
|
Finish up upgrade script
|
2014-12-15 16:14:34 +00:00 |
|
Erik Johnston
|
65cdf4e724
|
Get current member state from current_state snapshot. Fix leave test.
|
2014-12-15 15:03:27 +00:00 |
|
Erik Johnston
|
57e0e619f3
|
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts:
tests/handlers/test_room.py
|
2014-12-15 14:45:59 +00:00 |
|
Paul "LeoNerd" Evans
|
20beed9dd4
|
Still send typing notifications to myself if I'm the only one in the room (it's a lonely life...)
|
2014-12-15 14:37:12 +00:00 |
|
Mark Haines
|
3610641a62
|
Update docs in media_repository
|
2014-12-15 13:56:43 +00:00 |
|
Erik Johnston
|
616f88027c
|
Add beginnings of upgrade script
|
2014-12-15 13:55:41 +00:00 |
|
Erik Johnston
|
c8dd3314d6
|
Fix bug where we ignored event_edge_hashes table
|
2014-12-15 13:55:22 +00:00 |
|
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
|
88484f684f
|
Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse
|
2014-12-13 18:15:14 +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 |
|
Erik Johnston
|
23c7cb6220
|
Remove unused imports
|
2014-12-12 16:31:59 +00:00 |
|
Erik Johnston
|
fc409096ac
|
Make auth module use EventTypes constants
|
2014-12-12 16:31:50 +00:00 |
|
Erik Johnston
|
1fc2a0e33e
|
Fix tests and remove debug logging
|
2014-12-12 15:08:29 +00:00 |
|
Erik Johnston
|
7b43a503f3
|
Consistently url decode and decode as utf 8 the URL parts
|
2014-12-12 15:05:37 +00:00 |
|
Erik Johnston
|
c39beb5559
|
Store json as UTF-8 and not bytes
|
2014-12-12 14:53:37 +00:00 |
|
Erik Johnston
|
75085bb4d1
|
Pyflakes
|
2014-12-12 14:34:34 +00:00 |
|
Erik Johnston
|
ebf2ec3ce6
|
Fix membership handler test
|
2014-12-12 14:32:44 +00:00 |
|
Erik Johnston
|
41ff21c907
|
Fix test.
|
2014-12-12 14:10:32 +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 |
|
Erik Johnston
|
63810c777d
|
Validate message, topic and name event contents
|
2014-12-12 11:01:09 +00:00 |
|
Erik Johnston
|
fa4b610ae3
|
Fix stream test. Make sure we add join to auth_events for invitiations
|
2014-12-12 10:42:27 +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
|
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 |
|