5636 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	744e7d2790	Also handle state	2015-09-17 10:26:03 +01:00
Erik Johnston	a3e332af19	Don't bail out of joining if we encounter a rejected event	2015-09-17 10:26:03 +01:00
Erik Johnston	4678055173	Refactor do_invite_join	2015-09-17 10:24:51 +01:00
Erik Johnston	ffe8cf7e59	Fix bug where we sometimes didn't fetch all the keys requested for a ... server.	2015-09-17 10:21:32 +01:00
Erik Johnston	eb700cdc38	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-09-16 11:05:34 +01:00
Erik Johnston	16026e60c5	Merge branch 'hotfixes-v0.10.0-r2' of github.com:matrix-org/synapse	2015-09-16 09:56:15 +01:00
Erik Johnston	0b1a55c60a	Update changelog	2015-09-16 09:55:44 +01:00
Erik Johnston	663b96ae96	Merge branch 'erikj/update_extremeties' into hotfixes-v0.10.0-r2	2015-09-16 09:54:42 +01:00
Erik Johnston	2048388cfd	Merge pull request #281 from matrix-org/erikj/update_extremeties ... When updating a stored event from outlier to non-outlier, remember to update the extremeties	2015-09-15 16:57:25 +01:00
Erik Johnston	8148c48f11	"Comments"	2015-09-15 16:54:48 +01:00
Daniel Wagner-Hall	2c8f16257a	Merge pull request #272 from matrix-org/daniel/insecureclient ... Allow configuration to ignore invalid SSL certs	2015-09-15 16:52:38 +01:00
Erik Johnston	1107e83b54	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-09-15 16:35:34 +01:00
Erik Johnston	3b05b67c89	When updating a stored event from outlier to non-outlier, remember to update the extremeties	2015-09-15 16:34:42 +01:00
Daniel Wagner-Hall	d4af08a167	Use shorter config key name	2015-09-15 15:50:13 +01:00
Daniel Wagner-Hall	3bcbabc9fb	Rename context factory ... Mjark is officially no fun.	2015-09-15 15:46:22 +01:00
Daniel Wagner-Hall	9fc0aad567	Merge branch 'master' into daniel/insecureclient	2015-09-15 15:42:44 +01:00
Paul Evans	929ae19d00	Merge pull request #280 from matrix-org/paul/sighup ... Hacky attempt at catching SIGHUP and rotating the logfile around	2015-09-15 10:47:40 +01:00
Paul "LeoNerd" Evans	9cd5b9a802	Hacky attempt at catching SIGHUP and rotating the logfile around	2015-09-14 19:03:53 +01:00
Daniel Wagner-Hall	728d07c8c1	Merge pull request #256 from matrix-org/auth ... Attempt to validate macaroons	2015-09-14 18:09:33 +01:00
Erik Johnston	d59acb8c5b	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable	2015-09-14 18:05:31 +01:00
Erik Johnston	91cb3b630d	Merge pull request #265 from matrix-org/erikj/check_room_exists ... Check room exists when authenticating an event	2015-09-14 17:56:18 +01:00
Erik Johnston	dffc9c4ae0	Drop unused index	2015-09-14 14:41:37 +01:00
Mark Haines	e2054ce21a	Allow users to GET individual state events for rooms that they have left	2015-09-10 15:06:47 +01:00
Erik Johnston	49ae42bbe1	Bundle in some room state in the unsigned bit of the invite when sending to invited servers	2015-09-10 14:25:54 +01:00
Erik Johnston	4ba8189b74	Bump change log	2015-09-10 10:45:22 +01:00
David Baker	ca32c7a065	Fix adding threepids to an existing account	2015-09-10 10:44:56 +01:00
David Baker	184a5c81f0	Merge pull request #274 from matrix-org/add_threepid_fix ... Fix adding threepids to an existing account	2015-09-10 10:36:58 +01:00
David Baker	30768dcf40	Fix adding threepids to an existing account	2015-09-10 10:33:48 +01:00
Erik Johnston	4ae73d16a9	Merge pull request #270 from matrix-org/markjh/fix_metrics ... Fix the size reported by maxrss.	2015-09-10 10:32:10 +01:00
Erik Johnston	a5b41b809f	Merge pull request #273 from matrix-org/erikj/key_fetch_fix ... Various bug fixes to crypto.keyring	2015-09-10 10:31:23 +01:00
Erik Johnston	3f60481655	Bump version and change log	2015-09-10 09:58:32 +01:00
Erik Johnston	e1eb1f3fb9	Various bug fixes to crypto.keyring	2015-09-10 09:48:12 +01:00
Mark Haines	09cb5c7d33	Allow users that have left a room to get the messages that happend in the room before they left	2015-09-09 17:31:09 +01:00
Erik Johnston	dd0867f5ba	Various bug fixes to crypto.keyring	2015-09-09 17:02:39 +01:00
Mark Haines	3c166a24c5	Remove undocumented and unimplemented 'feedback' parameter from the Client-Server API	2015-09-09 16:05:09 +01:00
Mark Haines	bc8b25eb56	Allow users that have left the room to view the member list from the point they left	2015-09-09 15:42:16 +01:00
Daniel Wagner-Hall	2c746382e0	Merge branch 'daniel/insecureclient' into develop	2015-09-09 14:27:30 +01:00
Mark Haines	1d579df664	Allow rooms/{roomId}/state for a room that has been left	2015-09-09 14:12:24 +01:00
Erik Johnston	c0d1f37baf	Don't require pdus in check_auth script	2015-09-09 13:47:14 +01:00
Daniel Wagner-Hall	ddfe30ba83	Better document the intent of the insecure SSL setting	2015-09-09 13:26:23 +01:00
Mark Haines	89ae0166de	Allow room initialSync for users that have left the room, returning a snapshot of how the room was when they left it	2015-09-09 13:25:22 +01:00
Daniel Wagner-Hall	6485f03d91	Fix random formatting	2015-09-09 13:05:00 +01:00
Daniel Wagner-Hall	81a93ddcc8	Allow configuration to ignore invalid SSL certs ... This will be useful for sytest, and sytest only, hence the aggressive config key name.	2015-09-09 12:02:07 +01:00
Erik Johnston	e530208e68	Change default history visibility for private rooms	2015-09-09 09:57:49 +01:00
Mark Haines	dd42bb78d0	Include rooms that a user has left in an initialSync. Include the state and messages at the point they left the room	2015-09-08 18:16:09 +01:00
Mark Haines	417485eefa	Include the event_id and stream_ordering of membership events when looking up which rooms a user is in	2015-09-08 18:14:54 +01:00
Erik Johnston	2ff439cff7	Bump version/changelog	2015-09-08 11:01:48 +01:00
Mark Haines	709ba99afd	Check that /proc/self/fd exists before listing it	2015-09-07 16:45:55 +01:00
Mark Haines	9e4dacd5e7	The maxrss reported by getrusage is in kilobytes, not pages	2015-09-07 16:45:48 +01:00
Mark Haines	d23bc77e2c	Merge branch 'master' into develop	2015-09-07 15:11:36 +01:00