Erik Johnston
|
7bec359408
|
Add in StreamToken type
|
2014-08-21 11:01:33 +01:00 |
|
Erik Johnston
|
d12a7c3939
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2014-08-21 11:00:59 +01:00 |
|
Erik Johnston
|
ebd3c41ede
|
Make event stream storage return all membership events about the user, regardless of if they were in the room or not.
|
2014-08-20 17:09:44 +01:00 |
|
Emmanuel ROHEE
|
7371e68f55
|
Quick fix to support array of room aliases
|
2014-08-20 17:46:16 +02:00 |
|
Kegan Dougal
|
5048f4a915
|
Added final jsfiddle: an example app demonstrating most of the c2s api.
|
2014-08-20 16:45:59 +01:00 |
|
Emmanuel ROHEE
|
2f52e8ee18
|
BF: Apply image place holder only if the image message has the height information
|
2014-08-20 17:17:17 +02:00 |
|
Emmanuel ROHEE
|
96da42085c
|
BF: Wait for the room_id being resolved before starting pagination
|
2014-08-20 17:08:18 +02:00 |
|
Paul "LeoNerd" Evans
|
583add34fe
|
Use the "collect_presencelike_data" distributor signal instead of re-implementing its behaviour
|
2014-08-20 16:06:47 +01:00 |
|
Paul "LeoNerd" Evans
|
50718825bd
|
Fix exception name in _fill_out_join_content() exception
|
2014-08-20 16:06:47 +01:00 |
|
Paul "LeoNerd" Evans
|
e01bdf2432
|
Define __copy__ and __deepcopy__ as identity functions on DomainSpecificString, so that copy.deepcopy() will work on them
|
2014-08-20 16:06:47 +01:00 |
|
Paul "LeoNerd" Evans
|
9c0e570496
|
Kill the "_homeserver_" injected messages for room membership changes
|
2014-08-20 16:06:47 +01:00 |
|
Emmanuel ROHEE
|
ba88c9105c
|
Create a placeholder for each image of the chat thread. The height of this placeholder is the height of the image so that the scroller position will not be disrupted when the image will be actually loaded and displayed in its full height
|
2014-08-20 17:04:50 +02:00 |
|
Emmanuel ROHEE
|
6d3391f2f0
|
Send images with their imageInfo (size, mymetype, width & height)
|
2014-08-20 17:04:50 +02:00 |
|
Emmanuel ROHEE
|
da2f5aac0e
|
Sanitize message text content only if the type of current message in the ng-repeat loop is "text"
In case of image message, the body can be a JSON object (ImageInfo) and ngSanitize does not like that (ie it generates exception in the console)
|
2014-08-20 17:04:50 +02:00 |
|
Erik Johnston
|
e8244c23ba
|
Give the event_id of the failed event
|
2014-08-20 15:53:07 +01:00 |
|
Erik Johnston
|
d100ac8c82
|
Fix test. get_joined_hosts_for_room get's called multiple times
|
2014-08-20 15:10:36 +01:00 |
|
Erik Johnston
|
5c4c591c61
|
Fix federation test, since we now hit store.get_room
|
2014-08-20 14:59:43 +01:00 |
|
Erik Johnston
|
beb0a179bd
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2014-08-20 14:43:02 +01:00 |
|
Erik Johnston
|
5ef0948eaa
|
Better handle the edge cases of trying to remote join rooms
|
2014-08-20 14:42:47 +01:00 |
|
Kegan Dougal
|
f60e5a1aec
|
Added more jsfiddles.
|
2014-08-20 13:47:20 +01:00 |
|
Emmanuel ROHEE
|
d6a3639269
|
Replaced the image URL text input by a file selector button: "Send Image"
|
2014-08-20 14:09:55 +02:00 |
|
Emmanuel ROHEE
|
955662d64c
|
Disabled sending buttons while a message is being sent. Useful on bad Internet connection.
|
2014-08-20 13:43:31 +02:00 |
|
Erik Johnston
|
849627b82e
|
Don't generate room membership messages. Include previous state of in membership messages.
|
2014-08-20 11:53:57 +01:00 |
|
Erik Johnston
|
2ffb075772
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2014-08-20 10:29:16 +01:00 |
|
Emmanuel ROHEE
|
ecce301632
|
File organisation sanity: put directives and filters into dedicated files
|
2014-08-20 11:28:36 +02:00 |
|
Kegan Dougal
|
f4839ea042
|
Add some static fiddles for now (will migrate to github paths eventually)
|
2014-08-19 17:48:49 +01:00 |
|
Kegan Dougal
|
89ed81bb1f
|
More fiddles, more fun!
|
2014-08-19 17:34:38 +01:00 |
|
Emmanuel ROHEE
|
9ca5bc7892
|
keepScroll: a directive to anchor the scroller position at the bottom when the browser is resizing
|
2014-08-19 18:30:02 +02:00 |
|
Erik Johnston
|
d4fb1c8a92
|
Only hit get_room_events_stream if we have a valid user_id
|
2014-08-19 17:18:19 +01:00 |
|
Erik Johnston
|
ae493c9418
|
Fix token to correct format
|
2014-08-19 16:45:55 +01:00 |
|
Erik Johnston
|
e2b861cc67
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
|
2014-08-19 16:41:13 +01:00 |
|
Erik Johnston
|
eea2dc7dde
|
Remove debug logging from token parsing funcs.
|
2014-08-19 16:40:38 +01:00 |
|
Erik Johnston
|
d94765999d
|
Add comment about what strorage.stream does
|
2014-08-19 16:40:25 +01:00 |
|
Kegan Dougal
|
b796d4b9d0
|
Added registration/login jsfiddle, formatted so it can be loaded directly from jsfiddle. Requires jQuery 1.8.3
|
2014-08-19 16:39:42 +01:00 |
|
Erik Johnston
|
cc48e920d6
|
Don't expect a reflection from events stream
|
2014-08-19 15:54:07 +01:00 |
|
Erik Johnston
|
41333452e5
|
Update tests
|
2014-08-19 15:52:20 +01:00 |
|
Erik Johnston
|
7c60905ee7
|
Default from param to 'END'
|
2014-08-19 15:52:10 +01:00 |
|
Erik Johnston
|
5c00614aab
|
PresenceStreamData was expecting *_key to be ints
|
2014-08-19 15:51:10 +01:00 |
|
Emmanuel ROHEE
|
4f773de6ba
|
BF: The enter key in the image URL box called sendImage() with no argument
|
2014-08-19 16:37:31 +02:00 |
|
Emmanuel ROHEE
|
c5d601d5cd
|
Cleaned dead code
|
2014-08-19 16:24:49 +02:00 |
|
Erik Johnston
|
22dd0b37c4
|
Fix typo in merge conflict
|
2014-08-19 15:02:47 +01:00 |
|
Paul "LeoNerd" Evans
|
89cabba3e0
|
Don't delete OFFLINE users from the presence cache, so we can report on their offline mtime
|
2014-08-19 14:51:15 +01:00 |
|
Erik Johnston
|
347242a5c4
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts:
tests/rest/test_presence.py
tests/rest/test_rooms.py
tests/utils.py
|
2014-08-19 14:48:19 +01:00 |
|
Kegan Dougal
|
7e83a58c4d
|
Proofing
|
2014-08-19 14:38:34 +01:00 |
|
Erik Johnston
|
840771190f
|
Fix bug where we sometimes set min_token to None.
|
2014-08-19 14:32:47 +01:00 |
|
Erik Johnston
|
234128586b
|
Print out stacktrace when we failed to persist event.
|
2014-08-19 14:30:28 +01:00 |
|
Paul "LeoNerd" Evans
|
d7cfb91a7a
|
Rewrite of PresenceHandler test to ensure it covers the interaction with Federation as well
|
2014-08-19 14:26:06 +01:00 |
|
Paul "LeoNerd" Evans
|
992782b9f5
|
Ensure that federation's .send_edu() returns a Deferred
|
2014-08-19 14:26:06 +01:00 |
|
Paul "LeoNerd" Evans
|
fcdc40a5dd
|
Add a DeferredMockCallable; like mock's MockCallable but allows awaiting
on method calls to be made later
|
2014-08-19 14:25:43 +01:00 |
|
Kegan Dougal
|
e636e8799e
|
More formatting, more clarity.
|
2014-08-19 14:25:03 +01:00 |