1900 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	90d022441f	Delete test file	2014-12-09 13:14:38 +00:00
Erik Johnston	d7277398b9	This is to test jenkins	2014-12-09 12:20:49 +00:00
Erik Johnston	4a7a0ed949	This is to test jenkins	2014-12-09 11:41:32 +00:00
Erik Johnston	bdbcd8a638	This is to test jenkins	2014-12-09 11:36:38 +00:00
Erik Johnston	3654825b02	This is to test jenkins	2014-12-09 11:25:41 +00:00
Erik Johnston	2ef499ab84	This is to test jenkins	2014-12-09 11:19:39 +00:00
Erik Johnston	3986c775c4	This is to test jenkins	2014-12-09 11:16:03 +00:00
Erik Johnston	bc6564bac0	Add PEP8 newlines	2014-12-09 11:01:44 +00:00
Erik Johnston	8c48450682	Add PEP8 newlines	2014-12-09 10:58:31 +00:00
Erik Johnston	1c8ee06877	Remove unused snapshot	2014-12-09 10:53:34 +00:00
Erik Johnston	4e57943cc5	Remove unused import	2014-12-09 10:51:36 +00:00
Erik Johnston	609c31e8df	More bug fixes	2014-12-08 17:50:56 +00:00
Erik Johnston	ee3df06183	More bug fixes	2014-12-08 14:50:48 +00:00
Erik Johnston	ba3d1e2fc0	Remove unused import	2014-12-08 12:01:25 +00:00
Erik Johnston	e8323b9e34	More bug fixes	2014-12-08 10:16:18 +00:00
Erik Johnston	a295a3c691	Fix registration	2014-12-08 09:24:37 +00:00
Erik Johnston	d45f28f8bd	Ignore pycharm dir	2014-12-08 09:24:08 +00:00
Erik Johnston	721482c83e	Add forgotten file	2014-12-08 09:10:12 +00:00
Erik Johnston	d044121168	Various typos and bug fixes.	2014-12-08 09:08:26 +00:00
Erik Johnston	6630e1b579	Start making more things use EventContext rather than event.*	2014-12-05 16:20:48 +00:00
Erik Johnston	c5c32266d8	Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor	2014-12-04 15:58:24 +00:00
Erik Johnston	c31dba86ec	Convert rest and handlers to use new event structure	2014-12-04 15:50:01 +00:00
Erik Johnston	5d7c9ab789	Begin converting things to use the new Event structure	2014-12-04 11:27:59 +00:00
Paul "LeoNerd" Evans	f5d2514fc0	@log_function on PresenceStream's get_new_events_for_user()	2014-12-03 19:48:14 +00:00
Paul "LeoNerd" Evans	52f1d3c886	Store any incoming presence push in the local cache anyway, even if there's no interested observers (yet *hint*) (SYN-115)	2014-12-03 19:06:24 +00:00
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	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
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
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
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