4434 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	dd0867f5ba	Various bug fixes to crypto.keyring	2015-09-09 17:02:39 +01:00
Erik Johnston	c0d1f37baf	Don't require pdus in check_auth script	2015-09-09 13:47:14 +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
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
Mark Haines	236245f7d8	Merge pull request #264 from matrix-org/markjh/syweb_on_pypi ... Use the version of "matrix-angular-sdk" hosted on pypi	2015-09-01 14:50:29 +01:00
Mark Haines	57df6fffa7	Use the version of "matrix-angular-sdk" hosted on pypi	2015-09-01 14:47:57 +01:00
Erik Johnston	b62c1395d6	Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop	2015-09-01 13:11:55 +01:00
Erik Johnston	9c8eb4a809	Merge pull request #261 from matrix-org/erikj/scripts_clean ... Clean up scripts/	2015-09-01 11:55:26 +01:00
Daniel Wagner-Hall	b854a375b0	Check domain of events properly ... Federated servers still need to delegate authority to owning servers	2015-09-01 11:53:31 +01:00
Erik Johnston	cd800ad99a	Lower size of 'stateGroupCache' now that we have data from matrix.org to support doing so	2015-09-01 10:09:03 +01:00
Erik Johnston	3e4de64bc9	Remove spurious .py from docs	2015-09-01 09:46:42 +01:00
Matthew Hodgson	d71af2ee12	don't log the whole DB config (including postgres password...)	2015-08-29 22:23:21 +01:00
Daniel Wagner-Hall	b143641b20	Merge pull request #258 from matrix-org/slowtestsmakemesad ... Swap out bcrypt for md5 in tests	2015-08-28 15:42:25 +01:00
Daniel Wagner-Hall	4d1ea40008	Merge branch 'develop' into redactyoself ... Conflicts: synapse/handlers/_base.py	2015-08-28 15:35:39 +01:00
Daniel Wagner-Hall	8256a8ece7	Allow users to redact their own events	2015-08-28 15:31:49 +01:00
Mark Haines	a7122692d9	Merge branch 'release-v0.10.0' into develop ... Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py	2015-08-28 11:15:27 +01:00
Erik Johnston	b442217d91	Actually add config path	2015-08-28 10:37:17 +01:00
Erik Johnston	c961cd7736	Clean up scripts/	2015-08-27 13:03:17 +01:00
Erik Johnston	5371c2a1f7	Bump version and changelog	2015-08-27 11:21:11 +01:00
Erik Johnston	4a6d894850	Merge pull request #260 from matrix-org/erikj/filename_order ... Check for an internationalised filename first	2015-08-27 11:18:01 +01:00
Erik Johnston	ddf4d2bd98	Consistency	2015-08-27 10:50:49 +01:00
Erik Johnston	66ec6cf9b8	Check for an internationalised filename first	2015-08-27 10:48:58 +01:00
Erik Johnston	53c2eed862	None check the correct variable	2015-08-27 10:38:22 +01:00
Erik Johnston	f02532baad	Check for None	2015-08-27 10:37:02 +01:00
Erik Johnston	25b32b63ae	Bump changelog and version	2015-08-27 10:09:32 +01:00
Erik Johnston	e330c802e4	Merge pull request #259 from matrix-org/markjh/unicode_content_disposition ... Support unicode attachment filenames	2015-08-27 10:03:58 +01:00
Mark Haines	c9cb354b58	Give a sensible error message if the filename is invalid UTF-8	2015-08-26 17:27:23 +01:00
Mark Haines	5a9e0c3682	Handle unicode filenames given when downloading or received over federation	2015-08-26 17:08:47 +01:00
Mark Haines	e85c7873dc	Allow non-ascii filenames for attachments	2015-08-26 16:26:37 +01:00