23585 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	3df5cb804f	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor	2014-08-26 16:03:56 +01:00
Erik Johnston	b1e98ddc09	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor	2014-08-26 16:03:25 +01:00
Mark Haines	ac21dfff6d	Fix pyflakes errors	2014-08-26 16:02:59 +01:00
Mark Haines	32347bfcc9	fix a few pyflakes errors	2014-08-26 16:01:29 +01:00
Emmanuel ROHEE	bcf8eb687a	Avoid double call of refresh at app startup	2014-08-26 16:57:41 +02:00
Kegan Dougal	0e7a41dc99	Merge branch 'client_server_url_rename' into develop	2014-08-26 15:55:01 +01:00
Kegan Dougal	8bd55cfdcb	Fix ALL THE UNIT TESTS	2014-08-26 15:54:25 +01:00
Erik Johnston	ff3709e577	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor	2014-08-26 15:45:03 +01:00
Emmanuel ROHEE	c21fcb3373	Determine and send user presence state	2014-08-26 16:25:27 +02:00
Kegan Dougal	b07bc9bdbd	Merge branch 'client_server_url_rename' into develop	2014-08-26 15:06:24 +01:00
Kegan Dougal	27979028b2	Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename	2014-08-26 14:59:54 +01:00
Kegan Dougal	9ff9caeb74	webclient: Updated to use /rooms/$roomid/[invite|join|leave]	2014-08-26 14:59:31 +01:00
Kegan Dougal	5c0be8fde3	Implemented /rooms/$roomid/[invite|join|leave] with POST / PUT (incl txn ids)	2014-08-26 14:49:44 +01:00
Mark Haines	4b2ad549d5	Move the event storage into a single transaction	2014-08-26 14:36:03 +01:00
Kegan Dougal	732d954f89	Added basic in-memory REST transaction storage. Only the latest transaction for a given path/access_token combo is stored in order to prevent storing ALL request/response pairs.	2014-08-26 14:13:32 +01:00
Erik Johnston	485bb64ddb	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor	2014-08-26 13:55:37 +01:00
Erik Johnston	1291ac93f3	Add the ability to turn on the twisted manhole telnet service.	2014-08-26 13:43:55 +01:00
Erik Johnston	a664ec20e0	Add a do_users_share_a_room method and use that in the presence handler.	2014-08-26 13:38:26 +01:00
Kegan Dougal	7d79021c42	Added servlet for /rooms/$roomid/[invite|join|leave]	2014-08-26 12:54:43 +01:00
Kegan Dougal	f6daa9f170	Merge branch 'client_server_url_rename' into develop	2014-08-26 10:37:31 +01:00
Kegan Dougal	b01aeac842	URL renaming: Room state keys now use the format /rooms/$roomid/state/$event_type/$state_key. cmdclient: Fixed double urlencoding on leave command. Stream from the END since START now produces an error on /events.	2014-08-26 10:33:32 +01:00
Kegan Dougal	5796232cb1	Adjusted webclient to use new state paths. Updated membership msg template to actually show the person invited. Factored out common membership functions in matrix service.	2014-08-26 10:24:47 +01:00
Kegan Dougal	52b64617f9	Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename	2014-08-26 10:04:26 +01:00
Erik Johnston	fea7b60cf3	Add 'state_key' to valid_keys	2014-08-26 09:40:58 +01:00
Erik Johnston	b52b33acf6	Send down state_key to clients	2014-08-26 09:40:29 +01:00
Kegan Dougal	47c3a089c5	Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename	2014-08-26 09:26:33 +01:00
Kegan Dougal	cab3095803	Removed member list servlet: now using generic state paths.	2014-08-26 09:26:07 +01:00
Erik Johnston	be6abdff19	Order 'get_recent_events_for_room' correctly.	2014-08-26 09:22:58 +01:00
Emmanuel ROHEE	95839212a7	The landing URL is now '#/' which actually points to homeController	2014-08-25 11:35:33 +02:00
Emmanuel ROHEE	66d752dd1b	Merge remote-tracking branch 'origin/master' into develop	2014-08-25 11:26:29 +02:00
Emmanuel ROHEE	1bd380c816	Merge remote-tracking branch 'origin/hotfixes-0.0.1' into develop	2014-08-25 11:13:54 +02:00
Emmanuel ROHEE	8b0473d5b9	Oops. Removed my NetBeans private folders	2014-08-25 10:25:43 +02:00
Erik Johnston	2c4908ed26	Ensure that we don't have duplicate hosts in the pdu destinations list	2014-08-24 14:35:13 +01:00
Erik Johnston	4521c2d277	Merge branch 'hotfixes-0.0.1' of github.com:matrix-org/synapse	2014-08-24 12:17:59 +01:00
Erik Johnston	0c3b4a1f63	For the content repo, don't just use homeserver.hostname as that might not include the port due to SRV.	2014-08-24 11:56:55 +01:00
Erik Johnston	9d86c8c7a6	Add a unique constraint on the room hosts table	2014-08-24 11:29:29 +01:00
Erik Johnston	a9a5329a11	Encode unicode from json as utf-8. This was required to allow people to register on my laptop	2014-08-24 11:29:29 +01:00
Matthew Hodgson	3f08a7ad21	oops	2014-08-23 20:48:14 +01:00
Matthew Hodgson	d2bb28d2df	very quick and dirty responsive design for iPhones	2014-08-23 20:45:00 +01:00
Matthew Hodgson	45e70a6b70	point out the non-quick-start guide	2014-08-23 00:50:49 +01:00
Erik Johnston	68f4d73717	Mention in changelog that we disabled presence.	2014-08-22 19:03:28 +01:00
Mark Haines	104808107a	skip presence tests which broke when presence polling was disabled	2014-08-22 18:40:31 +01:00
Erik Johnston	cda4ff8519	Oops, we need to use defer.returnValue.	2014-08-22 18:23:02 +01:00
Erik Johnston	5b058a79cb	Make is_presence_visible always return true as it was thrashing the database.	2014-08-22 18:21:21 +01:00
Erik Johnston	b18db63c06	Turn off more spammy logging.	2014-08-22 18:13:50 +01:00
Erik Johnston	537ecd4e99	Turn off spammy logging	2014-08-22 18:12:38 +01:00
Erik Johnston	9f514915af	Add indices to schema	2014-08-22 18:03:39 +01:00
Emmanuel ROHEE	31e7cec486	Added "Your name" as placeholder to help user understand what is this alone input box	2014-08-22 18:23:38 +02:00
Emmanuel ROHEE	41d1db2d4a	Merge branch 'settings-page' into develop	2014-08-22 18:18:27 +02:00
Emmanuel ROHEE	de0706493a	Use /home everywhere	2014-08-22 18:08:03 +02:00