3188 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	370cd9011e	Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse into develop	2014-12-03 18:03:42 +00:00
Erik Johnston	036516d647	Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse	2014-12-03 18:02:33 +00:00
Erik Johnston	797193283e	Bump changes and version	2014-12-03 18:01:47 +00:00
Erik Johnston	75b4329aaa	WIP for new way of managing events.	2014-12-03 16:07:21 +00:00
David Baker	88af58d41d	Update to app_id / app_instance_id (partially) and mangle to be PEP8 compliant.	2014-12-03 13:37:02 +00:00
Erik Johnston	6941a19715	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-03 11:56:49 +00:00
Erik Johnston	d06dfc70b0	Fix bug where did not always resolve all the deferreds in _attempt_new_transaction	2014-12-03 11:50:23 +00:00
Paul "LeoNerd" Evans	66b0596b7a	Don't log synapse.storage at DEBUG level when under -v; require -v -v for that	2014-12-02 22:28:18 +00:00
Paul "LeoNerd" Evans	10eb8f070c	Workaround for non-uniqueness of room member events in the database confusing HAVING COUNT() test of room membership intersection (with thanks to Tom Molesworth)	2014-12-02 21:36:53 +00:00
Paul "LeoNerd" Evans	274d137b00	Extra verbosity on logging of received presence info	2014-12-02 20:51:28 +00:00
Paul "LeoNerd" Evans	307f94dcbe	Squash room_ids list to a set() to remove duplicates - with TODO marker as I have no idea /why/ the dups are happening in the first place	2014-12-02 20:51:12 +00:00
Mark Haines	2f804a7072	Fix pyflakes and pep8 warnings	2014-12-02 19:55:18 +00:00
Mark Haines	5da65085d1	Get uploads working with new media repo	2014-12-02 19:51:47 +00:00
Paul "LeoNerd" Evans	3bf2b4bc92	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2014-12-02 18:01:32 +00:00
Paul "LeoNerd" Evans	afb646dc1e	Allow GET /room/:room_id/messages without 'limit' parameter to default to 10	2014-12-02 18:01:16 +00:00
Paul "LeoNerd" Evans	d8b35250a5	Remove editor junk	2014-12-02 18:01:16 +00:00
David Baker	48f90036d8	Add non-working jitsi meet bridge	2014-12-02 18:01:16 +00:00
Matthew Hodgson	293e89e2da	re-add OSX troubleshooting instructions (not sure how they got lost)	2014-12-02 18:01:16 +00:00
Matthew Hodgson	68cdcbdcab	fix IO::Async abuse - thanks leo	2014-12-02 18:01:16 +00:00
Matthew Hodgson	9f4abd59f5	ignore rogue matrix call events; support verto.media RPC as a horrible hack; fix NA::Matrix dep	2014-12-02 18:01:16 +00:00
Matthew Hodgson	72c1cc743e	clean up a vertobot a bit	2014-12-02 18:01:16 +00:00
Matthew Hodgson	0d149ae6e9	a simple matrix->verto bot, distantly related to the irc bridge	2014-12-02 18:01:16 +00:00
Erik Johnston	3aa333ec7c	Merge branch 'master' of github.com:matrix-org/synapse into develop	2014-12-02 17:46:33 +00:00
Erik Johnston	23a2c42469	Bump version	2014-12-02 17:45:40 +00:00
Mark Haines	c9f5af1de7	Merge branch 'master' into develop	2014-12-02 17:21:17 +00:00
Mark Haines	7993e3d10d	SYN-187: Set a more sensible default for the content_addr	2014-12-02 17:20:02 +00:00
Paul "LeoNerd" Evans	481f5a2cbe	Remove editor junk	2014-12-02 17:20:02 +00:00
Mark Haines	279c48c8b4	Write the upload portion of version 1 of the media repository	2014-12-02 17:13:14 +00:00
David Baker	bdc21e7282	convert to spaces before I start a holy war	2014-12-02 14:10:24 +00:00
David Baker	7642d95d5e	Merge branch 'develop' into pushers	2014-12-02 13:50:05 +00:00
David Baker	758052d7f8	Add non-working jitsi meet bridge	2014-12-02 12:01:30 +00:00
Erik Johnston	c1e66800a9	Begin fleshing out a new Event object	2014-12-02 11:40:22 +00:00
Erik Johnston	9d53228158	Change DomainSpecificString so that it doesn't use a HomeServer object	2014-12-02 10:42:28 +00:00
Erik Johnston	740e95ee08	Merge branch 'master' of github.com:matrix-org/synapse into develop	2014-12-02 10:29:34 +00:00
Erik Johnston	bde9ee5a4c	Merge pull request #21 from tjardick/master ... Added the needed libssl-dev package	2014-12-02 10:27:55 +00:00
Tjardick van der Kraan	f9846a27b6	Added the needed libssl-dev package	2014-12-02 11:22:00 +01:00
Erik Johnston	ec2b5d8c28	Store full JSON of events in db	2014-12-01 16:22:07 +00:00
Matthew Hodgson	dbc98c4e43	re-add OSX troubleshooting instructions (not sure how they got lost)	2014-11-30 23:21:47 +00:00
Matthew Hodgson	e43139ac5e	fix IO::Async abuse - thanks leo	2014-11-28 16:16:41 +00:00
Matthew Hodgson	08bf2aaab5	ignore rogue matrix call events; support verto.media RPC as a horrible hack; fix NA::Matrix dep	2014-11-28 14:43:28 +00:00
Matthew Hodgson	f7fb4675a6	clean up a vertobot a bit	2014-11-28 06:55:05 +00:00
Matthew Hodgson	76a2e92658	a simple matrix->verto bot, distantly related to the irc bridge	2014-11-28 06:45:10 +00:00
Erik Johnston	c4bdeb5f0e	Merge branch 'master' of github.com:matrix-org/synapse into develop	2014-11-27 17:30:31 +00:00
Erik Johnston	ab74afdd8d	Bump version	2014-11-27 17:30:08 +00:00
Erik Johnston	7cb21a24d4	Bump pinned version of pynacl pulled from github	2014-11-27 17:29:29 +00:00
Erik Johnston	d160873886	Merge branch 'release-v0.5.3' of github.com:matrix-org/synapse into develop	2014-11-27 17:17:15 +00:00
Erik Johnston	5e26f6f3ae	Merge branch 'release-v0.5.3' of github.com:matrix-org/synapse	2014-11-27 17:16:24 +00:00
Erik Johnston	cce32f8dc5	Bump version and changelog	2014-11-27 17:15:32 +00:00
Erik Johnston	1505055334	Don't return outliers when we get recent events for rooms.	2014-11-27 16:38:50 +00:00
Erik Johnston	027542e2e5	Fix bugs when joining a remote room that has dodgy event graphs. This should also fix the number of times a HS will trigger a GET /event/	2014-11-27 16:02:26 +00:00