2921 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	0421eb84ac	Merge pull request #73 from matrix-org/hotfixes-v0.7.0f ... Hotfixes v0.7.0f	2015-02-16 09:46:01 +00:00
Erik Johnston	6dd5c95841	Bump version	2015-02-15 20:38:52 +00:00
Erik Johnston	b99a33f283	resolve_events expect lists, not dicts	2015-02-15 20:20:51 +00:00
Matthew Hodgson	2b8903ce2f	we federate on port 8448 nowadays...	2015-02-14 00:16:33 +00:00
Erik Johnston	5f68529036	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-02-13 16:21:30 +00:00
Erik Johnston	d502013c6e	Merge branch 'hotfixes-0.7.0e' of github.com:matrix-org/synapse	2015-02-13 16:19:32 +00:00
David Baker	64def4f953	Merge branch 'hotfixes-0.7.0e' into develop	2015-02-13 16:18:34 +00:00
Erik Johnston	a78838c5ba	Bump version	2015-02-13 16:17:54 +00:00
David Baker	8d5cce62ab	Update pushers by app id and pushkey, not user id and pushkey	2015-02-13 16:16:16 +00:00
Erik Johnston	650dc7f0f9	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-02-13 15:46:42 +00:00
Erik Johnston	be26697b29	Bump version	2015-02-13 15:37:35 +00:00
Erik Johnston	b11a6e1c3c	Fix wrong variable name	2015-02-13 15:37:18 +00:00
Mark Haines	0d872f5aa6	Merge pull request #50 from matrix-org/application-services ... Application Services	2015-02-13 15:06:14 +00:00
Mark Haines	fa662b52d0	Merge pull request #72 from matrix-org/in_memory_sqlite_for_testing ... Prepare the database whenever a connection is opened from the db_pool so...	2015-02-13 14:42:27 +00:00
Mark Haines	183b3d4e47	Prepare the database whenever a connection is opened from the db_pool so that in-memory databases will work	2015-02-13 14:38:24 +00:00
Erik Johnston	49eb11530c	Merge branch 'develop' of github.com:matrix-org/synapse	2015-02-13 14:37:30 +00:00
Erik Johnston	0546126cc5	Bump version	2015-02-13 14:36:40 +00:00
Erik Johnston	2aa87305c0	Merge pull request #71 from matrix-org/auth-conflict-res ... When we see a difference in current state, actually use state conflict resolution algorithm	2015-02-13 14:32:17 +00:00
Erik Johnston	e441c10a73	pyflakes	2015-02-13 14:23:39 +00:00
Erik Johnston	8c652a2b5f	When we see a difference in current state, actually use state conflict resolution algorithm	2015-02-13 14:20:05 +00:00
Erik Johnston	6375abcdac	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-02-13 13:34:25 +00:00
Erik Johnston	c09493d7aa	Bump version	2015-02-13 13:33:37 +00:00
Erik Johnston	74626a8de4	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-02-13 10:09:55 +00:00
Paul "LeoNerd" Evans	55e0916ffc	Reindent code to be less human-readable to keep pep8 from complaining	2015-02-12 21:04:34 +00:00
Paul "LeoNerd" Evans	f22646efcc	Only attempt to fetch presence state of JOINed members in room initialSync (SYN-202)	2015-02-12 21:01:29 +00:00
Matthew Hodgson	16c6b860ac	Merge pull request #70 from matrix-org/exception-fixes ... Exception fixes	2015-02-12 20:03:29 +00:00
Erik Johnston	789251afa7	Fix logging	2015-02-12 19:29:43 +00:00
Erik Johnston	38df10b99e	Remove unused function	2015-02-12 19:29:32 +00:00
Paul "LeoNerd" Evans	93d07c87dc	Reindent code to be less human-readable to keep pep8 from complaining	2015-02-12 19:19:37 +00:00
Paul "LeoNerd" Evans	5f6e6530d0	Appease pyflakes	2015-02-12 19:15:23 +00:00
Paul "LeoNerd" Evans	29805213d1	Can now remove the FIXME too	2015-02-12 19:13:21 +00:00
Paul "LeoNerd" Evans	860b1b4841	Only attempt to fetch presence state of JOINed members in room initialSync (SYN-202)	2015-02-12 19:13:21 +00:00
Erik Johnston	58d848adc0	Parrellize fetching of events	2015-02-12 18:35:36 +00:00
Erik Johnston	963256638d	Correctly handle all the places that can throw exceptions	2015-02-12 18:17:11 +00:00
Erik Johnston	92d850fc87	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-02-12 15:24:06 +00:00
Erik Johnston	a268c31737	Merge pull request #69 from matrix-org/hotfixes-v0.7.0a ... Hotfixes v0.7.0a	2015-02-12 14:56:20 +00:00
Erik Johnston	48fbe79f71	Bump version	2015-02-12 14:52:02 +00:00
Erik Johnston	6b186a57ba	Merge branch 'fix' of github.com:matrix-org/synapse into hotfixes-v0.7.0a	2015-02-12 14:51:46 +00:00
Erik Johnston	717687e1fc	Get an auth query one at a time	2015-02-12 14:39:31 +00:00
Erik Johnston	1ed836cc2b	Merge branch 'release-v0.7.0' of github.com:matrix-org/synapse	2015-02-12 11:42:43 +00:00
Erik Johnston	49fb1067ec	Expand on caching	2015-02-12 11:33:29 +00:00
Erik Johnston	df29666d3c	Add note about alpha csv2 apis	2015-02-12 11:14:57 +00:00
Erik Johnston	b656081c99	Typoes	2015-02-12 11:04:52 +00:00
Erik Johnston	959d77fc7a	Add note about push support	2015-02-12 11:01:53 +00:00
Erik Johnston	a566ed2f0e	Bump webclient version	2015-02-12 10:49:07 +00:00
Erik Johnston	596728698f	Use consistent style of heading	2015-02-12 10:47:46 +00:00
Erik Johnston	e76c24d6e6	Change develop to v0.7.0	2015-02-12 10:46:58 +00:00
Erik Johnston	28b468b292	More rst fixes. Expand on JSON library change	2015-02-12 10:46:15 +00:00
Erik Johnston	2ad2b0dcca	Fix rst formatting	2015-02-12 10:43:43 +00:00
Erik Johnston	74f49b872e	Update CHANGES.rst	2015-02-12 10:42:45 +00:00