matrix/thirdparty/synapse.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'develop' into typing_notifications	Paul "LeoNerd" Evans	2014-12-15	4	-4/+10
\|\
\| *	Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop	Erik Johnston	2014-12-13	4	-4/+10
\| \|\
\| \| *	Bump version and change log	Erik Johnston	2014-12-13	3	-2/+8
\| \| \|
\| \| *	Fix bug while generating the error message when a file path specified in the ↵	Erik Johnston	2014-12-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	config doesn't exist
* \| \|	Send list of typing user IDs as 'user_ids' list within 'content', so that ↵	Paul "LeoNerd" Evans	2014-12-12	3	-7/+21
\| \| \| \| \| \| \| \| \| \| \| \|	m.typing stream events have a toplevel content, for consistency with others
* \| \|	Merge branch 'develop' into typing_notifications	Paul "LeoNerd" Evans	2014-12-11	24	-17/+1320
\|\ \ \
\| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into develop	Paul "LeoNerd" Evans	2014-12-11	24	-17/+1320
\| \|\\| \|
\| \| * \|	Fix typo in media repository doc string	Mark Haines	2014-12-11	1	-1/+1
\| \| \| \|
\| \| * \|	Fix media repository doc string to include server_name	Mark Haines	2014-12-11	1	-3/+3
\| \| \| \|
\| \| * \|	Merge pull request #23 from matrix-org/media_repository	Erik Johnston	2014-12-11	24	-17/+1320
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Media repository
\| \| \| * \|	Allow only one download for a given image at a time, so that we don't end up ↵	Mark Haines	2014-12-11	3	-20/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	downloading the same image twice if two clients request a remote image at the same time
\| \| \| * \|	Limit the size of images that are thumbnailed serverside. Limit the size of ↵	Mark Haines	2014-12-11	4	-6/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	file that a server will download from a remote server
\| \| \| * \|	doc the thumbnail methods	Mark Haines	2014-12-11	1	-2/+11
\| \| \| \| \|
\| \| \| * \|	Make sure we pass a tuple to string '%' formatting	Mark Haines	2014-12-11	1	-2/+2
\| \| \| \| \|
\| \| \| * \|	Merge branch 'develop' into media_repository	Mark Haines	2014-12-10	16	-27/+313
\| \| \| \|\ \
\| \| \| * \| \|	update media repository implementation docs	Mark Haines	2014-12-10	1	-4/+9
\| \| \| \| \| \|
\| \| \| * \| \|	Merge branch 'develop' into media_repository	Mark Haines	2014-12-10	42	-224/+6628
\| \| \| \|\ \ \
\| \| \| * \| \| \|	import Image as PIL.Image.	Mark Haines	2014-12-10	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Get the code actually working	Mark Haines	2014-12-10	6	-52/+61
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Thumbnail uploaded and cached images	Mark Haines	2014-12-10	7	-175/+587
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add a method field to thumbnail storage	Mark Haines	2014-12-05	2	-7/+12
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add pillow to dependencies	Mark Haines	2014-12-05	1	-0/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add a class for generating thumbnails using PIL	Mark Haines	2014-12-05	1	-0/+78
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Implement download support for media_repository	Mark Haines	2014-12-04	5	-12/+278
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Fix pyflakes and pep8 warnings	Mark Haines	2014-12-02	3	-3/+4
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Get uploads working with new media repo	Mark Haines	2014-12-02	14	-29/+56
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Write the upload portion of version 1 of the media repository	Mark Haines	2014-12-02	8	-7/+451
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge remote-tracking branch 'origin' into typing_notifications	Paul "LeoNerd" Evans	2014-12-11	0	-0/+0
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse v0.5.4	Erik Johnston	2014-12-03	25	-8/+6089
\| \|\ \ \ \ \ \
* \| \| \| \| \| \| \|	When users leave rooms mark them as no longer typing in them	Paul "LeoNerd" Evans	2014-12-11	1	-0/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add a 'user_left_room' distributor signal analogous to 'user_joined_room'	Paul "LeoNerd" Evans	2014-12-11	2	-3/+48
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Actually auth-check to ensure people can only send typing notifications for ↵	Paul "LeoNerd" Evans	2014-12-11	2	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rooms they're actually in
* \| \| \| \| \| \| \|	Add a sprinkling of logger.debug() into typing notification handler	Paul "LeoNerd" Evans	2014-12-11	1	-0/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Move typing-notification REST tests into their own .py file	Paul "LeoNerd" Evans	2014-12-11	2	-83/+113
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Actually unit-test the event stream around REST typing tests	Paul "LeoNerd" Evans	2014-12-11	1	-0/+14
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Initial hack at unit tests of room typing REST API	Paul "LeoNerd" Evans	2014-12-11	2	-3/+75
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Initial tiny hack at REST API for setting room typing notification status	Paul "LeoNerd" Evans	2014-12-11	1	-0/+32
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Avoid cyclic dependency in handler setup	Paul "LeoNerd" Evans	2014-12-10	1	-4/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Hook up the event stream to typing notifications	Paul "LeoNerd" Evans	2014-12-10	2	-2/+82
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Store serial numbers per room for typing event stream purposes	Paul "LeoNerd" Evans	2014-12-10	2	-43/+44
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	First hack at implementing timeouts in typing notification handler	Paul "LeoNerd" Evans	2014-12-10	2	-6/+52
\| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Implement .cancel_call_later() in MockClock	Paul "LeoNerd" Evans	2014-12-10	2	-2/+23
\| \| \| \| \| \|
* \| \| \| \| \|	Implement .call_later() in MockClock	Paul "LeoNerd" Evans	2014-12-10	2	-0/+48
\| \| \| \| \| \|
* \| \| \| \| \|	Trivial test of MockClock()	Paul "LeoNerd" Evans	2014-12-10	1	-0/+30
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	oops	Matthew Hodgson	2014-12-10	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	update codestyle based on debate on #matrix-dev	Matthew Hodgson	2014-12-10	1	-3/+34
\| \| \| \| \|
* \| \| \| \|	Merge pull request #22 from matrix-org/federation_retries	Erik Johnston	2014-12-10	14	-24/+277
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Federation retries
\| * \| \| \| \|	turn back on per-request transaction retries, so that every time we try to ↵	Matthew Hodgson	2014-12-10	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hit a dead server we actually end up hammering 5 times :\|
\| * \| \| \| \|	Add newline back in	Erik Johnston	2014-12-10	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove whitespace	Erik Johnston	2014-12-10	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Code style.	Erik Johnston	2014-12-10	3	-46/+85
\| \| \| \| \| \|
\| * \| \| \| \|	plateau retries after 1h	Matthew Hodgson	2014-12-10	1	-3/+6
\| \| \| \| \| \|
\| * \| \| \| \|	add errbacks to enqueue_pdu deferreds; change logging for failed federation ↵	Matthew Hodgson	2014-12-10	2	-8/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sends to warn rather than exception
\| * \| \| \| \|	squidge to 79 columns as per pep8	Matthew Hodgson	2014-12-10	3	-19/+36
\| \| \| \| \| \|
\| * \| \| \| \|	fix UTs by telling all the mock stores about the new methods for tracking ↵	Matthew Hodgson	2014-12-09	4	-3/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	retries
\| * \| \| \| \|	Merge branch 'develop' into federation_retries	Matthew Hodgson	2014-12-08	2	-1/+3
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Ignore pycharm dir	Erik Johnston	2014-12-08	1	-0/+2
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	point the entry_point for synapse-homeserver at the right method	Mark Haines	2014-12-05	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	fix a million stupid bugs and make it actually work	Matthew Hodgson	2014-12-08	3	-20/+33
\| \| \| \| \|
\| * \| \| \|	add a write-through cache on the retry schedule	Matthew Hodgson	2014-12-08	1	-4/+15
\| \| \| \| \|
\| * \| \| \|	actually reset retry schedule if we can successfuly talk to it	Matthew Hodgson	2014-12-08	2	-0/+9
\| \| \| \| \|
\| * \| \| \|	fix stupid syntax thinkos	Matthew Hodgson	2014-12-07	2	-13/+12
\| \| \| \| \|
\| * \| \| \|	track replication destination health, and perform exponential back-off when ↵	Matthew Hodgson	2014-12-07	9	-18/+156
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	sending transactions. does not yet retry transactions, but drops them on the floor if waiting for a server to recover.
* \| \| \|	Pull in latest matrix-angular_sdk	Erik Johnston	2014-12-05	1	-2/+2
\| \| \| \|
* \| \| \|	Pull in latest matrix-angular_sdk	Erik Johnston	2014-12-05	1	-2/+2
\| \| \| \|
* \| \| \|	@log_function on PresenceStream's get_new_events_for_user()	Paul "LeoNerd" Evans	2014-12-03	1	-1/+3
\| \| \| \|
* \| \| \|	Store any incoming presence push in the local cache anyway, even if there's ↵	Paul "LeoNerd" Evans	2014-12-03	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	no interested observers (yet hint) (SYN-115)
* \| \| \|	Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse into develop	Erik Johnston	2014-12-03	3	-2/+10
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Bump changes and version	Erik Johnston	2014-12-03	3	-2/+10
\|/ / /
* \| \|	Fix bug where did not always resolve all the deferreds in ↵	Erik Johnston	2014-12-03	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \|	_attempt_new_transaction
* \| \|	Don't log synapse.storage at DEBUG level when under -v; require -v -v for that	Paul "LeoNerd" Evans	2014-12-02	1	-0/+6
\| \| \|
* \| \|	Workaround for non-uniqueness of room member events in the database ↵	Paul "LeoNerd" Evans	2014-12-02	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|	confusing HAVING COUNT() test of room membership intersection (with thanks to Tom Molesworth)
* \| \|	Extra verbosity on logging of received presence info	Paul "LeoNerd" Evans	2014-12-02	1	-0/+5
\| \| \|
* \| \|	Squash room_ids list to a set() to remove duplicates - with TODO marker as I ↵	Paul "LeoNerd" Evans	2014-12-02	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \|	have no idea /why/ the dups are happening in the first place
* \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into develop	Paul "LeoNerd" Evans	2014-12-02	0	-0/+0
\|\ \ \
\| * \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2014-12-02	3	-2/+9
\| \|\\| \|
\| * \| \|	Merge branch 'master' into develop	Mark Haines	2014-12-02	1	-2/+5
\| \|\ \ \
\| * \| \| \|	Remove editor junk	Paul "LeoNerd" Evans	2014-12-02	1	-0/+0
\| \| \| \| \|
\| * \| \| \|	Add non-working jitsi meet bridge	David Baker	2014-12-02	10	-0/+5488
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2014-12-02	1	-1/+2
\| \|\ \ \ \
\| * \| \| \| \|	re-add OSX troubleshooting instructions (not sure how they got lost)	Matthew Hodgson	2014-11-30	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	fix IO::Async abuse - thanks leo	Matthew Hodgson	2014-11-28	1	-9/+11
\| \| \| \| \| \|
\| * \| \| \| \|	ignore rogue matrix call events; support verto.media RPC as a horrible hack; ↵	Matthew Hodgson	2014-11-28	3	-21/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix NA::Matrix dep
\| * \| \| \| \|	clean up a vertobot a bit	Matthew Hodgson	2014-11-28	2	-5/+0
\| \| \| \| \| \|
\| * \| \| \| \|	a simple matrix->verto bot, distantly related to the irc bridge	Matthew Hodgson	2014-11-28	5	-0/+546
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2014-11-27	3	-3/+3
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'release-v0.5.3' of github.com:matrix-org/synapse into develop	Erik Johnston	2014-11-27	3	-2/+10
\| \|\ \ \ \ \ \
* \| \| \| \| \| \| \|	Allow GET /room/:room_id/messages without 'limit' parameter to default to 10	Paul "LeoNerd" Evans	2014-12-02	2	-2/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Remove editor junk	Paul "LeoNerd" Evans	2014-12-02	1	-0/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add non-working jitsi meet bridge	David Baker	2014-12-02	10	-0/+5488
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	re-add OSX troubleshooting instructions (not sure how they got lost)	Matthew Hodgson	2014-12-02	1	-0/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	fix IO::Async abuse - thanks leo	Matthew Hodgson	2014-12-02	1	-9/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	ignore rogue matrix call events; support verto.media RPC as a horrible hack; ↵	Matthew Hodgson	2014-12-02	3	-21/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix NA::Matrix dep
* \| \| \| \| \| \| \|	clean up a vertobot a bit	Matthew Hodgson	2014-12-02	2	-5/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	a simple matrix->verto bot, distantly related to the irc bridge	Matthew Hodgson	2014-12-02	5	-0/+546
\| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Bump version v0.5.3c	Erik Johnston	2014-12-02	3	-2/+9
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	SYN-187: Set a more sensible default for the content_addr v0.5.3b	Mark Haines	2014-12-02	1	-2/+5
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #21 from tjardick/master	Erik Johnston	2014-12-02	1	-1/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Added the needed libssl-dev package
\| * \| \| \|	Added the needed libssl-dev package	Tjardick van der Kraan	2014-12-02	1	-1/+2
\|/ / / /
* \| \| \|	Bump version v0.5.3a	Erik Johnston	2014-11-27	2	-2/+2
\| \| \| \|
* \| \| \|	Bump pinned version of pynacl pulled from github	Erik Johnston	2014-11-27	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'release-v0.5.3' of github.com:matrix-org/synapse v0.5.3	Erik Johnston	2014-11-27	9	-66/+190
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Bump version and changelog	Erik Johnston	2014-11-27	3	-2/+10
\| \|/ /
\| * \|	Don't return outliers when we get recent events for rooms.	Erik Johnston	2014-11-27	1	-1/+1
\| \| \|
\| * \|	Fix bugs when joining a remote room that has dodgy event graphs. This should ↵	Erik Johnston	2014-11-27	3	-31/+68
\| \| \| \| \| \| \| \| \| \| \| \|	also fix the number of times a HS will trigger a GET /event/
\| * \|	on_receive_pdu takes more args	Erik Johnston	2014-11-27	1	-3/+3
\| \| \|
\| * \|	Change the way we get missing auth and state events	Erik Johnston	2014-11-27	2	-44/+106
\| \| \|
\| * \|	Re-sign events when we return them via federation as a temporary hack to ↵	Erik Johnston	2014-11-27	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \|	work around the problem where we reconstruct events differently than when they were signed
\| * \|	Attempt to fix bug where we 500d an event stream due to trying to cancel a ↵	Erik Johnston	2014-11-26	1	-3/+9
\|/ / \| \| \| \| \| \|	timer twice
* \|	Add a workaround for bug where some initial join events don't reference ↵	Erik Johnston	2014-11-26	1	-1/+7
\| \| \| \| \| \| \| \|	creation events in their auth_events
* \|	Catch exceptions when trying to add an entry to rooms tables	Erik Johnston	2014-11-26	1	-6/+11
\| \|
* \|	Spelling	Erik Johnston	2014-11-26	1	-1/+1
\| \|
* \|	Bump version and changelog v0.5.2	Erik Johnston	2014-11-26	3	-2/+7
\| \|
* \|	Merge branch 'develop' of github.com:matrix-org/synapse	Erik Johnston	2014-11-26	1	-1/+4
\|\ \
\| * \|	Don't delete the entire current_state_events table	Erik Johnston	2014-11-26	1	-1/+4
\| \| \|
\| * \|	Merge branch 'release-v0.5.1' of github.com:matrix-org/synapse into develop	Erik Johnston	2014-11-26	4	-4/+12
\| \|\ \
* \| \ \	Merge branch 'release-v0.5.1' of github.com:matrix-org/synapse v0.5.1	Erik Johnston	2014-11-26	57	-731/+1036
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Bump version numbers and change log	Erik Johnston	2014-11-26	4	-4/+12
\| \|/ /
\| * \|	Use correct default port in scripts/check_signature.py	Erik Johnston	2014-11-26	1	-1/+1
\| \| \|
\| * \|	Add update delta for schema change	Erik Johnston	2014-11-26	2	-1/+35
\| \| \|
\| * \|	Update schema to support multiple signatures	Erik Johnston	2014-11-26	1	-1/+1
\| \| \|
\| * \|	Fix tests.	Erik Johnston	2014-11-26	1	-1/+1
\| \| \|
\| * \|	Correctly handle the case where we get an event for an unknown room, which ↵	Erik Johnston	2014-11-26	5	-47/+99
\| \| \| \| \| \| \| \| \| \| \| \|	turns out we are actually in
\| * \|	upgrade script depends on sqlite3 cli	Matthew Hodgson	2014-11-26	1	-1/+1
\| \| \|
\| * \|	Fix bugs in invite/join dances.	Erik Johnston	2014-11-25	8	-142/+215
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We now do more implement more of the auth on the events so that we don't reject valid events.
\| * \|	Don't double url-decode state event types.	Kegan Dougal	2014-11-25	1	-1/+1
\| \|/
\| *	Drop log level for incorrect logging contexts to WARN if the context is ↵	Mark Haines	2014-11-25	1	-5/+8
\| \| \| \| \| \| \| \|	wrong and DEBUG if the context is missing
\| *	pip uninstall syweb	Matthew Hodgson	2014-11-24	1	-0/+9
\| \|
\| *	Mark the auth events as possible outlier	Erik Johnston	2014-11-24	1	-0/+1
\| \|
\| *	Add missing None check	Erik Johnston	2014-11-24	1	-1/+1
\| \|
\| *	Ask for any auth events that we don't have	Erik Johnston	2014-11-24	1	-0/+15
\| \|
\| *	We don't always want to Auth get_persisted_pdu	Erik Johnston	2014-11-24	2	-11/+20
\| \|
\| *	SYN-163: Add an order by rowid to selects.	Erik Johnston	2014-11-24	2	-9/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should fix the bug where the edges of the graph get returned in a different order than they were inserted in, and so no get_event no longer returned the exact same JSON as was inserted. This meant that signature checks failed.
\| *	typos	Matthew Hodgson	2014-11-24	1	-2/+2
\| \|
\| *	rst bugs	Matthew Hodgson	2014-11-24	1	-5/+5
\| \|
\| *	Return 404 M_NOT_FOUND when trying to look up a room alias that doesn't exist	Mark Haines	2014-11-21	1	-12/+24
\| \|
\| *	SYN-58: Allow passing explicit limit=0 to initialSync to request no messages ↵	Paul "LeoNerd" Evans	2014-11-20	2	-7/+7
\| \| \| \| \| \| \| \|	at all; missing still implies default 10
\| *	Fix pep8 and pyflakes warnings	Mark Haines	2014-11-20	6	-12/+21
\| \|
\| *	Merge pull request #20 from matrix-org/http_client_refactor	Mark Haines	2014-11-20	8	-355/+373
\| \|\ \| \| \| \| \| \|	Http client refactor
\| \| *	Merge branch 'develop' into http_client_refactor	David Baker	2014-11-20	35	-140/+193
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	Fix pep8 codestyle warnings	Mark Haines	2014-11-20	21	-47/+71
\| \| \|
\| * \|	Use module loggers rather than the root logger. Exceptions caused by bad ↵	Mark Haines	2014-11-20	8	-10/+17
\| \| \| \| \| \| \| \| \| \| \| \|	clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str'
\| * \|	Add a few missing yields, Move deferred lists inside PreserveLoggingContext ↵	Mark Haines	2014-11-20	15	-85/+107
\| \| \| \| \| \| \| \| \| \| \| \|	because they don't interact well with the logging contexts
\| \| *	Separate out the matrix http client completely because just about all of its ↵	David Baker	2014-11-20	8	-337/+361
\| \| \| \| \| \| \| \| \| \| \| \|	code it now separate from the simple case we need for standard HTTP(S)
\| \| *	Oops, I removed this param.	David Baker	2014-11-20	1	-2/+0
\| \| \|
\| \| *	Refactor the HTTP clients a little.	David Baker	2014-11-20	4	-86/+82
\| \| \|
\| \| *	CaptchaServerHttpClient should extend the base, not matrix http client.	David Baker	2014-11-20	1	-1/+1
\| \|/
\| *	Merge branch 'master' into develop	Mark Haines	2014-11-20	1	-4/+4
\| \|\ \| \|/ \|/\|
* \|	Use tagged version of matrix-angular-sdk	Mark Haines	2014-11-20	1	-4/+4
\| \|
\| *	Merge branch 'master' into develop	Mark Haines	2014-11-20	6	-3/+84
\| \|\ \| \|/ \|/\|
* \|	typoe	Matthew Hodgson	2014-11-19	1	-1/+1
\| \|
* \|	Add note about rerunning setup.py develop	Erik Johnston	2014-11-19	1	-0/+6
\| \|
* \|	Merge branch 'release-v0.5.0' of github.com:matrix-org/synapse v0.5.0	Erik Johnston	2014-11-19	202	-65738/+4981
\|\ \
\| * \	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0	Erik Johnston	2014-11-19	3	-5/+0
\| \|\ \
\| * \| \|	Bump version, changelog and upgrade.rst	Erik Johnston	2014-11-19	6	-3/+78
\| \| \| \|
* \| \| \|	Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse v0.4.2	Erik Johnston	2014-10-31	66	-284/+10511
\|\ \ \ \
\| \| \| \| *	SYN-153: Fix formatting of federation error message	Mark Haines	2014-11-20	1	-1/+1
\| \| \| \|/
\| \| \| *	Fix tests from prev commit	Erik Johnston	2014-11-19	1	-1/+0
\| \| \| \|
\| \| \| *	Don't add a 'prev' key to m.room.member messages	Erik Johnston	2014-11-19	2	-4/+0
\| \| \|/
\| \| *	Initialise UserPresenceCache instances to always contain a 'presence' key	Paul "LeoNerd" Evans	2014-11-19	2	-6/+10
\| \| \|
\| \| *	Fix backfill request	Erik Johnston	2014-11-19	1	-1/+1
\| \| \|
\| \| *	Only users can set state events which have their own user_id	Erik Johnston	2014-11-19	1	-0/+20
\| \| \|
\| \| *	Sometimes there isn't a current logging context	Mark Haines	2014-11-19	1	-1/+1
\| \| \|
\| \| *	SYN-153: Raise 404 if room alias is not found	Mark Haines	2014-11-19	1	-4/+8
\| \| \|
\| \| *	remove demo webserver since synapse serves up the webclient itself	Mark Haines	2014-11-19	1	-3/+0
\| \| \|
\| \| *	remove unused import	Mark Haines	2014-11-19	1	-1/+1
\| \| \|
\| \| *	replace user_id with sender	Mark Haines	2014-11-19	4	-2/+11
\| \| \|
\| \| *	Preserve logging context in a few more places, drop the logging context ↵	Mark Haines	2014-11-19	4	-22/+37
\| \| \| \| \| \| \| \| \| \| \| \|	after it has been stashed to reduce potential for confusion
\| \| *	SYN-141: Encode query params as UTF-8.	Mark Haines	2014-11-18	1	-1/+7
\| \| \|
\| \| *	more README fixes	Matthew Hodgson	2014-11-18	1	-1/+3
\| \| \|
\| \| *	SYN-144: Remove bad keys from pdu json objects, convert age_ts to age	Mark Haines	2014-11-18	2	-15/+29
\| \| \| \| \| \| \| \| \| \| \| \|	for all pdus sent.
\| \| *	Remember also to UTF-8 decode bytes in room alias names in directory server URLs	Paul "LeoNerd" Evans	2014-11-18	1	-3/+9
\| \| \|
\| \| *	Remember to URL decode the room_id in room initialSync	Paul "LeoNerd" Evans	2014-11-18	1	-1/+1
\| \| \|
\| \| *	SYN-141: Decode the query params as UTF-8	Mark Haines	2014-11-18	1	-1/+2
\| \| \|
\| \| *	Remove unused variable	Mark Haines	2014-11-18	1	-1/+1
\| \| \|
\| \| *	SYN-104: When going backwards the end token should be before the last event	Mark Haines	2014-11-18	1	-0/+3
\| \| \|
\| \| *	Merge pull request #17 from matrix-org/room-initial-sync	Paul Evans	2014-11-18	4	-26/+175
\| \| \|\ \| \| \| \| \| \| \| \|	Room initial sync
\| \| \| *	Ensure to parse a real pagination config object out of room initialSync ↵	Paul "LeoNerd" Evans	2014-11-18	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	request and pass it on
\| \| \| *	Rename message handler's new snapshot_room to room_initial_sync() as that ↵	Paul "LeoNerd" Evans	2014-11-18	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	better suits its purpose
\| \| \| *	Merge remote-tracking branch 'origin/develop' into room-initial-sync	Paul "LeoNerd" Evans	2014-11-18	8	-167/+209
\| \| \| \|\
\| \| \| * \|	Include room members' presence in room initialSync	Paul "LeoNerd" Evans	2014-11-18	2	-1/+36
\| \| \| \| \|
\| \| \| * \|	Added ability to .get_state() from the PresenceHandler by returning a ↵	Paul "LeoNerd" Evans	2014-11-18	1	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	complete m.presence event
\| \| \| * \|	Don't expect all _user_cachemap entries to definitely contain a ↵	Paul "LeoNerd" Evans	2014-11-18	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"last_active" key
\| \| \| * \|	Include 'messages' snapshot in room initialSync	Paul "LeoNerd" Evans	2014-11-18	2	-1/+24
\| \| \| \| \|
\| \| \| * \|	Merge branch 'develop' into room-initial-sync	Paul "LeoNerd" Evans	2014-11-17	197	-66999/+4442
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/handlers/message.py
\| \| \| * \| \|	Include room membership in room initialSync	Paul "LeoNerd" Evans	2014-11-10	2	-1/+8
\| \| \| \| \| \|
\| \| \| * \| \|	Put room state in room initialSync output - I guess this is right; I really ↵	Paul "LeoNerd" Evans	2014-11-10	2	-2/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	can't find any other tests similar...
\| \| \| * \| \|	Have room initialSync return the room's room_id	Paul "LeoNerd" Evans	2014-11-10	3	-21/+19
\| \| \| \| \| \|
\| \| \| * \| \|	Initial (empty) test that room initialSync at least returns 200 OK	Paul "LeoNerd" Evans	2014-11-10	1	-0/+53
\| \| \| \| \| \|
\| \| * \| \| \|	Revert accidental commit of bad file	Erik Johnston	2014-11-18	1	-37/+24
\| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Null check when determining default power levels	Mark Haines	2014-11-18	1	-1/+2
\| \| \| \| \|
\| \| * \| \|	SYN-149: Enable auth for events added during room creation since they should ↵	Mark Haines	2014-11-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pass auth checks
\| \| * \| \|	Fix auth to correctly handle initial creation of rooms	Erik Johnston	2014-11-18	2	-27/+58
\| \| \| \| \|
\| \| * \| \|	SYN-149: Send join event immediately after the room create event	Mark Haines	2014-11-18	3	-26/+31
\| \| \| \| \|
\| \| * \| \|	Split out sending the room alias events from creating the alias so that we ↵	Mark Haines	2014-11-18	4	-27/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	can do them in the right point when creating a room
\| \| * \| \|	warn about memory	Matthew Hodgson	2014-11-17	1	-0/+7
\| \| \| \| \|
\| \| * \| \|	update the README.rst to reflect the develop branch	Matthew Hodgson	2014-11-17	1	-73/+40
\| \| \| \| \|
\| \| * \| \|	Stop before starting when restarting	Mark Haines	2014-11-17	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	yet another installation gotcha	Matthew Hodgson	2014-11-17	1	-7/+13
\| \| \| \| \|
\| \| * \| \|	Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse into develop	Matthew Hodgson	2014-11-17	2	-9/+10
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	SYN-148: Add the alias after creating the room	Mark Haines	2014-11-17	1	-9/+9
\| \| \| \| \|
\| \| \| * \|	Mark synapse as not zip-safe since it needs to be able to read schema files ↵	Mark Haines	2014-11-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from the filesystem
\| \| * \| \|	clarify install instructions further still	Matthew Hodgson	2014-11-17	1	-17/+38
\| \| \|/ /
\| \| * \|	Remove syweb directory. pull in syweb as a dependency from github	Mark Haines	2014-11-17	92	-50658/+4
\| \| \| \|
\| \| * \|	SYWEB-152: Remove room join logic from RoomController and put it in ↵	Kegan Dougal	2014-11-17	2	-145/+101
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	eventHandlerService.joinRoom.
\| \| * \|	Add clearRooms() to wipe data when you logout.	Kegan Dougal	2014-11-17	3	-16/+29
\| \| \| \|
\| \| * \|	These lines aren't doing anything	Mark Haines	2014-11-17	1	-5/+0
\| \| \| \|
\| \| * \|	Merge pull request #14 from matrix-org/merge_pdu_event_objects	Erik Johnston	2014-11-17	10	-212/+91
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Merge pdu and event objects
\| \| \| * \	Merge remote-tracking branch 'origin/develop' into merge_pdu_event_objects	Mark Haines	2014-11-17	18	-251/+483
\| \| \| \|\ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Move getLastMessage to modelService.	Kegan Dougal	2014-11-17	5	-31/+31
\| \| \| \| \|
\| \| * \| \|	s/eventHandlerService.getUsersCountInRoom/modelService.getUserCountInRoom/g	Kegan Dougal	2014-11-17	5	-65/+61
\| \| \| \| \|
\| \| * \| \|	do not depend on external websites to host our JS - if nothing else, it ↵	Matthew Hodgson	2014-11-15	2	-6/+201
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	makes hacking on synapse when offline (e.g. on planes) a huge PITA :(
\| \| * \| \|	doc	Matthew Hodgson	2014-11-15	1	-3/+3
\| \| \| \| \|
\| \| * \| \|	merge in msg.__room_member usage to new message display template	Matthew Hodgson	2014-11-15	7	-135/+182
\| \| \| \| \|
\| \| * \| \|	improve notif setting text	Matthew Hodgson	2014-11-15	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	spell useCaptcha right...	Matthew Hodgson	2014-11-15	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	do not use captcha by default	Matthew Hodgson	2014-11-15	1	-11/+5
\| \| \| \| \|
\| \| \| * \|	Merge PDUs and Events into one object	Mark Haines	2014-11-14	10	-212/+91
\| \| \|/ /
\| \| * \|	Fix PDU and event signatures	Mark Haines	2014-11-14	4	-6/+16
\| \| \| \|
\| \| * \|	Validate signatures on incoming events	Mark Haines	2014-11-14	3	-7/+52
\| \| \| \|
\| \| * \|	Add event-stream-service unit tests.	Kegan Dougal	2014-11-14	2	-0/+84
\| \| \| \|
\| \| * \|	Unbreak tab complete...	Kegan Dougal	2014-11-14	1	-5/+6
\| \| \| \|
\| \| * \|	Add more modelService unit tests.	Kegan Dougal	2014-11-14	1	-0/+132
\| \| \| \|
\| \| * \|	Move getUserPowerLevel to modelService.	Kegan Dougal	2014-11-14	5	-71/+58
\| \| \| \|
\| \| * \|	Fix bug which caused notifications to appear for old messages.	Kegan Dougal	2014-11-14	2	-9/+9
\| \| \| \|
\| \| * \|	Tidy up room.html member list to use member again, now that scope.members is ↵	Kegan Dougal	2014-11-14	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gone.
\| \| * \|	Add extra checks to duration filter.	Kegan Dougal	2014-11-14	2	-0/+8
\| \| \| \|
\| \| * \|	Actually look for last_active_ago in the right place..	Kegan Dougal	2014-11-14	3	-70/+140
\| \| \| \|
\| \| * \|	Remove scope.members from RoomController and use modelService instead. This ↵	Kegan Dougal	2014-11-14	5	-225/+237
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	may make things unstable.
\| \| * \|	Be more helpful and tell the user how to generate a config too.	David Baker	2014-11-14	1	-1/+4
\| \| \| \|
\| \| * \|	Adding --generate-config will not help if the user has not specified a ↵	David Baker	2014-11-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config file.
\| \| * \|	Use modelService for getting current presence state rather than ↵	Kegan Dougal	2014-11-14	2	-2/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RoomController.members
\| \| * \|	Merge pull request #13 from matrix-org/request_logging	Erik Johnston	2014-11-14	10	-51/+247
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Request logging
\| \| \| * \	Merge branch 'develop' into request_logging	Mark Haines	2014-11-14	208	-19392/+8818
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py
\| \| \| * \| \|	Remove unused 'context' variables to appease pyflakes	Mark Haines	2014-10-30	1	-2/+2
\| \| \| \| \| \|
\| \| \| * \| \|	Merge branch 'develop' into request_logging	Mark Haines	2014-10-30	46	-199/+391
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/config/logger.py
\| \| \| * \| \| \|	Pep8 and a few doc strings	Mark Haines	2014-10-30	2	-17/+40
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add a request-id to each log line	Mark Haines	2014-10-30	11	-31/+205
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Use modelService to access room member power levels rather than RoomController.	Kegan Dougal	2014-11-14	3	-48/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Use mUserDisplayName filter in more places. Store power_level[norm] for each ↵	Kegan Dougal	2014-11-14	2	-17/+26
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RoomMember.
\| \| * \| \| \|	Add notification-service unit tests.	Kegan Dougal	2014-11-14	1	-0/+78
\| \| \| \| \| \|
\| \| * \| \| \|	Add mUserDisplayName unit tests.	Kegan Dougal	2014-11-14	1	-0/+141
\| \| \| \| \| \|
\| \| * \| \| \|	Unskip unit tests; fix filter dependency.	Kegan Dougal	2014-11-14	1	-12/+18
\| \| \| \| \| \|
\| \| * \| \| \|	Remove getUserDisplayName and move that logic the filter mUserDisplayName. ↵	Kegan Dougal	2014-11-13	3	-90/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update references. Skip tests for now as there are some unresolved DI issues for filters.
\| \| * \| \| \|	Remove rootScope.presence and replaced with modelService.getUser/setUser.	Kegan Dougal	2014-11-13	3	-13/+23
\| \| \| \| \| \|
\| \| * \| \| \|	SYWEB-152: Move up/down history fully to a directive.	Kegan Dougal	2014-11-13	3	-94/+101
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, there was some of it in a lovely generic directive, but the core of it was hard coded id attributes in RoomController. It's now all generic in a directive: the room history you get when you up/down arrow is determined by the value of the attribute e.g. command-history="!foo:bar" would present the history for !foo:bar. In practice, this is {{room_id}} in the html.
\| \| * \| \| \|	SYN-103: Remove "origin" and "destination" keys from edus	Mark Haines	2014-11-13	4	-14/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Migrate random bits of desktop notification logic out of roomController and ↵	Kegan Dougal	2014-11-13	2	-32/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eventHandlerService where everything else is.
\| \| * \| \| \|	remove stray unmatched css comment	David Baker	2014-11-13	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	remove now-unused styles	David Baker	2014-11-13	1	-12/+0
\| \| \| \| \| \|