2158 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	05b961d7e3	PEP8	2015-02-11 10:28:46 +00:00
Erik Johnston	dcf52469e8	Move time_bound_deferred into Clock	2015-02-11 10:25:06 +00:00
Erik Johnston	0e6b3e4e40	Time out HTTP federation requests	2015-02-10 18:17:27 +00:00
Erik Johnston	771892b314	Merge pull request #59 from matrix-org/hotfixes-v0.6.1f ... Hotfixes v0.6.1f	2015-02-10 16:39:05 +00:00
Erik Johnston	b61a308b27	Bump version	2015-02-10 16:37:12 +00:00
Erik Johnston	e8d4a31475	Fix prune_events to work with nested dicts	2015-02-10 16:36:51 +00:00
Erik Johnston	559a26b025	Pin the twisted version so that it doesn't pull in twisted 15.	2015-02-04 23:55:35 +00:00
Matthew Hodgson	d60658c2db	Merge pull request #48 from matrix-org/hotfixes-v0.6.1e ... Hotfixes v0.6.1e	2015-02-04 23:53:45 +00:00
Erik Johnston	77e5ae22a9	Ver bump	2015-02-04 23:51:34 +00:00
Erik Johnston	19ebdc321d	Pull in python_dependencies.py from develop	2015-02-04 23:51:02 +00:00
Erik Johnston	92c43e4a0e	Revert "Pull in python_dependencies.py from develop" ... This reverts commit 47b1e1491f.	2015-02-04 23:50:25 +00:00
Erik Johnston	47b1e1491f	Pull in python_dependencies.py from develop	2015-02-04 23:49:40 +00:00
Erik Johnston	3b5e8125eb	Bluntly port changes of README from develop to master	2015-02-04 23:48:32 +00:00
Matthew Hodgson	30ed0884fc	fix OSX stuff and typos	2015-02-02 14:03:03 +00:00
Mark Haines	898835d924	Merge pull request #45 from matrix-org/hotfixes-v0.6.1d ... Hotfixes v0.6.1d	2015-02-02 13:21:03 +00:00
Mark Haines	d8cf06e525	Bump version to 0.6.1d	2015-02-02 13:18:36 +00:00
Mark Haines	d3dd749044	Pin the version of Twisted to 14.0.2 since we are using some of its internals	2015-02-02 13:17:45 +00:00
Mark Haines	c3979b236e	Tell people to "source" the activate script for virtualenv, Remove --user from pip install	2015-02-02 13:12:06 +00:00
Mark Haines	b993555bf4	Update documentation to recommend virtual env ... Conflicts: README.rst	2015-02-02 13:12:06 +00:00
Erik Johnston	bcb8d2fe54	Merge branch 'hotfixes-v0.6.1c' of github.com:matrix-org/synapse	2015-02-02 13:09:48 +00:00
Erik Johnston	83c31735d0	Use >= for version of webclient	2015-02-02 13:07:43 +00:00
Erik Johnston	3b33529dfd	Bump version	2015-02-02 13:03:25 +00:00
Erik Johnston	c934760014	Bump version of webclient pulled in.	2015-02-02 13:03:03 +00:00
David Baker	e32ded7b3e	Add matrix.org as a trusted ID server because it's now passed through on ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address).	2015-01-28 10:09:54 +00:00
Erik Johnston	b1a38c39ad	Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse	2015-01-13 10:00:47 +00:00
Erik Johnston	1d3d37937d	Bump version	2015-01-13 09:59:47 +00:00
Erik Johnston	39585bf556	Insert 'age' into top level when returning events to clients	2015-01-13 09:57:32 +00:00
Mark Haines	f3467d4646	Merge branch 'hotfixes-v0.6.1'	2015-01-08 09:43:01 +00:00
Mark Haines	5a0e687d5c	Bump version	2015-01-08 09:42:23 +00:00
Mark Haines	c9d2cecac9	SYN-231: User agent header broken	2015-01-08 09:41:11 +00:00
Erik Johnston	bacaa215eb	Merge branch 'release-v0.6.1' of github.com:matrix-org/synapse	2015-01-07 14:34:00 +00:00
Erik Johnston	72d8d1265b	Improve change log	2015-01-07 14:16:38 +00:00
Erik Johnston	89fc09c3d1	Bump version and changelog	2015-01-07 13:56:56 +00:00
Erik Johnston	a039e2544c	Remove unused import	2015-01-07 09:48:03 +00:00
Erik Johnston	6536161e2a	Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop	2015-01-07 09:45:42 +00:00
Erik Johnston	1497e50649	Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf	2015-01-07 09:40:42 +00:00
Mark Haines	5cf45c4319	Merge branch 'master' into develop	2015-01-06 19:48:53 +00:00
Erik Johnston	dfa05f0cd6	Optimize FrozenEvent creation	2015-01-06 18:51:03 +00:00
Erik Johnston	36a2a877e2	Use time.time() instead of time.clock()	2015-01-06 16:34:41 +00:00
Erik Johnston	d5ae67e67d	Fix typo where we used wrong var.	2015-01-06 16:05:01 +00:00
Erik Johnston	fd9a8db7ea	Only fetch the columns we need.	2015-01-06 15:59:31 +00:00
Erik Johnston	9e5545a6fa	RoomsForUser now has sender instead of user_id	2015-01-06 15:53:50 +00:00
Erik Johnston	a01416cf21	Add delta and bump DB version	2015-01-06 15:42:18 +00:00
Erik Johnston	f6da237c35	Add index on transaction_id to sent_transcations	2015-01-06 15:40:38 +00:00
Erik Johnston	9bd07bed23	Actually time that function	2015-01-06 15:28:56 +00:00
Erik Johnston	03a501456c	Time how long calls to _get_destination_retry_timings take	2015-01-06 15:22:28 +00:00
Erik Johnston	52b2c6c9c7	Don't include None's in _get_events_txn	2015-01-06 14:56:57 +00:00
Erik Johnston	8a12df8cf3	Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop	2015-01-06 14:45:57 +00:00
Erik Johnston	96707ed718	Name 'user_rooms_intersect' transaction	2015-01-06 14:44:27 +00:00
Erik Johnston	76ec154e95	We don't need the full events for get_rooms_for_user_where_membership_is	2015-01-06 14:37:00 +00:00