2079 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mark Haines	420ccfc925	Merge branch 'hotfixes-v0.6.0'	2014-12-19 17:52:58 +00:00
Kegan Dougal	4640239d34	Mock ratelimiter to make tests pass.	2014-12-19 17:49:47 +00:00
Matthew Hodgson	2a5b53bc4a	more changelogs	2014-12-19 17:39:43 +00:00
Kegan Dougal	67a406a754	Rate limit display names and avatar urls per request rather than per event.	2014-12-19 17:36:33 +00:00
Mark Haines	efd27ff01b	Set a state_key for the topic and room name, otherwise they won't be treated as room state	2014-12-19 15:31:27 +00:00
Mark Haines	9c71d945d6	Look for name, topic in the event content rather than the event itself when persisting room name and topic events	2014-12-19 15:16:48 +00:00
Mark Haines	f70e622d59	bump_presence_active_time when sending a message event	2014-12-19 14:30:57 +00:00
Mark Haines	a999f0dec3	Don't ratelimit room create events	2014-12-19 14:18:27 +00:00
Mark Haines	45a6869cb4	Merge branch 'release-v0.6.0'	2014-12-19 13:40:02 +00:00
Mark Haines	1e4a56c3a9	Bump web sdk version to 0.6.0	2014-12-19 13:39:24 +00:00
Mark Haines	1e7f83b91d	Set display name when joining via alias	2014-12-19 12:31:46 +00:00
Mark Haines	5dbe820e9a	Remove unneeded federation keys from events	2014-12-19 12:16:26 +00:00
Mark Haines	390e48a8b0	SYN-203: Handle requests for thunbnails for images that are small	2014-12-19 12:05:38 +00:00
Mark Haines	5739e6c606	s/user_id/sender/	2014-12-19 11:43:46 +00:00
Mark Haines	4e38b0800d	Merge branch 'develop' into release-v0.6.0	2014-12-19 11:21:40 +00:00
Mark Haines	041ac476a5	Supply auth_chain along with current state in '/state/', fetch auth events from a remote server if we are missing some of them	2014-12-18 18:47:13 +00:00
Mark Haines	dbe77ec79a	Replace distributor deferred list, with a simple for loop until I understand why the former breaks and the latter doesn't	2014-12-18 17:47:00 +00:00
Kegsay	20923ffd43	Update README.rst ... Add gotcha: The content repository requires additional cygwin packages.	2014-12-18 14:44:48 +00:00
Kegsay	f8cc8a66b4	Update README.rst ... Add windows (cygwin) install instructions.	2014-12-18 14:16:31 +00:00
Mark Haines	dea5d4b03b	Don't yield on sending the event accross federation.	2014-12-18 11:29:46 +00:00
Erik Johnston	dec5b62339	Use _get_events_txn instead of _parse_events_txn	2014-12-16 19:16:41 +00:00
Erik Johnston	21cab3a7ec	Fix where we pulled in event.state_events from hotfixes branch	2014-12-16 19:16:15 +00:00
Erik Johnston	2215faa361	Merge branch 'hotfixes-v0.5.4a' of github.com:matrix-org/synapse into release-v0.6.0	2014-12-16 19:11:13 +00:00
Erik Johnston	3defd5b3ee	Add FIXME	2014-12-16 19:07:20 +00:00
Erik Johnston	96779d2490	Fix bug where we did not send the full auth chain to people that joined over federation	2014-12-16 18:57:36 +00:00
Erik Johnston	2d7716d4d0	Make error messages slightly more helpful	2014-12-16 18:41:48 +00:00
Erik Johnston	f76269392b	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.6.0 ... Conflicts: synapse/state.py	2014-12-16 18:35:46 +00:00
Erik Johnston	52f99243ab	Use is_outlier() so that we don't get AttributeError	2014-12-16 18:33:50 +00:00
Erik Johnston	5b39cfff69	Don't assume an event exists	2014-12-16 18:25:24 +00:00
Erik Johnston	9550ba94f2	Mention that we should pull in new deps before running upgrade script	2014-12-16 17:31:39 +00:00
Mark Haines	56db465047	Merge branch 'release-v0.6.0' into develop	2014-12-16 17:29:49 +00:00
Erik Johnston	28f71ecf0d	Change upgrade script to not check hashes or signatures	2014-12-16 17:29:22 +00:00
Kegan Dougal	4dcad143dd	SYN-142: Use a default log file 'homeserver.log' so people get logging by default.	2014-12-16 17:24:49 +00:00
Erik Johnston	f06161a307	Enable rate limiting for all events	2014-12-16 16:10:17 +00:00
Mark Haines	627e4f01d2	Remove send_message since nothing was calling it. Remove Snapshot because only send_message was using it	2014-12-16 16:07:41 +00:00
Erik Johnston	23da4a4051	Fix typo where we thought a list was a dict	2014-12-16 15:59:40 +00:00
Mark Haines	c3eae8a88c	Construct the EventContext in the state handler rather than constructing one and then immediately calling state_handler.annotate_context_with_state	2014-12-16 15:59:17 +00:00
Mark Haines	3c7857e49b	clean up coding style a bit	2014-12-16 15:24:03 +00:00
Erik Johnston	42b725ce52	Fix upgrade script to run all the missing deltas.	2014-12-16 15:13:34 +00:00
Mark Haines	8b8beba194	Remove annotate_event_with_state as nothing was using it. Update state tests to call annotate_context_with_state	2014-12-16 15:08:37 +00:00
Erik Johnston	b3c793e362	Do run all deltas up to missing delta 10	2014-12-16 14:44:53 +00:00
Erik Johnston	d2ca24087f	Bump UPGRADES and CHANGES	2014-12-16 14:36:31 +00:00
Erik Johnston	2e44714214	Make failure to run appropraite upgrade scripts more helpful.	2014-12-16 14:20:32 +00:00
Erik Johnston	592ba14b36	Fix bugs in upgrade script. ... Handle the case when there are colons in server_name. Handle http exceptions more gracefully.	2014-12-16 14:07:05 +00:00
Erik Johnston	cb91ce5bba	Rename upgrade script	2014-12-16 13:58:57 +00:00
Erik Johnston	bab1e790ae	Include database bump in upgrade script	2014-12-16 13:58:38 +00:00
Erik Johnston	ef5a141050	Bump database version	2014-12-16 13:57:47 +00:00
Erik Johnston	96cc7c8740	Bump version	2014-12-16 13:57:27 +00:00
Mark Haines	2af40cfa14	Merge pull request #25 from matrix-org/events_refactor ... Event refactor	2014-12-16 13:53:43 +00:00
Erik Johnston	5a465b67ba	Fix pyflakes	2014-12-16 13:41:43 +00:00