438 Commits (f6258221c1e8143f566f59a7d9983ccacf51a2af)

Author	SHA1	Message	Date
Erik Johnston	28bcd01e8d	SYN-47: Fix bug where we still returned events for rooms we had left. ... SYN-47 #resolve	2014-09-19 14:45:21 +01:00
Kegan Dougal	3fa01be9e4	formatting	2014-09-19 12:04:26 +01:00
Erik Johnston	e0f060d89b	Merge branch 'master' of github.com:matrix-org/synapse into develop	2014-09-18 16:22:14 +01:00
Erik Johnston	380852b58e	Bump Changelog and version	2014-09-18 16:20:53 +01:00
Erik Johnston	79a5fb469b	Merge branch 'master' of github.com:matrix-org/synapse into develop	2014-09-18 14:52:19 +01:00
Erik Johnston	9fd0c74e90	Bump changelog and versions	2014-09-18 14:46:23 +01:00
Erik Johnston	335e5d131c	Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop ... Conflicts: tests/handlers/test_profile.py	2014-09-18 14:31:47 +01:00
Paul "LeoNerd" Evans	4571cf7baa	Merge branch 'develop' into test-sqlite-memory	2014-09-17 18:27:47 +01:00
Erik Johnston	10b4291b54	Bump versions	2014-09-17 17:49:01 +01:00
Kegan Dougal	c707b7d128	SYWEB-3 : Added 'visibility' key to rooms returned via /initialSync	2014-09-17 16:09:07 +01:00
Paul "LeoNerd" Evans	9973298e2a	Print expected-vs-actual data types on typecheck failure from check_json()	2014-09-17 15:27:45 +01:00
Erik Johnston	b6818fd4d2	SYN-40: When a user updates their displayname or avatar update all their join events for all the rooms they are currently in.	2014-09-17 15:05:14 +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
Erik Johnston	1e4b971f95	Fix bug where we didn't always get 'prev_content' key	2014-09-15 17:43:46 +01: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
Erik Johnston	e639a3516d	Improve logging in federation handler.	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	2c00e1ecd9	Be consistent when associating keys with login types for registration/login.	2014-09-15 15:38:29 +01: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	04fbda46dd	Make captcha work again with the new registration logic.	2014-09-15 14:52:39 +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
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	aa525e4a63	More accurate docs / clearer paramter names in RoomMemberStore	2014-09-12 16:43:49 +01:00
Paul "LeoNerd" Evans	a87eac4308	Revert recent changes to RoomMemberStore	2014-09-12 15:51:51 +01: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
Paul "LeoNerd" Evans	249e8f2277	Add a better _store_room_member_txn() method that takes separated fields instead of an event object; also add FIXME comment about a big bug in the logic	2014-09-11 18:52:35 +01:00
Paul "LeoNerd" Evans	aaf9ab68c6	Rename _store_room_member_txn to _store_room_member_from_event_txn so we can create another, more sensible function of that name	2014-09-11 18:44:04 +01:00
Paul "LeoNerd" Evans	55397f6347	prepare_database() on db_conn, not plain name, so we can pass in the connection from outside	2014-09-10 16:23:58 +01:00
Paul "LeoNerd" Evans	2faffc52ee	Make sure not to open our TCP ports until /after/ the DB is nicely prepared ready for use	2014-09-10 16:16:24 +01:00
Paul "LeoNerd" Evans	6c1f0055dc	No need for a tiny run() function any more, just use reactor.run() directly	2014-09-10 16:07:44 +01:00
Paul "LeoNerd" Evans	ce55a8cc4b	Move database preparing code out of homserver.py into storage where it belongs	2014-09-10 15:42:15 +01:00
Erik Johnston	a75f8686ba	Fix bug where we used an unbound local variable if we ended up rolling back the persist_event transaction	2014-09-09 16:27:59 +01:00
Erik Johnston	e062f2dfa8	Apparently we can't do txn.rollback(), so raise and catch an exception instead.	2014-09-08 22:37:19 +01:00
Kegan Dougal	76fe7d4eba	Added num_joined_users key to /publicRooms for each room. Show this information in the webclient.	2014-09-08 12:15:29 -07:00
Erik Johnston	942d8412c4	Handle the case where we don't have a common ancestor	2014-09-08 20:13:27 +01:00