5120 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Wagner-Hall	af4422c42a	Merge pull request #446 from matrix-org/daniel/invitemetadata ... Give the IS a bunch more 3pid invite context This allows it to form richer emails	2015-12-16 14:05:46 +01:00
Daniel Wagner-Hall	0311612ce9	Give the IS a bunch more 3pid invite context ... This allows it to form richer emails	2015-12-16 13:05:32 +00:00
Mark Haines	5fc03449c8	Merge pull request #440 from matrix-org/daniel/ise ... Include errcode on Internal Server Error	2015-12-16 11:26:55 +00:00
Mark Haines	4fab578b43	Merge branch 'release-v0.12.0' into develop	2015-12-16 11:18:45 +00:00
Mark Haines	661b76615b	Merge pull request #445 from matrix-org/markjh/rebind_threepid ... Allow users to change which account a 3pid is bound to	2015-12-15 17:07:47 +00:00
Mark Haines	dcfc70e8ed	Allow users to change which account a 3pid is bound to	2015-12-15 17:02:21 +00:00
Mark Haines	63fdd9fe0b	Changelog and version bump for v0.12.0-rc2	2015-12-14 16:26:59 +00:00
Mark Haines	910956b0ec	Merge pull request #443 from matrix-org/markjh/commentary ... Add commentary for fix in PR #442	2015-12-14 15:48:00 +00:00
Mark Haines	e98e00558a	Merge pull request #444 from matrix-org/markjh/presence_race ... Fix a race between started/stopped stream	2015-12-14 15:21:52 +00:00
Mark Haines	3ddf0b9722	Fix spacing	2015-12-14 15:20:59 +00:00
Mark Haines	2acae8300f	Fix logging to lie less	2015-12-14 15:19:37 +00:00
Mark Haines	dbe7892e03	Fix a race between started/stopped stream	2015-12-14 15:09:41 +00:00
Mark Haines	28c5181dfe	Add commentary for fix in PR#442	2015-12-14 14:50:51 +00:00
Mark Haines	15e9885197	Merge branch 'release-v0.12.0' into develop	2015-12-14 14:46:55 +00:00
Mark Haines	8505a4ddc3	Merge pull request #441 from matrix-org/markjh/fts_skip_invalid ... Skip events that where the body, name or topic isn't a string	2015-12-14 14:42:35 +00:00
Mark Haines	6051266924	Merge pull request #442 from matrix-org/markjh/missing_prev_content ... Check whether prev_content or prev_sender is set …	2015-12-14 14:39:07 +00:00
Mark Haines	070e28e203	Combine the prev content tests	2015-12-14 14:34:04 +00:00
Mark Haines	834924248f	Check whether prev_content or prev_sender is set before trying to rollback state	2015-12-14 14:09:21 +00:00
Mark Haines	98dfa7d24f	Skip events that where the body, name or topic isn't a string when back populating the FTS index	2015-12-14 13:55:46 +00:00
Daniel Wagner-Hall	338c0a8a69	Include errcode on Internal Server Error	2015-12-14 13:50:50 +00:00
Mark Haines	a874c0894a	Merge pull request #437 from matrix-org/markjh/parallel_sync ... Do the /sync in parallel across the rooms like /initialSync does	2015-12-14 13:34:28 +00:00
Daniel Wagner-Hall	f382a3bb7e	Merge pull request #439 from matrix-org/daniel/typo ... Fix typo	2015-12-14 12:46:34 +00:00
Daniel Wagner-Hall	76e69cc8de	Fix typo	2015-12-14 12:38:55 +00:00
Mark Haines	fde412b240	Merge pull request #438 from matrix-org/markjh/fix_search_sql ... Fix typo in sql for full text search on sqlite3	2015-12-14 11:43:49 +00:00
Mark Haines	bfc52a2342	Fix typo in sql for full text search on sqlite3	2015-12-14 11:38:11 +00:00
Mark Haines	deeebbfcb7	Merge branch 'release-v0.12.0' into develop	2015-12-12 14:21:49 +00:00
Mark Haines	1ee7280c4c	Do the /sync in parallel accross the rooms like /initialSync does	2015-12-11 16:48:20 +00:00
Erik Johnston	cde49d3d2b	Merge pull request #435 from matrix-org/erikj/search ... Include approximate count of search results	2015-12-11 16:27:38 +00:00
Paul Evans	e738920156	Merge pull request #433 from matrix-org/paul/tiny-fixes ... Ensure that the event that gets persisted is the one that was signed	2015-12-11 15:29:27 +00:00
Mark Haines	0065e554e0	Merge pull request #436 from matrix-org/markjh/pip_instructions ... SYN-90: We don't need --proccess-dependency-links	2015-12-11 15:11:30 +00:00
Mark Haines	5a3e4e43d8	SYN-90: We don't need --proccess-dependency-links ... When installing synapse since all its dependencies are on PyPI	2015-12-11 14:39:46 +00:00
Erik Johnston	d9a5c56930	Include approximate count of search results	2015-12-11 11:40:23 +00:00
Erik Johnston	51fb590c0e	Use more efficient query form	2015-12-11 11:12:57 +00:00
Matthew Hodgson	5577a61090	throwaway 1-liner for generating password hashes	2015-12-10 19:03:06 +00:00
Mark Haines	e0c9f30efa	Merge pull request #434 from matrix-org/markjh/forget_rooms ... Add caches for whether a room has been forgotten by a user	2015-12-10 18:01:46 +00:00
Mark Haines	515548a47a	Missing yield	2015-12-10 17:54:23 +00:00
Mark Haines	7d6b313312	Add caches for whether a room has been forgotten by a user	2015-12-10 17:49:34 +00:00
Paul "LeoNerd" Evans	99afb4b750	Ensure that the event that gets persisted is the one that was signed	2015-12-10 17:08:21 +00:00
Paul "LeoNerd" Evans	d7ee7b589f	Merge branch 'develop' into paul/tiny-fixes	2015-12-10 16:21:00 +00:00
Mark Haines	a8589d1ff3	Mark the version as a -rc1 release candidate	2015-12-10 11:39:00 +00:00
Mark Haines	dd9430e758	Update release date	2015-12-10 11:26:58 +00:00
Mark Haines	05f6cb42db	Bump synapse version to v0.12.0	2015-12-09 17:48:02 +00:00
Mark Haines	5bdb93c2a6	Add to changelog	2015-12-09 17:45:35 +00:00
Mark Haines	613748804a	Changelog for v0.12.0	2015-12-09 17:35:55 +00:00
David Baker	86345a511f	Merge pull request #432 from matrix-org/pushrules_refactor ... Split out the push rule evaluator into a separate file	2015-12-09 16:13:57 +00:00
David Baker	a24eedada7	pep8	2015-12-09 15:57:42 +00:00
David Baker	4a728beba1	Split out the push rule evaluator into a separate file so it can be more readily reused. Should be functionally identical.	2015-12-09 15:51:34 +00:00
Mark Haines	019597555f	Merge pull request #431 from matrix-org/markjh/filter_inline ... Allow filter JSON object in the filter query parameter in /sync Documented by matrix-org/matrix-doc#224	2015-12-09 12:56:53 +00:00
Mark Haines	e4bfe50e8f	Allow filter JSON object in the filter query parameter in /sync ... Documented by matrix-org/matrix-doc#224	2015-12-09 12:56:50 +00:00
Daniel Wagner-Hall	0f826b0b0d	Merge pull request #430 from matrix-org/daniel/unstable ... Merge pull request #430 from matrix-org/daniel/unstable	2015-12-09 11:34:22 +00:00