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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Change the result tict to be a list	Erik Johnston	2015-12-01	1	-6/+4
\|
*	Tidy up a bit	Erik Johnston	2015-12-01	1	-8/+9
\|
*	Allow paginating search ordered by recents	Erik Johnston	2015-11-30	4	-84/+219
\|
*	Return words to highlight in search results	Erik Johnston	2015-11-27	2	-22/+120
\|
*	Merge pull request #397 from matrix-org/erikj/redaction_inequality	Erik Johnston	2015-11-26	1	-1/+1
\|\ \| \| \| \|	Allow user to redact with an equal power
\| *	Allow user to redact with an equal power	Erik Johnston	2015-11-26	1	-1/+1
\|/ \| \| \| \|	Users only need their power level to be equal to the redact level for them to be allowed to redact events.
*	Fix SQL for postgres again	Daniel Wagner-Hall	2015-11-23	1	-1/+1
\|
*	Fix SQL for postgres	Daniel Wagner-Hall	2015-11-23	1	-1/+1
\|
*	Remove size specifier for database column	Daniel Wagner-Hall	2015-11-23	1	-1/+3
\| \| \| \| \| \|	Postgres doesn't support them like this. We don't have a bool type in common between postgres and sqlite.
*	Merge pull request #375 from matrix-org/daniel/guestroominitialsync	Daniel Wagner-Hall	2015-11-23	1	-10/+15
\|\ \| \| \| \|	Clean up room initialSync for guest users
\| *	Clean up room initialSync for guest users	Daniel Wagner-Hall	2015-11-13	1	-10/+15
\| \|
* \|	Merge pull request #396 from MadsRC/develop	Matthew Hodgson	2015-11-21	2	-0/+11
\|\ \ \| \| \| \| \| \|	CentOS 7 dep instructions from MadsRC
\| * \|	Added myself to AUTHORS.rst	Mads R. Christensen	2015-11-20	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Mads Robin Christensen <mads@v42.dk>
\| * \|	Added prerequisite instructions for CentOS 7	Mads R. Christensen	2015-11-20	1	-0/+8
\|/ / \| \| \| \| \| \|	Signed-off-by: Mads Robin Christensen <mads@v42.dk>
* \|	Merge pull request #385 from matrix-org/daniel/forgetrooms	Mark Haines	2015-11-20	6	-5/+118
\|\ \ \| \| \| \| \| \|	Allow users to forget rooms
\| * \	Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into ↵	Daniel Wagner-Hall	2015-11-19	18	-87/+180
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	daniel/forgetrooms
\| \| * \	Merge branch 'develop' into daniel/forgetrooms	Paul "LeoNerd" Evans	2015-11-19	18	-87/+180
\| \| \|\ \
\| * \| \| \|	Ignore forgotten rooms in v2 sync	Daniel Wagner-Hall	2015-11-19	1	-1/+1
\| \|/ / /
\| * \| \|	Simplify code	Daniel Wagner-Hall	2015-11-19	2	-8/+6
\| \| \| \|
\| * \| \|	Apply forgetting properly to historical events	Daniel Wagner-Hall	2015-11-18	2	-3/+41
\| \| \| \|
\| * \| \|	Allow users to forget rooms	Daniel Wagner-Hall	2015-11-17	6	-4/+81
\| \| \| \|
* \| \| \|	Merge pull request #395 from matrix-org/erikj/perspective_limiter	Erik Johnston	2015-11-20	2	-22/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Don't limit connections to perspective servers
\| * \| \| \|	Fix typo	Erik Johnston	2015-11-20	2	-3/+3
\| \| \| \| \|
\| * \| \| \|	Don't limit connections to perspective servers	Erik Johnston	2015-11-20	2	-22/+21
\|/ / / /
* \| \| \|	Merge pull request #394 from matrix-org/erikj/search	Erik Johnston	2015-11-20	1	-1/+54
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Add options for including state in search results
\| * \| \| \|	Add option to include the current room state	Erik Johnston	2015-11-20	1	-0/+24
\| \| \| \| \|
\| * \| \| \|	Optionally include historic profile info	Erik Johnston	2015-11-20	1	-1/+30
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #389 from matrix-org/rav/flatten_sync_response	Richard van der Hoff	2015-11-20	2	-27/+17
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	v2 sync: Get rid of the event_map, and rename the keys of the rooms obj
\| * \| \| \|	Merge branch 'develop' into rav/flatten_sync_response	Paul "LeoNerd" Evans	2015-11-19	17	-86/+162
\| \|\\| \| \|
\| * \| \| \|	Put back the 'state.events' subobject	Richard van der Hoff	2015-11-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're keeping 'events', in case we decide to add more keys later.
\| * \| \| \|	v2 /sync: Rename the keys of the 'rooms' object to match member states	Richard van der Hoff	2015-11-19	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	joined->join invited->invite archived->leave
\| * \| \| \|	Flatten the /sync response to remove the event_map	Richard van der Hoff	2015-11-19	2	-24/+14
\| \| \| \| \|
* \| \| \| \|	Merge pull request #391 from matrix-org/erikj/remove_token_from_flow	Erik Johnston	2015-11-20	1	-1/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove m.login.token from advertised flows.
\| * \| \| \| \|	Comment	Erik Johnston	2015-11-20	1	-0/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Remove m.login.token from advertised flows.	Erik Johnston	2015-11-19	1	-1/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #393 from matrix-org/erikj/destination_retry_max	Erik Johnston	2015-11-20	1	-2/+2
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	Use min and not max to set an upper bound on retry interval
\| * \| \| \| \|	Use min and not max to set an upper bound on retry interval	Erik Johnston	2015-11-20	1	-2/+2
\| \|/ / / /
* \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-11-19	2	-1/+6
\|\\| \| \| \|
\| * \| \| \|	Merge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse v0.11.0-r2	Erik Johnston	2015-11-19	4	-28/+78
\| \|\ \ \ \
\| \| * \| \| \|	Bump changes and version	Erik Johnston	2015-11-19	2	-1/+6
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'erikj/fix_port_script' into hotfixes-v0.11.0-r2	Erik Johnston	2015-11-19	1	-11/+44
\| \| \|\ \ \ \
* \| \| \ \ \ \	Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data	Mark Haines	2015-11-19	11	-49/+66
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	s/private_user_data/account_data/
\| * \| \| \| \| \| \|	Rename the database table	Mark Haines	2015-11-18	1	-0/+17
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	s/private_user_data/account_data/	Mark Haines	2015-11-18	10	-49/+49
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #382 from matrix-org/daniel/macarooncleanup	Daniel Wagner-Hall	2015-11-19	2	-9/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Take a boolean not a list of lambdas
\| * \| \| \| \| \| \|	Take a boolean not a list of lambdas	Daniel Wagner-Hall	2015-11-19	2	-9/+18
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #388 from matrix-org/erikj/messages	Erik Johnston	2015-11-19	1	-16/+28
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|	Split out text for missing config options.
\| * \| \| \| \| \|	Comment	Erik Johnston	2015-11-19	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Split out text for missing config options.	Erik Johnston	2015-11-18	1	-16/+26
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows packages to more easily override the default messages to include package specific options.
* \| \| \| \| \|	Merge pull request #387 from matrix-org/erikj/fix_port_script	Erik Johnston	2015-11-19	1	-11/+44
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| / / \| \|_\|_\|/ / \|/\| \| \| \|	Fix database port script to work with new event_search table
\| * \| \| \|	Spelling	Erik Johnston	2015-11-19	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fix database port script to work with new event_search table	Erik Johnston	2015-11-18	1	-11/+44
\| \| \| \| \|
* \| \| \| \|	Merge pull request #381 from matrix-org/daniel/jenkins-sytest-cached	Daniel Wagner-Hall	2015-11-18	1	-2/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Share sytest clone across runs Depends on https://github.com/matrix-org/synapse/pull/380
\| * \| \| \| \|	Share sytest clone across runs	Daniel Wagner-Hall	2015-11-18	1	-2/+8
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Depends on https://github.com/matrix-org/synapse/pull/380
* \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-11-18	1	-0/+3
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Erik pointed out we should advise on the lack of included client	Oddvar Lovaas	2015-11-18	1	-0/+3
\| \|/ / /
* \| / /	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-11-18	3	-1/+9
\|\\| \| \| \| \|/ / \|/\| \|
\| * \|	Merge branch 'hotfixes-v0.11.0-r1' v0.11.0-r1	Erik Johnston	2015-11-18	7	-8/+49
\| \|\ \
\| \| * \|	Change date	Erik Johnston	2015-11-18	1	-1/+1
\| \| \| \|
\| \| * \|	Better change log	Erik Johnston	2015-11-18	1	-2/+2
\| \| \| \|
\| \| * \|	Bump changelog and version	Erik Johnston	2015-11-17	2	-1/+7
\| \| \| \|
\| * \| \|	adding link to apt repo	Oddvar Lovaas	2015-11-18	1	-0/+2
\| \| \| \|
* \| \| \|	Merge pull request #384 from matrix-org/erikj/shorter_retries	Erik Johnston	2015-11-17	5	-7/+39
\|\ \ \ \ \| \| \|/ / \| \|/\| \|	Only retry federation requests for a long time for background requests
\| * \| \|	Update tests	Erik Johnston	2015-11-17	3	-0/+17
\| \| \| \|
\| * \| \|	Add comment	Erik Johnston	2015-11-17	1	-0/+2
\| \| \| \|
\| * \| \|	Only retry federation requests for a long time for background requests	Erik Johnston	2015-11-17	2	-7/+20
\| \| \| \|
* \| \| \|	Merge branch 'hotfixes-v0.10.0-r1' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-11-17	1	-0/+3
\|\\| \| \|
\| * \| \|	Implement required method 'resumeProducing'	Erik Johnston	2015-11-17	1	-0/+3
\| \|/ /
\| * \|	Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse v0.11.0	Erik Johnston	2015-11-17	172	-2810/+8255
\| \|\ \
* \| \ \	Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-11-17	3	-3/+17
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Slightly more aggressive retry timers at HTTP level	Erik Johnston	2015-11-17	1	-2/+3
\| \| \| \|
\| * \| \|	Bump changelog and version	Erik Johnston	2015-11-17	2	-1/+6
\| \| \| \|
\| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0	Erik Johnston	2015-11-17	10	-45/+265
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserver	Erik Johnston	2015-11-17	5	-39/+199
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	SH CAS auth via homeserver
\| * \| \| \|	Always check guest = true in macaroons	Steven Hammerton	2015-11-17	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' into sh-cas-auth-via-homeserver	Steven Hammerton	2015-11-17	39	-292/+1268
\| \|\ \ \ \
\| * \| \| \| \|	Snakes not camels	Steven Hammerton	2015-11-11	1	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Minor review fixes	Steven Hammerton	2015-11-11	2	-17/+14
\| \| \| \| \| \|
\| * \| \| \| \|	Share more code between macaroon validation	Steven Hammerton	2015-11-11	2	-57/+17
\| \| \| \| \| \|
\| * \| \| \| \|	Updates to fallback CAS login to do new token login	Steven Hammerton	2015-11-06	1	-26/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' into sh-cas-auth-via-homeserver	Steven Hammerton	2015-11-05	45	-324/+1117
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Allow hs to do CAS login completely and issue the client with a login token ↵	Steven Hammerton	2015-11-05	3	-5/+218
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	that can be redeemed for the usual successful login response
\| * \| \| \| \| \|	Add service URL to CAS config	Steven Hammerton	2015-11-04	1	-0/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #380 from matrix-org/daniel/jenkins-sytest	Daniel Wagner-Hall	2015-11-17	1	-1/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #380 from matrix-org/daniel/jenkins-sytest Run sytests on jenkins
\| * \| \| \| \| \| \|	Run sytests on jenkins	Daniel Wagner-Hall	2015-11-16	1	-1/+22
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #379 from matrix-org/daniel/jenkins	Daniel Wagner-Hall	2015-11-17	2	-4/+18
\|\\| \| \| \| \| \| \| \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	Output results files on jenkins
\| * \| \| \| \| \|	Output results files on jenkins	Daniel Wagner-Hall	2015-11-16	2	-4/+18
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Outputs: * results.xml * coverage.xml * violations.flake8.log
* \| \| \| \| \|	Merge pull request #376 from matrix-org/daniel/jenkins	Daniel Wagner-Hall	2015-11-16	3	-1/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pull out jenkins script into a checked in script
\| * \| \| \| \| \|	Pull out jenkins script into a checked in script	Daniel Wagner-Hall	2015-11-13	3	-1/+9
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #377 from matrix-org/paul/tiny-fixes	Paul Evans	2015-11-13	1	-0/+6
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Don't complain if /make_join response lacks 'prev_state' list (SYN-517)
\| * \| \| \| \|	Don't complain if /make_join response lacks 'prev_state' list (SYN-517)	Paul "LeoNerd" Evans	2015-11-13	1	-0/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' into paul/tiny-fixes	Paul "LeoNerd" Evans	2015-11-13	100	-1036/+3170
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #374 from matrix-org/daniel/guestleave	Daniel Wagner-Hall	2015-11-13	1	-3/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow guests to /room/:room_id/{join,leave}
\| * \| \| \| \| \|	Allow guests to /room/:room_id/{join,leave}	Daniel Wagner-Hall	2015-11-13	1	-3/+14
\|/ / / / / /
\| * \| \| \| \|	Merge branch 'develop' into paul/tiny-fixes	Paul "LeoNerd" Evans	2015-11-03	46	-288/+1802
\| \|\ \ \ \ \
\| \| \| \| \| * \|	Bump version and change log v0.11.0-rc2	Erik Johnston	2015-11-13	2	-1/+9
\| \| \| \| \| \| \|
\| \| \| \| \| * \|	Merge branch 'develop' into release-v0.11.0	Erik Johnston	2015-11-13	18	-142/+474
\| \| \| \| \| \|\ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	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