4259 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	016c089f13	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/power_level_sanity	2015-07-13 13:48:13 +01:00
Erik Johnston	e5991af629	Comments	2015-07-13 13:30:43 +01:00
Erik Johnston	17bb9a7eb9	Remove commented out code	2015-07-10 14:07:57 +01:00
Erik Johnston	a5ea22d468	Sanitize power level checks	2015-07-10 14:05:38 +01:00
Erik Johnston	7e3b14fe78	You shouldn't be able to ban/kick users with higher power levels	2015-07-10 14:05:38 +01:00
Erik Johnston	532fcc997a	Merge pull request #196 from matrix-org/erikj/room_history ... Add ability to restrict room history.	2015-07-10 13:47:04 +01:00
Erik Johnston	0b3389bcd2	Merge pull request #194 from matrix-org/erikj/bulk_verify_sigs ... Implement bulk verify_signed_json API	2015-07-10 13:46:53 +01:00
Erik Johnston	0d7f0febf4	Uniquely name unique constraint	2015-07-10 13:43:03 +01:00
Erik Johnston	b7cb37b189	Merge pull request #198 from matrix-org/markjh/client-end-to-end-key-management ... Client end to end key management API	2015-07-10 13:36:17 +01:00
Mark Haines	a01097d60b	Assume that each device for a user has only one of each type of key	2015-07-10 13:26:18 +01:00
Erik Johnston	f3049d0b81	Small tweaks to SAML2 configuration. ... - Add saml2 config docs to default config. - Use existence of saml2 config to indicate if saml2 should be enabled.	2015-07-10 10:50:14 +01:00
Erik Johnston	a887efa07a	Add Muthu Subramanian to AUTHORS	2015-07-10 10:37:24 +01:00
Erik Johnston	9158ad1abb	Merge pull request #201 from EricssonResearch/msba/saml2-develop ... Integrate SAML2 basic authentication - uses pysaml2	2015-07-10 10:25:56 +01:00
Erik Johnston	b5f0d73ea3	Add comment	2015-07-09 17:09:26 +01:00
Erik Johnston	ed88720952	Handle error slightly better	2015-07-09 16:14:46 +01:00
Erik Johnston	f0979afdb0	Remove spurious comment	2015-07-09 16:02:07 +01:00
Mark Haines	bf0d59ed30	Don't bother with a timeout for one time keys on the server.	2015-07-09 14:04:03 +01:00
Erik Johnston	c2d08ca62a	Integer timestamps	2015-07-09 13:15:34 +01:00
Erik Johnston	4019b48aaa	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts	2015-07-09 11:55:52 +01:00
Erik Johnston	294dbd712f	We don't want semicolons.	2015-07-09 11:47:24 +01:00
Erik Johnston	1af188209a	Change format of receipts to allow inclusion of data	2015-07-09 11:39:30 +01:00
Muthu Subramanian	8cd34dfe95	Make SAML2 optional and add some references/comments	2015-07-09 13:34:47 +05:30
Muthu Subramanian	d2caa5351a	code beautify	2015-07-09 12:58:15 +05:30
Matthew Hodgson	fb8d2862c1	remove the tls_certificate_chain_path param and simply support tls_certificate_path pointing to a file containing a chain of certificates	2015-07-09 00:45:41 +01:00
Matthew Hodgson	8ad2d2d1cb	document tls_certificate_chain_path more clearly	2015-07-09 00:06:01 +01:00
Matthew Hodgson	f26a3df1bf	oops, context.tls_certificate_chain_file() expects a file, not a certificate.	2015-07-08 21:33:02 +01:00
Matthew Hodgson	19fa3731ae	typo	2015-07-08 18:53:41 +01:00
Matthew Hodgson	465acb0c6a	*cough*	2015-07-08 18:30:59 +01:00
Matthew Hodgson	64afbe6ccd	add new optional config for tls_certificate_chain_path for folks with intermediary SSL certs	2015-07-08 18:20:02 +01:00
Matthew Hodgson	04192ee05b	typo	2015-07-08 17:49:15 +01:00
Mark Haines	8fb79eeea4	Only remove one time keys when new one time keys are added	2015-07-08 17:04:29 +01:00
Erik Johnston	ce9e2f84ad	Add blist to dependencies	2015-07-08 15:41:59 +01:00
Erik Johnston	304343f4d7	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts	2015-07-08 15:37:33 +01:00
Erik Johnston	af812b68dd	Add a cache to fetching of receipt streams	2015-07-08 15:35:00 +01:00
Erik Johnston	d85ce8d89b	Split receipt events up into one per room	2015-07-08 11:36:05 +01:00
Muthu Subramanian	f53bae0c19	code beautify	2015-07-08 16:05:46 +05:30
Muthu Subramanian	77c5db5977	code beautify	2015-07-08 16:05:20 +05:30
Muthu Subramanian	81682d0f82	Integrate SAML2 basic authentication - uses pysaml2	2015-07-08 15:36:54 +05:30
Erik Johnston	87311d1b8c	Hook up receipts to v1 initialSync	2015-07-08 11:02:04 +01:00
Erik Johnston	f0dd6d4cbd	Fix test.	2015-07-07 16:18:36 +01:00
Erik Johnston	ca041d5526	Wire together receipts and the notifer/federation	2015-07-07 15:25:30 +01:00
Erik Johnston	716e426933	Fix various typos	2015-07-07 10:55:31 +01:00
Erik Johnston	e8b2f6f8a1	Add a ReceiptServlet	2015-07-07 10:55:22 +01:00
Erik Johnston	dfc74c30c9	Merge pull request #197 from matrix-org/mjark/missing_regex_group ... Don't 500 if a group is missing from the regex match	2015-07-07 09:37:38 +01:00
Mark Haines	28ef344077	Merge branch 'mjark/missing_regex_group' into markjh/client-end-to-end-key-management	2015-07-06 18:48:27 +01:00
Mark Haines	2ef182ee93	Add client API for uploading and querying keys for end to end encryption	2015-07-06 18:47:57 +01:00
Mark Haines	b5770f8947	Add store for client end to end keys	2015-07-06 18:46:47 +01:00
Mark Haines	a7dcbfe430	Don't 500 if a group is missing from the regex	2015-07-06 16:47:17 +01:00
Erik Johnston	1a3255b507	Add m.room.history_visibility to newly created rooms' m.room.power_levels	2015-07-06 13:25:35 +01:00
Erik Johnston	fb47c3cfbe	Rename key and values for m.room.history_visibility. Support 'invited' value	2015-07-06 13:05:52 +01:00