885 Commits

Author	SHA1	Message	Date
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
Mark Haines	56db465047	Merge branch 'release-v0.6.0' into develop	2014-12-16 17:29:49 +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	2e44714214	Make failure to run appropraite upgrade scripts more helpful.	2014-12-16 14:20:32 +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
Erik Johnston	5a465b67ba	Fix pyflakes	2014-12-16 13:41:43 +00:00
Erik Johnston	58168498b0	Remove FrozenEncoder	2014-12-16 13:38:38 +00:00
Erik Johnston	8133cdcc88	Better english in docstrings are helpful.	2014-12-16 13:32:06 +00:00
Erik Johnston	35f4f6b070	Update upgrade script	2014-12-16 13:27:53 +00:00
Erik Johnston	882dc8dcab	Persist internal_metadata	2014-12-16 13:17:09 +00:00
Erik Johnston	4afac88390	Add basic docstring to annotate_context_with_state	2014-12-16 13:09:44 +00:00
Erik Johnston	3c77d13aa5	Kill off synapse.api.events.*	2014-12-16 11:29:05 +00:00
Erik Johnston	6a1da99fab	Add fixme to raising of AuthError in federation land	2014-12-16 09:35:31 +00:00
Erik Johnston	65b2e49429	Fix pyflakes	2014-12-15 17:35:37 +00:00
Erik Johnston	9c49054f1d	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-15 17:33:23 +00:00
Erik Johnston	f280929a12	Use frozenutils	2014-12-15 17:31:36 +00:00
Erik Johnston	009e4b5637	User.is_mine is no longer a thing. Use hs.is_mine instead.	2014-12-15 17:17:51 +00:00
Erik Johnston	cf6e5f1dbf	Rename MessageHandler.handle_event. Add a few comments.	2014-12-15 17:01:12 +00:00
Kegsay	67c9585656	Update media_repository.py ... _ not -	2014-12-15 16:57:53 +00:00
Erik Johnston	670dcdfc14	Remove unused functions	2014-12-15 16:16:58 +00:00
Paul "LeoNerd" Evans	0c1deca574	Remember to hook up the typing event stream to the notifier as well	2014-12-15 16:14:53 +00:00
Erik Johnston	b75adaedca	Finish up upgrade script	2014-12-15 16:14:34 +00:00
Erik Johnston	65cdf4e724	Get current member state from current_state snapshot. Fix leave test.	2014-12-15 15:03:27 +00:00
Erik Johnston	57e0e619f3	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor ... Conflicts: tests/handlers/test_room.py	2014-12-15 14:45:59 +00:00
Paul "LeoNerd" Evans	20beed9dd4	Still send typing notifications to myself if I'm the only one in the room (it's a lonely life...)	2014-12-15 14:37:12 +00:00
Mark Haines	3610641a62	Update docs in media_repository	2014-12-15 13:56:43 +00:00
Erik Johnston	c8dd3314d6	Fix bug where we ignored event_edge_hashes table	2014-12-15 13:55:22 +00:00
Mark Haines	58fa6d3fc6	return an mxc uri rather than a content_token.	2014-12-15 13:54:10 +00:00
Paul "LeoNerd" Evans	0aa8c08478	Merge branch 'develop' into typing_notifications	2014-12-15 11:19:30 +00:00
Erik Johnston	3983c7fb0f	Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop	2014-12-13 18:16:12 +00:00
Erik Johnston	eea58b8076	Bump version and change log	2014-12-13 18:04:37 +00:00
Erik Johnston	6380ead2ee	Fix bug while generating the error message when a file path specified in the config doesn't exist	2014-12-13 18:03:01 +00:00
Erik Johnston	23c7cb6220	Remove unused imports	2014-12-12 16:31:59 +00:00
Erik Johnston	fc409096ac	Make auth module use EventTypes constants	2014-12-12 16:31:50 +00:00