4865 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Mark Haines	73e4ad4b8b	Merge branch 'master' into develop ... Conflicts: setup.py	2015-09-07 15:06:46 +01:00
Mark Haines	076e19da28	Merge pull request #269 from matrix-org/markjh/upgrading_setuptools ... Add instructions for upgrading setuptools for when people encounter a…	2015-09-07 15:00:02 +01:00
Mark Haines	3ead04ceef	Add instructions for upgrading setuptools for when people encounter a message "mock requires setuptools>=17.1"	2015-09-07 14:57:00 +01:00
Erik Johnston	227b77409f	DEPENDENCY_LINKS was turned to a list	2015-09-04 08:56:23 +01:00
Erik Johnston	efeeff29f6	Merge branch 'release-v0.10.0'	2015-09-03 09:54:08 +01:00
Erik Johnston	1002bbd732	Change log level to info	2015-09-03 09:51:01 +01:00
Erik Johnston	9ad38c9807	Bump version and changelog	2015-09-03 09:49:54 +01:00
Matthew Hodgson	bdf2e5865a	update logger to match new ambiguous script name...	2015-09-03 09:51:42 +03:00
Erik Johnston	fd0a919af3	Lists use 'append'	2015-09-02 17:27:59 +01:00
Erik Johnston	e90f32646f	Bump version and changelog	2015-09-02 17:17:40 +01:00
Erik Johnston	aaf319820a	Update README to include RAM requirements	2015-09-02 17:16:39 +01:00
Erik Johnston	a9ad647fb2	Make port script handle empty sent_transactions table	2015-09-02 11:11:11 +01:00
Daniel Wagner-Hall	77580addc3	Merge pull request #262 from matrix-org/redactyoself ... Allow users to redact their own events	2015-09-02 10:02:36 +01:00
Erik Johnston	8e8955bcea	Merge pull request #266 from pztrn/develop ... Ignore development virtualenv and generated logger configuration as well.	2015-09-02 09:57:55 +01:00
Mark Haines	8bab7abddd	Add nacl.bindings to the list of modules checked. Re-arrange import order to check packages after the packages they depend on	2015-09-01 16:51:10 +01:00
Mark Haines	3cdfd37d95	Print an example "pip install" line for a missing requirement	2015-09-01 16:47:26 +01:00
Erik Johnston	9b05ef6f39	Also check the domains for membership state_keys	2015-09-01 16:17:25 +01:00
Erik Johnston	187320b019	Merge branch 'erikj/check_room_exists' into erikj/unfederatable	2015-09-01 15:58:10 +01:00
Erik Johnston	b345853918	Check against sender rather than event_id	2015-09-01 15:57:35 +01:00
pztrn	7ab401d4dc	Ignore development virtualenv and generated logger configuration as well. ... Signed-off-by: Stanislav Nikitin <pztrn@pztrn.name>	2015-09-01 19:48:22 +05:00
Erik Johnston	a88e16152f	Add flag which disables federation of the room	2015-09-01 15:47:30 +01:00