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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow guests to /room/:room_id/{join,leave}	Daniel Wagner-Hall	2015-11-13	1	-3/+14
\|
*	Implementation of state rollback in /sync	Richard van der Hoff	2015-11-13	2	-4/+69
\| \| \| \| \| \| \|	Implementation of SPEC-254: roll back the state dictionary to how it looked at the start of the timeline. Merged PR https://github.com/matrix-org/synapse/pull/373
*	Fix a few race conditions in the state calculation	Richard van der Hoff	2015-11-13	2	-60/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Be a bit more careful about how we calculate the state to be returned by /sync. In a few places, it was possible for /sync to return slightly later state than that represented by the next_batch token and the timeline. In particular, the following cases were susceptible: * On a full state sync, for an active room * During a per-room incremental sync with a timeline gap * When the user has just joined a room. (Refactor check_joined_room to make it less magical) Also, use store.get_state_for_events() (and thus the existing stategroups) to calculate the state corresponding to a particular sync position, rather than state_handler.compute_event_context(), which recalculates from first principles (and tends to miss some state). Merged from PR https://github.com/matrix-org/synapse/pull/372
*	Make handlers.sync return a state dictionary, instead of an event list.	Richard van der Hoff	2015-11-13	2	-32/+40
\| \| \| \| \| \| \| \| \|	Basically this moves the process of flattening the existing dictionary into a list up to rest.client.*, instead of doing it in handlers.sync. This simplifies a bit of the code in handlers.sync, but it is also going to be somewhat beneficial in the next stage of my hacking on SPEC-254. Merged from PR #371
*	Update some comments	Richard van der Hoff	2015-11-13	4	-14/+98
\| \| \| \| \| \| \|	Add a couple of type annotations, docstrings, and other comments, in the interest of keeping track of what types I have. Merged from pull request #370.
*	Merge pull request #369 from matrix-org/daniel/guestnonevents	Daniel Wagner-Hall	2015-11-12	2	-3/+20
\|\ \| \| \| \|	Return non-room events from guest /events calls
\| *	Return non-room events from guest /events calls	Daniel Wagner-Hall	2015-11-12	2	-3/+20
\| \|
* \|	Merge pull request #368 from matrix-org/erikj/fix_federation_profile	Erik Johnston	2015-11-12	3	-6/+13
\|\ \ \| \| \| \| \| \|	Fix missing profile data in federation joins
\| * \|	Fix missing profile data in federation joins	Erik Johnston	2015-11-12	3	-6/+13
\| \|/ \| \| \| \| \| \| \| \|	There was a regression where we stopped including profile data in initial joins for rooms joined over federation.
* \|	Merge pull request #366 from matrix-org/erikj/search_fix_sqlite_faster	Erik Johnston	2015-11-12	1	-3/+14
\|\ \ \| \|/ \|/\|	Use a (hopefully) more efficient SQL query for doing recency based room search
\| *	Trailing whitespace	Erik Johnston	2015-11-12	1	-1/+1
\| \|
\| *	Expand comment	Erik Johnston	2015-11-12	1	-0/+6
\| \|
\| *	Comment	Erik Johnston	2015-11-12	1	-0/+2
\| \|
\| *	Fix SQL syntax	Erik Johnston	2015-11-12	1	-2/+3
\| \|
\| *	Use a (hopefully) more efficient SQL query for doing recency based room search	Erik Johnston	2015-11-12	1	-4/+6
\| \|
* \|	Fix an issue with ignoring power_level changes on divergent graphs	Richard van der Hoff	2015-11-12	2	-5/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes to m.room.power_levels events are supposed to be handled at a high priority; however a typo meant that the relevant bit of code was never executed, so they were handled just like any other state change - which meant that a bad person could cause room state changes by forking the graph from a point in history when they were allowed to do so.
* \|	Merge pull request #367 from matrix-org/daniel/readafterleave	Daniel Wagner-Hall	2015-11-12	1	-10/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #367 from matrix-org/daniel/readafterleave Tweak guest access permissions
\| * \|	Tweak guest access permissions	Daniel Wagner-Hall	2015-11-12	1	-10/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Allow world_readable rooms to be read by guests who have joined and left * Allow regular users to access world_readable rooms
* \| \|	Merge pull request #360 from matrix-org/daniel/guestroominitialsync	Daniel Wagner-Hall	2015-11-12	2	-24/+34
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Merge pull request #360 from matrix-org/daniel/guestroominitialsync Allow guest access to room initialSync
\| * \|	Allow guest access to room initialSync	Daniel Wagner-Hall	2015-11-11	2	-24/+34
\| \| \|
* \| \|	Fix bug where assumed dict was namedtuple	Erik Johnston	2015-11-12	1	-1/+1
\| \|/ \|/\|
* \|	Merge pull request #364 from matrix-org/daniel/guestdisplaynames	Daniel Wagner-Hall	2015-11-12	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow guests to set their display names Depends: https://github.com/matrix-org/synapse/pull/363 Tests in https://github.com/matrix-org/sytest/pull/66
\| * \|	Allow guests to set their display names	Daniel Wagner-Hall	2015-11-12	1	-1/+1
\|/ / \| \| \| \| \| \| \| \|	Depends: https://github.com/matrix-org/synapse/pull/363 Tests in https://github.com/matrix-org/sytest/pull/66
* \|	Merge pull request #363 from matrix-org/daniel/guestscanjoin	Daniel Wagner-Hall	2015-11-12	1	-12/+21
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Consider joined guest users as joined users Otherwise they're inconveniently allowed to write events to the room but not to read them from the room.
\| * \|	Consider joined guest users as joined users	Daniel Wagner-Hall	2015-11-12	1	-12/+21
\|/ / \| \| \| \| \| \| \| \|	Otherwise they're inconveniently allowed to write events to the room but not to read them from the room.
* \|	Merge pull request #362 from matrix-org/daniel/raceyraceyfunfun	Daniel Wagner-Hall	2015-11-12	1	-1/+5
\|\ \ \| \| \| \| \| \|	Fix race creating directories
\| * \|	Fix race creating directories	Daniel Wagner-Hall	2015-11-12	1	-1/+5
\|/ /
* \|	Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-11-11	2	-1/+17
\|\ \
\| * \|	Update date v0.11.0-rc1	Erik Johnston	2015-11-11	1	-1/+1
\| \| \|
\| * \|	Update CHANGES	Erik Johnston	2015-11-11	1	-1/+1
\| \| \|
\| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0	Erik Johnston	2015-11-11	2	-5/+11
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	Merge pull request #361 from matrix-org/daniel/guestcontext	Erik Johnston	2015-11-11	2	-5/+11
\|\ \ \ \| \| \| \| \| \| \| \|	Allow guests to access room context API
\| * \| \|	Allow guests to access room context API	Daniel Wagner-Hall	2015-11-11	2	-5/+11
\| \| \|/ \| \|/\|
\| \| *	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0	Erik Johnston	2015-11-11	24	-141/+738
\| \| \|\ \| \|_\|/ \|/\| \|
* \| \|	Merge pull request #359 from matrix-org/markjh/incremental_indexing	Erik Johnston	2015-11-11	8	-77/+492
\|\ \ \ \| \|/ / \|/\| \|	Incremental background updates for db indexes
\| * \|	Fix param style to work on both sqlite and postgres	Mark Haines	2015-11-11	1	-2/+6
\| \| \|
\| * \|	Fix the background update	Mark Haines	2015-11-11	3	-17/+19
\| \| \|
\| * \|	Use a background task to update databases to use the full text search	Mark Haines	2015-11-10	2	-80/+28
\| \| \|
\| * \|	Test for background updates	Mark Haines	2015-11-10	2	-0/+79
\| \| \|
\| * \|	Run the background updates when starting synapse.	Mark Haines	2015-11-10	4	-10/+67
\| \| \|
\| * \|	Add background update task for reindexing event search	Mark Haines	2015-11-09	1	-2/+96
\| \| \|
\| * \|	Add storage module for tracking background updates.	Mark Haines	2015-11-09	2	-0/+231
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The progress for each background update is stored as a JSON blob in the database. Each background update is broken up into separate batches. The batch size is automatically tuned to try avoid blocking single threaded databases for too long.
* \| \|	Merge pull request #358 from matrix-org/daniel/publicwritable	Daniel Wagner-Hall	2015-11-11	4	-29/+71
\|\ \ \ \| \| \| \| \| \| \| \|	Return world_readable and guest_can_join in /publicRooms
\| * \| \|	Return world_readable and guest_can_join in /publicRooms	Daniel Wagner-Hall	2015-11-10	4	-29/+71
\|/ / /
* \| \|	Merge pull request #355 from matrix-org/daniel/anonymouswriting	Daniel Wagner-Hall	2015-11-10	7	-12/+92
\|\ \ \ \| \| \| \| \| \| \| \|	Allow guest users to join and message rooms
\| * \| \|	Allow guest users to join and message rooms	Daniel Wagner-Hall	2015-11-10	7	-12/+92
\|/ / /
* \| \|	Merge pull request #356 from matrix-org/daniel/3pidyetagain	Daniel Wagner-Hall	2015-11-10	2	-7/+4
\|\ \ \ \| \| \| \| \| \| \| \|	Get display name from identity server, not client
\| * \| \|	Get display name from identity server, not client	Daniel Wagner-Hall	2015-11-09	2	-7/+4
\| \|/ /
* \| \|	Merge pull request #357 from matrix-org/rav/SYN-516	Mark Haines	2015-11-09	1	-4/+12
\|\ \ \ \| \| \| \| \| \| \| \|	Don't fiddle with results returned by event sources
\| * \| \|	Don't fiddle with results returned by event sources	Richard van der Hoff	2015-11-09	1	-4/+12
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Overwriting hashes returned by other methods is poor form. Fixes: SYN-516
* \| \|	Add a couple of unit tests for room/<x>/messages	Richard van der Hoff	2015-11-09	2	-1/+57
\| \| \| \| \| \| \| \| \| \| \| \|	... merely because I was trying to figure out how it worked, and couldn't.
* \| \|	Merge pull request #354 from matrix-org/markjh/SYN-513	Mark Haines	2015-11-09	2	-3/+2
\|\ \ \ \| \| \| \| \| \| \| \|	SYN-513: Include updates for rooms that have had all their tags deleted
\| * \ \	Merge branch 'develop' into markjh/SYN-513	Mark Haines	2015-11-09	1	-1/+1
\| \|\ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/storage/tags.py
* \| \| \|	fix comedy important missing comma breaking recent-ordered FTS on sqlite	Matthew Hodgson	2015-11-08	1	-1/+1
\| \| \| \|
* \| \| \|	add a key existence check to tags_by_room to avoid /events 500'ing when ↵	Matthew Hodgson	2015-11-06	1	-1/+2
\| \|/ / \|/\| \| \| \| \| \| \| \|	testing against vector
\| * \|	SYN-513: Include updates for rooms that have had all their tags deleted	Mark Haines	2015-11-09	2	-2/+2
\|/ /
* \|	Merge pull request #353 from matrix-org/daniel/oops	Daniel Wagner-Hall	2015-11-06	1	-1/+0
\|\ \ \| \| \| \| \| \|	Remove accidentally added ID column
\| * \|	Remove accidentally added ID column	Daniel Wagner-Hall	2015-11-06	1	-1/+0
\|/ /
* \|	remove references to matrix.org/beta	Matthew Hodgson	2015-11-06	1	-7/+7
\| \|
\| *	Remove anonymous access, since its not ready yet	Erik Johnston	2015-11-05	1	-2/+1
\| \|
\| *	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0	Erik Johnston	2015-11-05	14	-190/+249
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #350 from matrix-org/erikj/search	Erik Johnston	2015-11-05	3	-36/+288
\|\ \ \| \| \| \| \| \|	Implement pagination, order by and groups in search
\| * \|	Be explicit about what we're doing	Erik Johnston	2015-11-05	1	-1/+1
\| \| \|
\| * \|	Remove redundant test	Erik Johnston	2015-11-05	1	-1/+0
\| \| \|
\| * \|	Increment by one, not five	Erik Johnston	2015-11-05	1	-1/+1
\| \| \|
* \| \|	Exchange 3pid invites for m.room.member invites	Daniel Wagner-Hall	2015-11-05	10	-180/+230
\| \| \|
* \| \|	Merge pull request #351 from matrix-org/daniel/fixtox	Daniel Wagner-Hall	2015-11-05	1	-3/+4
\|\ \ \ \| \| \| \| \| \| \| \|	Fix tox config after fa1cf5ef34
\| * \| \|	Fix tox config after fa1cf5ef34	Daniel Wagner-Hall	2015-11-05	1	-3/+4
\|/ / /
* \| \|	Merge pull request #340 from matrix-org/erikj/server_retries	Erik Johnston	2015-11-05	2	-4/+13
\|\ \ \ \| \| \| \| \| \| \| \|	Retry dead servers a lot less often
\| * \| \|	Retry dead servers a lot less often	Erik Johnston	2015-11-02	2	-4/+13
\| \| \| \|
\| \| \| *	Add PR	Erik Johnston	2015-11-05	1	-1/+1
\| \| \| \|
\| \| \| *	Bump changelog and version number	Erik Johnston	2015-11-05	2	-1/+18
\| \| \|/
\| \| *	COMMENTS	Erik Johnston	2015-11-05	1	-4/+26
\| \| \|
\| \| *	Error handling	Erik Johnston	2015-11-05	1	-1/+8
\| \| \|
\| \| *	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	Erik Johnston	2015-11-05	67	-491/+853
\| \| \|\ \| \|_\|/ \|/\| \|
* \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-11-05	55	-490/+572
\|\ \ \
\| * \| \|	Open up /events to anonymous users for room events only	Daniel Wagner-Hall	2015-11-05	20	-82/+299
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Squash-merge of PR #345 from daniel/anonymousevents
\| * \| \|	Merge pull request #347 from matrix-org/markjh/check_filter	Mark Haines	2015-11-05	1	-18/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Remove fields that are both unspecified and unused from the filter checks
\| \| * \| \|	Remove fields that are both unspecified and unused from the filter checks, ↵	Mark Haines	2015-11-04	1	-18/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	check the right top level definitions in the filter
\| * \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into develop	Daniel Wagner-Hall	2015-11-04	12	-231/+7
\| \|\ \ \ \
\| \| * \ \ \	Merge pull request #339 from matrix-org/daniel/removesomelies	Daniel Wagner-Hall	2015-11-04	8	-42/+7
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused arguments and code
\| \| \| * \ \ \	Merge branch 'develop' into daniel/removesomelies	Mark Haines	2015-11-04	20	-270/+579
\| \| \| \|\ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/notifier.py
\| \| * \| \| \| \|	Merge pull request #346 from matrix-org/markjh/remove_lock_manager	Mark Haines	2015-11-04	4	-189/+0
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \|	Remove the LockManager class because it wasn't being used
\| \| \| * \| \| \|	Remove the LockManager class because it wasn't being used	Mark Haines	2015-11-04	4	-189/+0
\| \| \|/ / / /
\| \| \| * \| \|	Remove more unused parameters	Daniel Wagner-Hall	2015-11-02	6	-13/+2
\| \| \| \| \| \|
\| \| \| * \| \|	Remove unused arguments and code	Daniel Wagner-Hall	2015-11-02	3	-29/+5
\| \| \| \|/ /
\| * \| / /	Allow guests to register and call /events?room_id=	Daniel Wagner-Hall	2015-11-04	33	-167/+272
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices.
* \| \| \|	Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-11-05	12	-1/+281
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-10-26	0	-0/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	release-v0.10.1
\| \| * \ \	Merge pull request #330 from matrix-org/erikj/login_fallback	Erik Johnston	2015-10-26	5	-0/+280
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add login fallback
\| \| * \ \ \	Merge pull request #329 from matrix-org/erikj/static	Erik Johnston	2015-10-26	7	-1/+3
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move static folder into synapse
\| * \| \| \| \| \|	Use correct service url	Erik Johnston	2015-10-26	1	-3/+1
\| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Add login fallback	Erik Johnston	2015-10-26	5	-0/+280
\| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Move static folder into synapse	Erik Johnston	2015-10-26	7	-1/+3
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is because otherwise it won't get picked up by python packaging. This also fixes the problem where the "static" folder was found if synapse wasn't started from that directory.
\| \| \| *	Implement basic pagination for search results	Erik Johnston	2015-11-05	3	-50/+86
\| \| \| \|
\| \| \| *	Implement order and group by	Erik Johnston	2015-11-04	2	-17/+205
\| \|_\|/ \|/\| \|
* \| \|	Merge pull request #341 from matrix-org/markjh/v2_sync_receipts	Mark Haines	2015-11-03	1	-15/+30
\|\ \ \ \| \| \| \| \| \| \| \|	Include read receipts in v2 sync
\| * \ \	Merge branch 'develop' into markjh/v2_sync_receipts	Mark Haines	2015-11-03	14	-25/+524
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/handlers/sync.py
\| * \| \| \|	Include read receipts in v2 sync	Mark Haines	2015-11-02	1	-15/+30
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #343 from matrix-org/erikj/fix_retries	Erik Johnston	2015-11-03	2	-46/+30
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Fix broken cache for getting retry times.
\| * \| \|	Don't rearrange transaction_queue	Erik Johnston	2015-11-03	1	-12/+11
\| \| \| \|
\| * \| \|	Fix broken cache for getting retry times. This meant we retried remote ↵	Erik Johnston	2015-11-03	2	-55/+40
\| \|/ / \| \| \| \| \| \| \| \| \|	destinations way more frequently than we should
* \| \|	Merge pull request #335 from matrix-org/markjh/room_tags	Mark Haines	2015-11-03	14	-26/+525
\|\ \ \ \| \|/ / \|/\| \|	Add APIs for adding and removing tags from rooms
\| * \|	That TODO was done	Mark Haines	2015-11-03	1	-1/+0
\| \| \|
\| * \|	Spell "deferred" more correctly	Mark Haines	2015-11-03	1	-1/+1
\| \| \|
\| * \|	Include room tags in v2 /sync	Mark Haines	2015-11-02	3	-11/+70
\| \| \|
\| * \|	Store room tag content and return the content in the m.tag event	Mark Haines	2015-11-02	4	-22/+41
\| \| \|
\| * \|	Merge branch 'develop' into markjh/room_tags	Mark Haines	2015-11-02	11	-30/+339
\| \|\ \
\| * \| \|	Support clients supplying older tokens, fix short poll test	Mark Haines	2015-10-30	2	-3/+3
\| \| \| \|
\| * \| \|	Include tags in v1 room initial sync	Mark Haines	2015-10-30	1	-0/+11
\| \| \| \|
\| * \| \|	Include room tags v1 /initialSync	Mark Haines	2015-10-30	1	-0/+12
\| \| \| \|
\| * \| \|	Inform the client of new room tags using v1 /events	Mark Haines	2015-10-29	6	-14/+91
\| \| \| \|
\| * \| \|	Fix pyflakes errors	Mark Haines	2015-10-28	2	-3/+5
\| \| \| \|
\| * \| \|	Add APIs for adding and removing tags from rooms	Mark Haines	2015-10-28	5	-0/+320
\| \| \| \|
* \| \| \|	Merge pull request #338 from matrix-org/daniel/fixdb	Erik Johnston	2015-11-02	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Add missing column
\| * \| \|	Add missing column	Daniel Wagner-Hall	2015-10-30	1	-1/+1
\|/ / /
* \| \|	Merge pull request #337 from matrix-org/markjh/v2_sync_joining	Mark Haines	2015-10-30	3	-5/+9
\|\ \ \ \| \| \| \| \| \| \| \|	Don't mark newly joined room timelines as limited in an incremental sync
\| * \| \|	Update the other place check_joined_room is called	Mark Haines	2015-10-30	3	-2/+4
\| \| \| \|
\| * \| \|	Don't mark newly joined room timelines as limited in an incremental sync	Mark Haines	2015-10-29	1	-3/+5
\|/ / /
* \| \|	Make search API honour limit set in filter	Erik Johnston	2015-10-29	1	-0/+3
\| \| \|
* \| \|	Merge pull request #336 from matrix-org/erikj/search	Erik Johnston	2015-10-28	1	-1/+52
\|\ \ \ \| \| \| \| \| \| \| \|	Optionally return event contexts with search results
\| * \| \|	Optionally return event contexts with search results	Erik Johnston	2015-10-28	1	-1/+52
\| \| \| \|
\| * \| \|	Merge branch 'erikj/context_api' into erikj/search	Erik Johnston	2015-10-28	17	-21/+354
\| \|\ \ \
* \| \ \ \	Merge pull request #334 from matrix-org/erikj/context_api	Erik Johnston	2015-10-28	4	-2/+229
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Add room context api
\| * \| \| \|	Docs	Erik Johnston	2015-10-28	2	-0/+39
\| \| \| \| \|
\| * \| \| \|	Add room context api	Erik Johnston	2015-10-28	4	-2/+190
\| \| \| \| \|
* \| \| \| \|	Merge pull request #332 from matrix-org/rav/full_state_sync	Richard van der Hoff	2015-10-28	2	-19/+38
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Implement full_state incremental sync
\| * \| \| \|	Implement full_state incremental sync	Richard van der Hoff	2015-10-26	2	-19/+38
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A hopefully-complete implementation of the full_state incremental sync, as specced at https://github.com/matrix-org/matrix-doc/pull/133. This actually turns out to be a relatively simple modification to the initial sync implementation.
* \| \| \|	Merge pull request #331 from matrix-org/rav/500_on_missing_sigil	Richard van der Hoff	2015-10-27	2	-3/+8
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Fix a 500 error resulting from empty room_ids
\| * \| \|	Fix a 500 error resulting from empty room_ids	Richard van der Hoff	2015-10-26	2	-3/+8
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	POST /_matrix/client/api/v1/rooms//send/a.b.c gave a 500 error, because we assumed that rooms always had at least one character.
* \| \|	Merge pull request #328 from matrix-org/erikj/search	Erik Johnston	2015-10-26	1	-14/+17
\|\\| \| \| \| \| \| \| \|	Pull out sender when computing search results
\| * \|	Pull out sender when computing search results	Erik Johnston	2015-10-23	1	-14/+17
\| \| \|
* \| \|	Merge pull request #327 from matrix-org/erikj/search	Erik Johnston	2015-10-23	3	-2/+30
\|\\| \| \| \| \| \| \| \|	Implement rank function for SQLite FTS
\| * \|	Implement rank function for SQLite FTS	Erik Johnston	2015-10-23	3	-2/+30
\| \| \|
* \| \|	Merge pull request #323 from matrix-org/daniel/sizelimits	Daniel Wagner-Hall	2015-10-23	2	-1/+30
\|\ \ \ \| \| \| \| \| \| \| \|	Reject events which are too large
\| * \| \|	Reject events which are too large	Daniel Wagner-Hall	2015-10-22	2	-1/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SPEC-222
* \| \| \|	Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-10-23	8	-12/+65
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Fix receipts for room initial sync	Erik Johnston	2015-10-22	1	-7/+1
\| \| \| \|
\| * \| \|	Merge pull request #322 from matrix-org/erikj/password_config	Erik Johnston	2015-10-22	5	-4/+46
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Add config option to disable password login
\| \| * \| \|	Add config option to disable password login	Erik Johnston	2015-10-22	5	-4/+46
\| \|/ / /
\| * \| \|	Reorder changelog v0.10.1-rc1	Erik Johnston	2015-10-16	1	-6/+7
\| \| \| \|
\| * \| \|	Update change log	Erik Johnston	2015-10-15	1	-0/+16
\| \| \| \|
\| * \| \|	Bump version	Erik Johnston	2015-10-15	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #325 from matrix-org/markjh/filter_dicts	Mark Haines	2015-10-22	1	-3/+22
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Support filtering events represented as dicts.
\| * \| \| \|	Don't assume that the event has a room_id or sender	Mark Haines	2015-10-22	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Support filtering events represented as dicts.	Mark Haines	2015-10-22	1	-3/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is useful because the emphemeral events such as presence and typing are represented as dicts inside synapse.
* \| \| \| \|	Merge pull request #324 from matrix-org/erikj/search	Erik Johnston	2015-10-22	5	-16/+61
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| / \| \| \|_\|/ \| \|/\| \|	Add filters to search.
\| * \| \|	Actually filter results	Erik Johnston	2015-10-22	1	-3/+5
\| \| \| \|
\| * \| \|	Rename	Erik Johnston	2015-10-22	1	-3/+3
\| \| \| \|
\| * \| \|	LESS THAN	Erik Johnston	2015-10-22	1	-1/+2
\| \| \| \|
\| * \| \|	Use namedtuple as return value	Erik Johnston	2015-10-22	2	-4/+18
\| \| \| \|
\| * \| \|	Limit max number of SQL vars	Erik Johnston	2015-10-22	1	-4/+6
\| \| \| \|
\| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	Erik Johnston	2015-10-22	0	-0/+0
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #319 from matrix-org/erikj/filter_refactor	Erik Johnston	2015-10-22	3	-125/+92
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Refactor api.filtering to have a Filter API
\| \| * \ \	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	Erik Johnston	2015-10-22	8	-27/+329
\| \| \|\ \ \ \| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #320 from matrix-org/appservice-retry-cap	Erik Johnston	2015-10-22	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Cap the time to retry txns to appservices to 8.5 minutes
\| * \| \| \| \|	Cap the time to retry txns to appservices to 8.5 minutes	Kegan Dougal	2015-10-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's been numerous issues with people playing around with their application service and then not receiving events from their HS for ages due to backoff timers reaching crazy heights (albeit capped at < 1 day). Reduce the max time between pokes to be 8.5 minutes (2^9 secs) which is quick enough for people to wait it out (avg wait time being 4.25 min) but long enough to actually give the AS breathing room if it needs it.
* \| \| \| \| \|	Merge pull request #314 from matrix-org/paul/event-redaction	Mark Haines	2015-10-22	2	-0/+115
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some unit tests of prune_events()
\| * \| \| \| \| \|	Add some unit tests of prune_events()	Paul "LeoNerd" Evans	2015-10-16	2	-0/+115
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Don't keep appending report_stats to demo config	Erik Johnston	2015-10-22	1	-2/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #321 from matrix-org/markjh/v2_sync_typing	Mark Haines	2015-10-21	1	-14/+41
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include typing events in initial v2 sync
\| * \ \ \ \ \ \	Merge branch 'develop' into markjh/v2_sync_typing	Mark Haines	2015-10-21	27	-214/+1027
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/handlers/sync.py
* \| \| \| \| \| \| \|	Merge pull request #316 from matrix-org/markjh/v2_sync_archived	Mark Haines	2015-10-21	3	-9/+163
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|	Add rooms that the user has left under archived in v2 sync.
\| * \| \| \| \| \| \|	Include banned rooms in the archived section of v2 sync	Mark Haines	2015-10-21	2	-8/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix pep8	Mark Haines	2015-10-19	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add rooms that the user has left under archived in v2 sync.	Mark Haines	2015-10-19	3	-9/+161
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #318 from matrix-org/syn-502-login-bad-emails	Kegsay	2015-10-21	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't 500 on /login when the email doesn't map to a valid user ID.
\| * \| \| \| \| \| \| \|	Use 403 and message to match handlers/auth	Kegan Dougal	2015-10-21	1	-3/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Don't 500 when the email doesn't map to a valid user ID.	Kegan Dougal	2015-10-20	1	-0/+4
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
\| \| \| * \| \| \| \|	Doc string for the SyncHandler.typing_by_room method	Mark Haines	2015-10-21	1	-0/+12
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Include typing events in initial v2 sync	Mark Haines	2015-10-20	1	-14/+29
\| \| \|/ / / / /
\| \| \| \| \| * \|	PEP8	Erik Johnston	2015-10-22	1	-1/+2
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	Move FTS to delta 25	Erik Johnston	2015-10-22	2	-3/+3
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	Filter room ids before hitting the database	Erik Johnston	2015-10-21	2	-1/+21
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	Filter search results	Erik Johnston	2015-10-21	1	-2/+7
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	Merge branch 'erikj/filter_refactor' into erikj/search	Erik Johnston	2015-10-20	19	-329/+597
\| \| \| \| \| \|\ \ \| \| \| \| \| \|/ / \| \| \| \| \|/\| \|
\| \| \| \| * \| \|	Docstring	Erik Johnston	2015-10-20	1	-0/+5
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Refactor api.filtering to have a Filter API	Erik Johnston	2015-10-20	3	-126/+88
\| \|_\|_\|/ / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into develop	Daniel Wagner-Hall	2015-10-20	2	-0/+129
\|\\| \| \| \| \|
\| * \| \| \| \|	Merge pull request #315 from matrix-org/paul/test-vectors	Paul Evans	2015-10-19	2	-0/+129
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Repeatable unit test of event hashing/signing algorithm
\| \| * \| \| \| \|	Invoke EventBuilder directly instead of going via the EventBuilderFactory	Paul "LeoNerd" Evans	2015-10-19	1	-35/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Capture __init__.py	Paul "LeoNerd" Evans	2015-10-19	1	-0/+15
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Use assertIn() instead of assertTrue on the 'in' operator	Paul "LeoNerd" Evans	2015-10-19	1	-6/+6
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Another signing test vector using an 'm.room.message' with content, so that ↵	Paul "LeoNerd" Evans	2015-10-19	1	-1/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the implementation will have to redact it
\| \| * \| \| \| \|	Initial minimial hack at a test of event hashing and signing	Paul "LeoNerd" Evans	2015-10-19	1	-0/+98
\| \| \| \|/ / / \| \| \|/\| \| \|
* \| / \| \| \|	Allow rejecting invites	Daniel Wagner-Hall	2015-10-20	8	-93/+353
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is done by using the same /leave flow as you would use if you had already accepted the invite and wanted to leave.
* \| \| \| \|	Merge pull request #312 from matrix-org/daniel/3pidinvites	Daniel Wagner-Hall	2015-10-19	2	-8/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Stuff signed data in a standalone object
\| * \| \| \| \|	Stuff signed data in a standalone object	Daniel Wagner-Hall	2015-10-16	2	-8/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Makes both generating it in sydent, and verifying it here, simpler at the cost of some repetition
* \| \| \| \| \|	Merge pull request #307 from matrix-org/erikj/search	Erik Johnston	2015-10-19	10	-2/+365
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| / / \| \| \|_\|/ / \| \|/\| \| \|	Add basic search API
\| * \| \| \|	Explicitly check for Sqlite3Engine	Erik Johnston	2015-10-16	1	-2/+5
\| \| \| \| \|
\| * \| \| \|	Typing	Erik Johnston	2015-10-16	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	Erik Johnston	2015-10-16	13	-25/+393
\| \|\ \ \ \
\| * \| \| \| \|	Remove unused import	Erik Johnston	2015-10-16	1	-3/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove duplicate _filter_events_for_client	Erik Johnston	2015-10-16	1	-46/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	Erik Johnston	2015-10-16	3	-97/+51
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	Erik Johnston	2015-10-16	1	-2/+2
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Explicitly check for Sqlite3Engine	Erik Johnston	2015-10-16	1	-2/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	docstring	Erik Johnston	2015-10-16	1	-0/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add docstring	Erik Johnston	2015-10-16	1	-0/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Comment on the LIMIT 500	Erik Johnston	2015-10-16	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Split up run_upgrade	Erik Johnston	2015-10-16	1	-5/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	Erik Johnston	2015-10-15	7	-171/+294
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Remove unused constatns	Erik Johnston	2015-10-14	1	-19/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make 'keys' optional	Erik Johnston	2015-10-14	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix to work with SQLite	Erik Johnston	2015-10-14	1	-4/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	More TODO markers	Erik Johnston	2015-10-14	1	-0/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add TODO markers	Erik Johnston	2015-10-14	1	-1/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add paranoia limit	Erik Johnston	2015-10-13	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove constraints in preperation of using filters	Erik Johnston	2015-10-13	2	-71/+20
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search	Erik Johnston	2015-10-13	2	-24/+50
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'erikj/store_engine' into erikj/search	Erik Johnston	2015-10-13	6	-5/+5
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add SQLite support	Erik Johnston	2015-10-13	1	-5/+12
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'erikj/store_engine' into erikj/search	Erik Johnston	2015-10-13	9	-409/+464
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Search left rooms too	Erik Johnston	2015-10-13	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add sqlite schema	Erik Johnston	2015-10-13	1	-5/+64
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Filter events to only thsoe that the user is allowed to see	Erik Johnston	2015-10-12	2	-13/+17
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into erikj/search	Erik Johnston	2015-10-12	11	-65/+258
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Remove unused room_id parameter	Erik Johnston	2015-10-12	5	-14/+61
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	PEP8	Erik Johnston	2015-10-12	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Keep FTS indexes up to date. Only search through rooms currently joined	Erik Johnston	2015-10-12	6	-12/+55
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add basic full text search impl.	Erik Johnston	2015-10-09	8	-1/+268
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #313 from matrix-org/paul/tiny-fixes	Paul Evans	2015-10-16	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Surely we don't need to preserve 'events_default' twice
\| * \| \| \| \| \| \| \| \| \| \| \|	Surely we don't need to preserve 'events_default' twice	Paul "LeoNerd" Evans	2015-10-16	1	-1/+0
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #306 from matrix-org/markjh/unused_methods	Mark Haines	2015-10-16	2	-101/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Remove some login classes from synapse.
\| * \| \| \| \| \| \| \| \| \| \|	synapse.client.v1.login.LoginFallbackRestServlet and ↵	Mark Haines	2015-10-15	1	-30/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	synapse.client.v1.login.PasswordResetRestServlet are unused
\| * \| \| \| \| \| \| \| \| \| \|	synapse.util.emailutils was unused	Mark Haines	2015-10-15	1	-71/+0
\| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #310 from matrix-org/markjh/bcrypt_rounds	Mark Haines	2015-10-16	2	-1/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \|	Add config for how many bcrypt rounds to use for password hashes
\| * \| \| \| \| \| \| \| \| \|	Add config for how many bcrypt rounds to use for password hashes	Mark Haines	2015-10-16	2	-1/+8
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By default we leave it at the default value of 12. But now we can reduce it for preparing users for loadtests or running integration tests.
* \| \| \| \| \| \| \| \| \|	Merge pull request #311 from matrix-org/markjh/postgres_fixes	Erik Johnston	2015-10-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix FilteringStore.get_user_filter to work with postgres
\| * \| \| \| \| \| \| \| \| \|	Fix FilteringStore.get_user_filter to work with postgres	Mark Haines	2015-10-16	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #302 from matrix-org/daniel/3pidinvites	Daniel Wagner-Hall	2015-10-16	12	-24/+392
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|	Implement third party identifier invites
\| * \| \| \| \| \| \| \|	Add signing host and keyname to signatures	Daniel Wagner-Hall	2015-10-16	2	-6/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Verify third party ID server certificates	Daniel Wagner-Hall	2015-10-16	4	-9/+43
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use non-placeholder name for endpoint	Daniel Wagner-Hall	2015-10-15	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Look for keys on the right objects	Daniel Wagner-Hall	2015-10-15	3	-4/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' into daniel/3pidinvites	Daniel Wagner-Hall	2015-10-15	17	-588/+758
\| \|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use more descriptive error code	Daniel Wagner-Hall	2015-10-13	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove unnecessary class-wrapping	Daniel Wagner-Hall	2015-10-13	8	-91/+94
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move logic into handler	Daniel Wagner-Hall	2015-10-13	2	-115/+150
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add logging	Daniel Wagner-Hall	2015-10-13	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Re-add accidentally removed code	Daniel Wagner-Hall	2015-10-13	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add some docstring	Daniel Wagner-Hall	2015-10-13	1	-0/+15
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move event contents into third_party_layout field	Daniel Wagner-Hall	2015-10-13	7	-21/+35
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' into daniel/3pidinvites	Daniel Wagner-Hall	2015-10-13	11	-65/+292
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'develop' into daniel/3pidinvites	Daniel Wagner-Hall	2015-10-06	1	-1/+0
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove merge thinko	Daniel Wagner-Hall	2015-10-06	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add third party invites to auth_events for joins	Daniel Wagner-Hall	2015-10-06	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix lint errors	Daniel Wagner-Hall	2015-10-06	2	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Revert "Revert "Merge pull request #283 from ↵	Daniel Wagner-Hall	2015-10-06	1	-76/+131
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/erikj/atomic_join_federation"" This reverts commit 34d26d36874ab0bc7fa4dab0db08bd37ba4936ae.
\| * \| \| \| \| \| \| \| \|	Merge branch 'daniel/useragent' into daniel/3pidinvites	Daniel Wagner-Hall	2015-10-06	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \