1148 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
David Baker	842898df15	Send multiple candidates at once instead of all individually. Changes spec to include multiple candidates in a candidate(s) message.	2014-09-12 18:19:19 +01:00
Erik Johnston	afb7f173cf	Bump version and change log	2014-09-12 18:13:05 +01:00
Erik Johnston	14975ce5bc	Fix bug where we relied on the current_state_events being updated when we are handling type specific persistence	2014-09-12 17:57:02 +01:00
Erik Johnston	667e747ed1	Fix bug where we no longer stored user_id on Pdus	2014-09-12 17:56:21 +01:00
Paul "LeoNerd" Evans	1c51c8ab7d	Merge remote-tracking branch 'origin/develop' into test-sqlite-memory ... Conflicts: synapse/storage/pdu.py	2014-09-12 17:20:06 +01:00
Erik Johnston	39e3fc69e5	Make the state resolution use actual power levels rather than taking them from a Pdu key.	2014-09-12 17:11:09 +01:00
Erik Johnston	b42fe05c51	Fix bug where we incorrectly removed a remote host from the list of hosts in a room when any user from that host left that room even if they weren't the last user from that host in that room	2014-09-12 17:11:09 +01:00
Erik Johnston	ca1ae7cf9b	Fix bug where we didn't return a tuple when expected.	2014-09-12 17:11:09 +01:00
Paul "LeoNerd" Evans	2026942b05	Initial hack at some RoomMemberStore unit tests	2014-09-12 16:44:07 +01:00
Paul "LeoNerd" Evans	aa525e4a63	More accurate docs / clearer paramter names in RoomMemberStore	2014-09-12 16:43:49 +01:00
Emmanuel ROHEE	3ed39ad20e	Clean data when user logs out	2014-09-12 17:43:35 +02:00
David Baker	cc2cee4af6	Retry sending events that fail to send.	2014-09-12 16:32:22 +01:00
Emmanuel ROHEE	6c81752e46	Fixed displayname resolution of emote sender	2014-09-12 17:01:49 +02:00
Paul "LeoNerd" Evans	a87eac4308	Revert recent changes to RoomMemberStore	2014-09-12 15:51:51 +01:00
Emmanuel ROHEE	a2cd942a95	Fixed public room name and users count alignement ... Put data into a table to ease layout and manage long strings	2014-09-12 16:46:20 +02:00
Paul "LeoNerd" Evans	a840ff8f3f	Now don't need the other logger.debug() call in _execute	2014-09-12 14:38:27 +01:00
Paul "LeoNerd" Evans	1c20249884	Logging of all SQL queries via the 'synapse.storage.SQL' logger	2014-09-12 14:37:55 +01:00
Paul "LeoNerd" Evans	e53d77b501	Add a .runInteraction() method on SQLBaseStore itself to wrap the .db_pool	2014-09-12 14:28:07 +01:00