1266 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	dd2b933a0d	Use event age to recognise which calls are current and which aren't and hence support answering calls that were placed before we loaded the page.	2014-09-16 14:47:10 +01:00
Kegan Dougal	c099b36af3	Comment out password reset for now, until the mechanism is fully discussed (IS token auth vs HS auth)	2014-09-16 13:32:33 +01:00
Kegan Dougal	cc83b06cd1	Added support for the HS to send emails. Use it to send password resets. Added email_smtp_server and email_from_address config args. Added emailutils.	2014-09-16 12:36:39 +01:00
Kegan Dougal	5f30a69a9e	Added PasswordResetRestServlet. Hit the IS to confirm the email/user. Need to send email.	2014-09-16 11:22:40 +01:00
Emmanuel ROHEE	faee41c303	Merge remote-tracking branch 'origin/develop' into webclient_data_centralisation	2014-09-16 08:50:53 +02:00
Paul "LeoNerd" Evans	e32cfed1d8	Initial pass at a RoomStore test	2014-09-15 18:41:24 +01:00
Erik Johnston	1e4b971f95	Fix bug where we didn't always get 'prev_content' key	2014-09-15 17:43:46 +01:00
Emmanuel ROHEE	b0483cd47d	Filter room where the user has been banned	2014-09-15 18:22:38 +02:00
Erik Johnston	40d2f38abe	Fix bug where we incorrectly calculated 'age_ts' from 'age' key rather than the reverse. Don't transmit age_ts to clients for now.	2014-09-15 16:55:39 +01:00
Erik Johnston	59516a8bb1	Correctly handle receiving 'missing' Pdus from federation, rather than just discarding them.	2014-09-15 16:40:44 +01:00
Emmanuel ROHEE	8aa4b7bf7f	Recents must not show temporary fake messages	2014-09-15 17:31:07 +02:00
Erik Johnston	e639a3516d	Improve logging in federation handler.	2014-09-15 16:24:03 +01:00
Erik Johnston	0897a09f49	Fix unit tests after adding extra argument on put_json	2014-09-15 16:24:03 +01:00
Erik Johnston	6ac0b4ade8	Fix 'age' key to update on retries	2014-09-15 16:24:03 +01:00
Kegan Dougal	34d7896b06	More helpful 400 error messages.	2014-09-15 16:05:51 +01:00
Kegan Dougal	688c37ebf4	Updated CHANGES and UPGRADE to reflect registration API changes.	2014-09-15 15:53:05 +01:00
Kegan Dougal	2c00e1ecd9	Be consistent when associating keys with login types for registration/login.	2014-09-15 15:38:29 +01:00
Emmanuel ROHEE	42f5b0a6b8	Recents uses data directly from $rootscope.events	2014-09-15 16:31:59 +02:00
Kegan Dougal	14bc4ed59f	Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes in preparation for re-merge to develop.	2014-09-15 15:27:58 +01:00
Kegan Dougal	0b8a3bc3b9	Update spec to include m.login.email.identity	2014-09-15 15:27:17 +01:00
Kegan Dougal	c04caff55c	Fix unit tests.	2014-09-15 15:14:19 +01:00
Kegan Dougal	7f23425e59	Updated cmdclient to use new registration logic.	2014-09-15 15:09:21 +01:00
Paul "LeoNerd" Evans	1aaa429081	Also unittest RoomMemberStore's joined_hosts_for_room()	2014-09-15 15:00:14 +01:00
Kegan Dougal	04fbda46dd	Make captcha work again with the new registration logic.	2014-09-15 14:52:39 +01:00
Kegan Dougal	d821755b49	Updated webclient to support the new registration logic.	2014-09-15 14:31:53 +01:00
Paul "LeoNerd" Evans	ae7dfeb5b6	Use new 'tests.unittest' in new storage level tests	2014-09-15 14:19:16 +01:00
Paul "LeoNerd" Evans	b0406b9ead	Merge remote-tracking branch 'origin/develop' into test-sqlite-memory	2014-09-15 14:15:10 +01:00
Erik Johnston	5bd9369a62	Correctly handle the 'age' key in events and pdus	2014-09-15 13:26:11 +01:00
Kegan Dougal	285ecaacd0	Split out password/captcha/email logic.	2014-09-15 12:42:36 +01:00
Kegan Dougal	34878bc26a	Added LoginType constants. Created general structure for processing registrations.	2014-09-15 10:23:20 +01:00
Emmanuel ROHEE	76217890c0	BF: inviter field has moved to the room root object	2014-09-15 11:14:10 +02:00
Kegan Dougal	bf6fa6dd3d	Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes	2014-09-15 09:46:33 +01:00
Emmanuel ROHEE	a9da2ec895	BF: presence and eventMap were not reset at logout.	2014-09-15 10:39:30 +02:00
Emmanuel ROHEE	f3d3441d02	Use "white-space: pre-wrap" for "Text will wrap when necessary, and on line breaks"	2014-09-15 10:22:57 +02:00
Emmanuel ROHEE	3292f70071	Merge remote-tracking branch 'origin/master' into develop	2014-09-15 10:08:47 +02:00
Matthew Hodgson	49b5dd56b5	unbreak wordwrapping by breaking multiline paste for now	2014-09-13 11:38:45 +01:00
Matthew Hodgson	32acb7e903	always scroll to bottom when entering a room	2014-09-13 11:35:36 +01:00
Matthew Hodgson	276b9f1839	more wishlist	2014-09-13 11:26:16 +01:00
Paul "LeoNerd" Evans	7a77aabb4b	Define a CLOS-like 'around' modifier as a decorator, to neaten up the 'orig_*' noise of wrapping the setUp()/tearDown() methods	2014-09-12 19:07:29 +01:00
Paul "LeoNerd" Evans	aeb69c0f8c	Add some docstrings	2014-09-12 18:46:13 +01:00
Paul "LeoNerd" Evans	d9f3f322c5	Additionally look first for a 'loglevel' attribute on the running test method, before the TestCase	2014-09-12 18:46:13 +01:00
Paul "LeoNerd" Evans	33c4dd4c2d	Define a (class) decorator for easily setting a DEBUG logging level on a TestCase	2014-09-12 18:46:13 +01:00
Paul "LeoNerd" Evans	ca8349a897	Allow a TestCase to set a 'loglevel' attribute, which overrides the logging level while that testcase runs	2014-09-12 18:46:13 +01:00
Paul "LeoNerd" Evans	cd62ee3f29	Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY	2014-09-12 18:46:13 +01:00
Erik Johnston	958b52596c	Update CHANGES.rst	2014-09-12 18:36:45 +01:00
Erik Johnston	c7bcd87f37	Merge branch 'master' of github.com:matrix-org/synapse into develop	2014-09-12 18:27:44 +01:00
Erik Johnston	80852d1135	Spellcheck	2014-09-12 18:27:04 +01:00
Erik Johnston	84326e2491	Add note about glare support	2014-09-12 18:26:19 +01:00
Erik Johnston	e3aec9bc81	Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse ... Conflicts: webclient/room/room-controller.js	2014-09-12 18:19:32 +01:00
David Baker	21b45d2a5b	Update the spec document to replace the candidate message with the candidates message.	2014-09-12 18:19:19 +01:00