311 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Erik Johnston	75b6d982a0	Add a 'backfill room' button	2014-08-19 14:20:03 +01:00
Erik Johnston	598a1d8ff9	Change the way pagination works to support out of order events.	2014-08-19 14:19:48 +01:00
Kegan Dougal	77f1cc7d6d	rst formatting, section heading intro blurbs.	2014-08-19 14:03:16 +01:00
Kegan Dougal	8464009a66	Added top level TODO and a bit more info on storing the 'end' token.	2014-08-19 13:43:45 +01:00
Kegan Dougal	185a68b473	Added a first cut for a 'how to' on the client-server API.	2014-08-19 12:31:17 +01:00
Kegan Dougal	caef65d819	More unquotes. Also, don't return the room_id on membership state changes, they already know it.	2014-08-19 12:30:28 +01:00
Kegan Dougal	ece7a6d995	Unquote sender IDs.	2014-08-19 11:50:57 +01:00
Paul "LeoNerd" Evans	88f7482b92	Perform the 'REST'-level tests of Presence against the real Presence handler as well, mocking out the datastore beneath it	2014-08-19 11:16:23 +01:00
Paul "LeoNerd" Evans	83f031207e	Implement and test presence dropping of remote users	2014-08-19 11:16:23 +01:00
Paul "LeoNerd" Evans	6fafa878f6	Deny __iter__ on UserID/RoomID/RoomName instances as it's a subtle bug that will bite you	2014-08-19 11:16:23 +01:00
Paul "LeoNerd" Evans	bb793019a5	Rename MockHttpServer to MockHttpResource as it stands for one server resource rather than an entire server	2014-08-19 11:16:23 +01:00
Kegan Dougal	f48792eec4	Reduce the amount of incredibly spammy stack traces. Expected errors (e.g. SynapseErrors) shouldn't have their full trace logged every time. Don't send responses to disconnected requests.	2014-08-19 10:56:43 +01:00
Emmanuel ROHEE	509ce6c137	Change mouse cursor to pointer on elements user can click on	2014-08-19 11:37:07 +02:00
Emmanuel ROHEE	ff21d4d93b	Merge remote-tracking branch 'origin/master' into user_page	2014-08-19 09:44:50 +02:00
Emmanuel ROHEE	d7a4f2ed7f	Fill user page with avatar, display name and matrix id	2014-08-19 09:37:10 +02:00