4407 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
Daniel Wagner-Hall	86fac9c95e	Remove unused import	2015-08-26 16:03:17 +01:00
Daniel Wagner-Hall	3063383547	Swap out bcrypt for md5 in tests ... This reduces our ~8 second sequential test time down to ~7 seconds	2015-08-26 15:59:32 +01:00
Mark Haines	4c56928263	Merge pull request #254 from matrix-org/markjh/tox_setuptools ... Make 'setup.py test' run tox	2015-08-26 13:50:59 +01:00
Daniel Wagner-Hall	6f0c344ca7	Merge pull request #255 from matrix-org/mergeeriksmadness ... Merge erikj/user_dedup to develop	2015-08-26 13:49:38 +01:00
Daniel Wagner-Hall	d3c0e48859	Merge erikj/user_dedup to develop	2015-08-26 13:42:45 +01:00
Mark Haines	06094591c5	Pass an empty list of arguments to tox if no arguments are given	2015-08-26 13:13:01 +01:00
Mark Haines	fd246fde89	Install tox locally if it wasn't already installed when running setup.py test	2015-08-26 12:59:02 +01:00
Mark Haines	4f6fa981ec	Make 'setup.py test' run tox	2015-08-26 12:45:29 +01:00
Daniel Wagner-Hall	3cab86a122	Merge pull request #253 from matrix-org/tox ... Allow tests to be filter when using tox	2015-08-26 11:48:41 +01:00
Daniel Wagner-Hall	e768d7b3a6	Allow tests to be filter when using tox ... `tox` will run all tests `tox tests.api.test_auth.AuthTestCase` will run just the tests in AuthTestCase	2015-08-26 11:41:42 +01:00
Erik Johnston	efdaa5dd55	Merge pull request #252 from matrix-org/erikj/typing_loop ... Don't loop over all rooms ever in typing.get_new_events_for_user	2015-08-26 11:12:25 +01:00
Erik Johnston	da51acf0e7	Remove needless existence checks	2015-08-26 11:08:23 +01:00
Erik Johnston	f4d552589e	Don't loop over all rooms ever in typing.get_new_events_for_user	2015-08-26 10:51:08 +01:00
Erik Johnston	90fde4b8d7	Bump changelog and version	2015-08-25 17:49:58 +01:00
Erik Johnston	0de2aad061	Merge pull request #250 from matrix-org/erikj/generated_directory ... Add config option to specify where generated files should be dumped	2015-08-25 17:40:19 +01:00
Erik Johnston	3f6f74686a	Update config doc	2015-08-25 17:37:21 +01:00
Erik Johnston	82145912c3	s/--generated-directory/--keys-directory/	2015-08-25 17:31:22 +01:00
Daniel Wagner-Hall	a2355fae7e	Merge pull request #251 from matrix-org/removeadmin ... Stop looking up "admin", which we never read	2015-08-25 17:23:05 +01:00
Daniel Wagner-Hall	ee3fa1a99c	Merge pull request #248 from matrix-org/deviceid ... Remove completely unused concepts from codebase	2015-08-25 17:19:06 +01:00
Erik Johnston	59891a294f	Merge pull request #249 from matrix-org/erikj/allow_config_path_dirs ... Allow specifying directories as config paths	2015-08-25 17:17:57 +01:00
Erik Johnston	3e1029fe80	Warn if we encounter unexpected files in config directories	2015-08-25 17:08:23 +01:00
Erik Johnston	af7c1397d1	Add config option to specify where generated files should be dumped	2015-08-25 16:58:01 +01:00
Daniel Wagner-Hall	460cad7c11	Merge branch 'deviceid' into removeadmin	2015-08-25 16:37:59 +01:00
Daniel Wagner-Hall	825f0875bc	Fix up one more reference	2015-08-25 16:37:37 +01:00
Daniel Wagner-Hall	a9d8bd95e7	Stop looking up "admin", which we never read	2015-08-25 16:29:39 +01:00
Erik Johnston	bfb66773a4	Allow specifying directories as config files	2015-08-25 16:25:54 +01:00
Daniel Wagner-Hall	57619d6058	Re-wrap line	2015-08-25 16:25:46 +01:00