138 Commits

Author	SHA1	Message	Date
Mark Haines	998a72d4d9	Merge branch 'develop' into markjh/twisted-15 ... Conflicts: synapse/http/matrixfederationclient.py	2015-08-12 17:21:14 +01:00
Erik Johnston	5989637f37	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts	2015-07-13 13:50:57 +01:00
Erik Johnston	ce9e2f84ad	Add blist to dependencies	2015-07-08 15:41:59 +01:00
Muthu Subramanian	81682d0f82	Integrate SAML2 basic authentication - uses pysaml2	2015-07-08 15:36:54 +05:30
Mark Haines	b8d49be5a1	Merge branch 'develop' into markjh/twisted-15 ... Conflicts: synapse/python_dependencies.py	2015-06-01 10:56:05 +01:00
Mark Haines	90abdaf3bc	Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our own Agent	2015-06-01 10:51:50 +01:00
Erik Johnston	8355b4d074	Bump syutil version	2015-05-29 13:08:43 +01:00
Erik Johnston	a7b65bdedf	Add config option to turn off freezing events. Use new encode_json api and ujson.loads	2015-05-29 12:17:33 +01:00
Erik Johnston	db0dca2f6f	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-05-07 19:21:00 +01:00
Erik Johnston	a151693a3b	Bump syweb version	2015-05-07 18:01:46 +01:00
Mark Haines	ef8e8ebd91	pynacl-0.3.0 was released so we can finally start using it directly from pypi	2015-05-07 16:46:51 +01:00
Mark Haines	c0036ced54	bump syutil to 0.0.6	2015-04-29 14:16:41 +01:00
Mark Haines	4e2f8b8722	Copyright notices	2015-04-24 10:35:29 +01:00
Mark Haines	6080830bef	Bump syutil version to 0.0.5	2015-04-21 17:04:06 +01:00
Mark Haines	88cb06e996	Update syutil version to 0.0.4	2015-04-14 16:18:17 +01:00
David Baker	6d33f97703	pep8	2015-03-17 11:53:55 +00:00
David Baker	7564dac8cb	Wire up the webclient option ... It existed but was hardcoded to True. Give it an underscore for consistency. Also don't pull in syweb unless we're actually using the web client.	2015-03-17 12:45:37 +01:00
Erik Johnston	58247c8b4b	Also bump dependency link version	2015-03-13 11:39:57 +00:00
Matthew Hodgson	f55bd3f94b	bump dep on syweb 0.6.5	2015-03-12 18:56:53 +00:00
Erik Johnston	8486910b64	Bump webclient version	2015-03-02 14:57:37 +00:00
Erik Johnston	5b753d472b	Bump matrix-angular-sdk version	2015-02-18 17:02:40 +00:00
Mark Haines	5806d52423	Fix syntax	2015-02-18 11:01:37 +00:00
Mark Haines	87e9aeb914	Move pynacl to the top of the depedency link list so that it is ... installed before syutil	2015-02-18 11:00:13 +00:00
Erik Johnston	a566ed2f0e	Bump webclient version	2015-02-12 10:49:07 +00:00
Erik Johnston	af89456c3c	Update dependency links	2015-02-11 17:15:16 +00:00
Erik Johnston	a793a0b810	Bump syutil version	2015-02-11 17:02:52 +00:00
Mark Haines	9c24cff6ef	Allow newer versions of syutil	2015-02-11 17:00:32 +00:00
Mark Haines	7ed971d9b2	Single source version and python dependencies, prevent people accidentally installing with easy_install, use scripts rather than entry_points to install synctl	2015-02-10 17:42:36 +00:00
Mark Haines	b085fac735	Code-style fixes	2015-02-10 16:30:48 +00:00
Matthew Hodgson	0b725f5c4f	oops	2015-02-09 16:48:31 +00:00
Matthew Hodgson	bd2373277d	oops	2015-02-09 16:48:09 +00:00
Matthew Hodgson	a578251b48	only do word-boundary patches on bodies for now	2015-02-09 16:44:47 +00:00
Mark Haines	09601255f5	Merge pull request #46 from matrix-org/identicons ... Add a media/v1/identicon resource for generating identicons	2015-02-02 18:56:34 +00:00
Mark Haines	a2da04b8ab	Add pydenticon to python_dependencies	2015-02-02 17:37:26 +00:00
Mark Haines	4574b5a9e6	Generate a list of dependencies from synapse/python_dependencies.py	2015-02-02 17:23:51 +00:00
David Baker	bd03947c05	We do need Twisted 14, not 15: we use internal Twisted things that have been removed in 15.	2015-01-30 11:13:42 +00:00
Paul "LeoNerd" Evans	85419e1257	Stop complaining about Synapse Angular SDK 0.6.1	2015-01-23 18:37:37 +00:00
Mark Haines	63403aa7a5	Check the existance and versions of necessary modules when starting synapse, log which modules are used	2015-01-08 17:08:57 +00:00