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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update the extremeties tables in a seperate txn github/erikj/extremeties_txn erikj/extremeties_txn	Erik Johnston	2015-08-24	2	-58/+71
\|
*	Don't insert events into 'event_*_extremeties' tables if they're outliers	Erik Johnston	2015-08-23	1	-2/+8
\|
*	Actually check if event_id isn't returned by _get_state_groups	Erik Johnston	2015-08-21	1	-2/+9
\|
*	Upate changelog v0.10.0-rc1	Erik Johnston	2015-08-21	1	-1/+1
\|
*	Upate changelog	Erik Johnston	2015-08-21	1	-0/+3
\|
*	Merge branch 'erikj/user_dedup' into release-v0.10.0	Erik Johnston	2015-08-21	4	-12/+48
\|\
\| *	Doc string	Erik Johnston	2015-08-21	1	-0/+6
\| \|
\| *	When logging in fetch user by user_id case insensitively, unless there are ↵	Erik Johnston	2015-08-21	3	-12/+31
\| \| \| \| \| \| \| \|	multiple case insensitive matches, in which case require the exact user_id
\| *	Don't allow people to register user ids which only differ by case to an ↵	Erik Johnston	2015-08-21	2	-2/+13
\|/ \| \| \|	existing one
*	Fix bug where we didn't correctly serialize the redacted_because key over ↵	Erik Johnston	2015-08-21	2	-1/+6
\| \| \| \|	federation
*	Add missing param in store.get_state_groups invocation	Erik Johnston	2015-08-21	1	-1/+1
\|
*	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0	Erik Johnston	2015-08-20	4	-4/+6
\|\
\| *	Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-08-20	4	-45/+151
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #237 from matrix-org/markjh/readme-rst-formatting	Mark Haines	2015-08-20	1	-37/+39
\|\ \ \| \| \| \| \| \|	Clean up some of restructured text formatting in the README.rst
\| * \|	Further formatting clean ups	Mark Haines	2015-08-20	1	-7/+7
\| \| \|
\| * \|	Clean up some of restructured text formatting in the README.rst	Mark Haines	2015-08-20	1	-30/+32
\| \| \|
* \| \|	Merge pull request #236 from matrix-org/markjh/upgrade-instructions	Mark Haines	2015-08-20	2	-7/+37
\|\ \ \ \| \| \| \| \| \| \| \|	Add generic update instructions to UPGRADE.rst
\| * \| \|	Tweak the wording a bit	Mark Haines	2015-08-20	1	-4/+4
\| \| \| \|
\| * \| \|	Add generic update instructions to UPGRADE.rst and add link to them from the ↵	Mark Haines	2015-08-20	2	-7/+37
\| \|/ / \| \| \| \| \| \| \| \| \|	README.rst
* / /	Update changelog	Erik Johnston	2015-08-20	1	-0/+1
\|/ /
* \|	Bump version and changelog	Erik Johnston	2015-08-20	2	-1/+74
\| \|
\| *	Merge pull request #235 from matrix-org/erikj/room_avatars	Erik Johnston	2015-08-20	2	-2/+4
\| \|\ \| \| \| \| \| \|	Add m.room.avatar to default power levels.
\| \| *	Add m.room.avatar to default power levels. Change default required power ↵	Erik Johnston	2015-08-20	2	-2/+4
\| \|/ \|/\| \| \| \| \|	levels of such events to 50
\| *	Merge pull request #238 from matrix-org/fix_set_password	Erik Johnston	2015-08-20	2	-2/+2
\|/\| \| \| \| \|	Fix set password
\| *	Remove spurious extra arg to set_password	David Baker	2015-08-20	1	-1/+1
\| \|
\| *	Another use of check_password that got missed in the yield fix	David Baker	2015-08-20	1	-1/+1
\|/
*	Merge pull request #231 from matrix-org/erikj/pushers_store_last_token	Erik Johnston	2015-08-20	1	-5/+11
\|\ \| \| \| \|	Push: store the 'last_token' in the db, even if we processed no events
\| *	Store the 'last_token' in the db, even if we processed no events	Erik Johnston	2015-08-19	1	-0/+6
\| \|
\| *	Block on storing the current last_tokens	Erik Johnston	2015-08-19	1	-5/+5
\| \|
* \|	Merge pull request #206 from matrix-org/erikj/generate_presice_thumbnails	Mark Haines	2015-08-20	3	-21/+226
\|\ \ \| \| \| \| \| \|	Always return a thumbnail of the requested size.
\| * \|	Fix flake8 warning	Mark Haines	2015-08-13	1	-0/+1
\| \| \|
\| * \|	Merge remote-tracking branch 'origin/develop' into ↵	Mark Haines	2015-08-13	34	-368/+613
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	erikj/generate_presice_thumbnails
\| * \| \|	Doc-string for config ultility function	Mark Haines	2015-08-12	1	-0/+11
\| \| \| \|
\| * \| \|	Add config option for setting the list of thumbnail sizes to precalculate	Mark Haines	2015-08-12	2	-16/+41
\| \| \| \|
\| * \| \|	Make a config option for whether to generate new thumbnail sizes dynamically	Mark Haines	2015-08-12	3	-7/+27
\| \| \| \|
\| * \| \|	Factor out thumbnail()	Erik Johnston	2015-07-23	1	-56/+40
\| \| \| \|
\| * \| \|	Fix remote thumbnailing	Erik Johnston	2015-07-23	2	-7/+11
\| \| \| \|
\| * \| \|	Always return a thumbnail of the requested size.	Erik Johnston	2015-07-23	2	-2/+162
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before, we returned a thumbnail that was at least as big (if possible) as the requested size. Now, if we don't have a thumbnail of the given size we generate (and persist) one of that size.
* \| \| \|	Merge pull request #233 from matrix-org/erikj/canonical_alias	Erik Johnston	2015-08-20	3	-1/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Add server side support for canonical aliases
\| * \| \| \|	Check that the canonical room alias actually points to the room	Erik Johnston	2015-08-20	1	-1/+17
\| \| \| \| \|
\| * \| \| \|	Add canonical alias to the default power levels	Erik Johnston	2015-08-19	2	-0/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #234 from matrix-org/email_login	David Baker	2015-08-20	1	-5/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Support logging in with email addresses (or other threepids)
\| * \| \| \|	Comma comma comma comma comma chameleon	David Baker	2015-08-20	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' into email_login	David Baker	2015-08-20	60	-707/+1752
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #211 from matrix-org/email_in_use	Mark Haines	2015-08-20	5	-1/+75
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Changes for unique emails
\| * \| \| \| \|	Check absent before trying to access keys	David Baker	2015-08-12	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Just leaving off the $ is fine. r* == registerrrrrrrrr	David Baker	2015-08-12	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #232 from matrix-org/erikj/appservice_joined_rooms	Erik Johnston	2015-08-19	3	-12/+32
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users
\| * \| \| \| \|	Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users	Erik Johnston	2015-08-19	3	-12/+32
\|/ / / / /
* \| \| \| \|	Remove an access token log line	Erik Johnston	2015-08-19	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Fix regression where we incorrectly responded with a 200 to /login	Erik Johnston	2015-08-19	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #228 from matrix-org/erikj/_get_state_for_groups	Erik Johnston	2015-08-18	1	-2/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Ensure we never return a None event from _get_state_for_groups
\| * \| \| \| \|	Remove newline because vertical whitespace makes mjark sad	Erik Johnston	2015-08-18	1	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Rejig the code to make it nicer	Erik Johnston	2015-08-18	1	-3/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Ensure we never return a None event from _get_state_for_groups	Erik Johnston	2015-08-18	1	-3/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #230 from matrix-org/erikj/appservice_auth_entity	Erik Johnston	2015-08-18	1	-0/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set request.authenticated_entity for application services
\| * \| \| \| \| \|	Set request.authenticated_entity for application services	Erik Johnston	2015-08-18	1	-0/+3
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #227 from matrix-org/erikj/receipts_take2	Erik Johnston	2015-08-18	4	-17/+91
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-enable receipts API.
\| * \| \| \| \| \|	Rename unhelpful variable name	Erik Johnston	2015-08-18	1	-7/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Comments	Erik Johnston	2015-08-18	1	-4/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add index receipts_linearized_room_stream	Erik Johnston	2015-08-17	2	-1/+19
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove unused import	Erik Johnston	2015-08-17	1	-2/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove added unused methods	Erik Johnston	2015-08-17	1	-7/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-17	10	-147/+105
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/receipts_take2
\| * \| \| \| \| \| \|	Batch _get_linearized_receipts_for_rooms	Erik Johnston	2015-08-14	1	-15/+64
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-13	3	-51/+18
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/receipts_take2
\| * \| \| \| \| \| \| \|	Add metrics to the receipts cache	Erik Johnston	2015-08-13	2	-0/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Re-enable receipts	Erik Johnston	2015-08-13	1	-2/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #225 from matrix-org/erikj/reactor_metrics	Erik Johnston	2015-08-18	1	-3/+25
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix pending_calls metric to not lie
\| * \| \| \| \| \| \| \| \|	Also check for presence of 'threadCallQueue' in reactor	Erik Johnston	2015-08-18	1	-1/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use more helpful variable names	Erik Johnston	2015-08-18	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix pending_calls metric to not lie	Erik Johnston	2015-08-14	1	-3/+18
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Bump size of get_presence_state cache	Erik Johnston	2015-08-18	1	-1/+1
\| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Typo	Erik Johnston	2015-08-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	None check	Erik Johnston	2015-08-18	1	-0/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Don't assume @cachedList function returns keys for everything	Erik Johnston	2015-08-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Reduce cache size from obscenely large to quite large	Erik Johnston	2015-08-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #226 from matrix-org/erikj/room_presence	Erik Johnston	2015-08-18	3	-15/+122
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add and use cached batched storage.get_state function.
\| * \| \| \| \| \| \| \| \|	More helpful variable names	Erik Johnston	2015-08-18	1	-7/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Doc strings	Erik Johnston	2015-08-18	1	-0/+28
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove debug try/catch	Erik Johnston	2015-08-18	1	-47/+43
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remember to invalidate caches	Erik Johnston	2015-08-17	1	-2/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Implement a batched presence_handler.get_state and use it	Erik Johnston	2015-08-17	3	-14/+73
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add batched version of store.get_presence_state	Erik Johnston	2015-08-17	1	-1/+19
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation	Mark Haines	2015-08-18	5	-30/+233
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Federation for end-to-end key requests.
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into ↵	Mark Haines	2015-08-13	35	-369/+615
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	markjh/end-to-end-key-federation
\| * \| \| \| \| \| \| \|	Add a few strategic new lines to break up the on_query_client_keys and ↵	Mark Haines	2015-08-13	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on_claim_client_keys methods in federation_server.py
\| * \| \| \| \| \| \| \|	Get the end-to-end key federation working	Mark Haines	2015-07-24	4	-21/+17
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add federation support for end-to-end key requests	Mark Haines	2015-07-23	5	-30/+231
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix bug where we were leaking None into state event lists	Erik Johnston	2015-08-17	1	-2/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #221 from matrix-org/auth	Daniel Wagner-Hall	2015-08-14	9	-145/+102
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|	Simplify LoginHander and AuthHandler
\| * \| \| \| \| \| \| \|	Merge password checking implementations	Daniel Wagner-Hall	2015-08-12	1	-20/+15
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' into auth	Daniel Wagner-Hall	2015-08-12	3	-55/+49
\| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into develop	Daniel Wagner-Hall	2015-08-12	5	-71/+70
\| \| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Simplify LoginHander and AuthHandler	Daniel Wagner-Hall	2015-08-12	9	-131/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Merge LoginHandler -> AuthHandler * Add a bunch of documentation * Improve some naming * Remove unused branches I will start merging the actual logic of the two handlers shortly
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into auth	Daniel Wagner-Hall	2015-08-11	1	-2/+2
\| \|\\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Remove call to recently removed function in mock	Daniel Wagner-Hall	2015-08-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #219 from matrix-org/erikj/dictionary_cache	Erik Johnston	2015-08-13	27	-356/+928
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Dictionary and list caches
\| * \| \| \| \| \| \| \| \| \|	Remove pointless map	Erik Johnston	2015-08-13	1	-7/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-13	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/dictionary_cache
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #224 from matrix-org/erikj/reactor_metrics	Erik Johnston	2015-08-13	1	-0/+29
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \|	Add some metrics about the reactor
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into erikj/reactor_metrics	Mark Haines	2015-08-13	2	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Add max-line-length to the flake8 section of setup.cfg	Mark Haines	2015-08-13	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Remove some vertical space	Erik Johnston	2015-08-13	1	-36/+9
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Replace list comprehension	Erik Johnston	2015-08-13	1	-8/+3
\| \| \| \|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-13	1	-1/+0
\| \| \|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/dictionary_cache
* \| \| \| \| \| \| \| \| \|	PEP8	Erik Johnston	2015-08-13	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache	Erik Johnston	2015-08-13	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Don't time getDelayedCalls	Erik Johnston	2015-08-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache	Erik Johnston	2015-08-13	5	-56/+60
\| \| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add some metrics about the reactor	Erik Johnston	2015-08-13	1	-0/+29
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #173 from matrix-org/markjh/twisted-15	Mark Haines	2015-08-12	3	-55/+29
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update to Twisted-15.2.1.
\| * \| \| \| \| \| \| \| \|	Depend on Twisted>=15.1 rather than pining to a particular version	Mark Haines	2015-08-12	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into markjh/twisted-15	Mark Haines	2015-08-12	96	-1673/+4524
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/http/matrixfederationclient.py
\| * \| \| \| \| \| \| \| \|	Bump the version of twisted needed for setup_requires to 15.2.1	Mark Haines	2015-06-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into markjh/twisted-15	Mark Haines	2015-06-01	11	-21/+53
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/python_dependencies.py
\| * \| \| \| \| \| \| \| \| \|	Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ↵	Mark Haines	2015-06-01	2	-51/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	own Agent
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #223 from matrix-org/markjh/enable_demo_registration	Erik Johnston	2015-08-12	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	enable registration in the demo servers
\| * \| \| \| \| \| \| \| \| \|	enable registration in the demo servers	Mark Haines	2015-08-12	1	-1/+2
\|/ / / / / / / / / /
\| \| \| * \| \| \| \| \| \|	Comment	Erik Johnston	2015-08-12	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Explain why we're prefilling dict with Nones	Erik Johnston	2015-08-12	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Better variable name	Erik Johnston	2015-08-12	1	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Split _get_state_for_group_from_cache into two	Erik Johnston	2015-08-12	1	-32/+53
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Fix _filter_events_for_client	Erik Johnston	2015-08-12	2	-6/+2
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Docstring	Erik Johnston	2015-08-12	1	-0/+27
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Simplify staggered deferred lists	Erik Johnston	2015-08-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Use list comprehension instead of filter	Erik Johnston	2015-08-12	2	-20/+6
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-12	3	-61/+57
\| \| \| \|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/dictionary_cache
* \| \| \| \| \| \| \| \| \|	Merge pull request #220 from matrix-org/markjh/generate_keys	Erik Johnston	2015-08-12	1	-45/+36
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the --generate-keys option.
\| * \| \| \| \| \| \| \| \| \|	Fix the --generate-keys option. Make it do the same thing as ↵	Mark Haines	2015-08-12	1	-45/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	--generate-config does when the config file exists, but without printing a warning
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #216 from matrix-org/auth	Daniel Wagner-Hall	2015-08-12	2	-16/+21
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|	Clean up some docs and redundant fluff
\| * \| \| \| \| \| \| \| \| \|	Add missing space because linter	Daniel Wagner-Hall	2015-08-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Minor docs cleanup	Daniel Wagner-Hall	2015-08-11	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove redundant if-guard	Daniel Wagner-Hall	2015-08-11	1	-13/+12
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The startswith("@") does the job
\| \| \| \| \| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-12	4	-13/+18
\| \| \| \| \| \|\ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/dictionary_cache
* \| \| \| \| \| \| \| \| \|	Merge pull request #182 from ↵	Mark Haines	2015-08-12	2	-10/+13
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/manu/fix_no_rate_limit_in_federation_demo Federation demo start.sh: Fixed --no-rate-limit param in the script
\| * \| \| \| \| \| \| \| \|	Fix the cleanup script to use the right $DIR	Mark Haines	2015-08-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Federation demo start.sh: Fixed --no-rate-limit param in the script	manuroe	2015-06-04	2	-10/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #218 from matrix-org/mockfix	Erik Johnston	2015-08-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Remove call to "recently" removed function in mock
\| * \| \| \| \| \| \| \| \|	Remove call to recently removed function in mock	Daniel Wagner-Hall	2015-08-11	1	-2/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Use TypeError instead of ValueError and give a nicer error mesasge	Mark Haines	2015-08-10	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when someone calls Cache.invalidate with the wrong type.
\| \| \| \| * \| \| \| \|	Wire up the dictionarycache to the metrics	Erik Johnston	2015-08-12	3	-45/+41
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Move all the caches into their own package, synapse.util.caches	Erik Johnston	2015-08-11	23	-352/+408
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Comments	Erik Johnston	2015-08-11	2	-3/+13
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Comment	Erik Johnston	2015-08-11	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Docs	Erik Johnston	2015-08-11	1	-0/+9
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Remove debug loggers	Erik Johnston	2015-08-11	2	-6/+0
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Fix application of ACLs	Erik Johnston	2015-08-11	4	-17/+33
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Fix state cache	Erik Johnston	2015-08-11	1	-36/+49
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Clean up StateStore	Erik Johnston	2015-08-10	1	-62/+11
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Remove unused function	Erik Johnston	2015-08-10	1	-7/+0
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Comments	Erik Johnston	2015-08-10	1	-0/+6
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Comments	Erik Johnston	2015-08-10	1	-0/+3
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-10	0	-0/+0
\| \| \| \| \|\ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/dictionary_cache
* \| \| \| \| \| \| \| \|	Merge pull request #215 from matrix-org/erikj/cache_varargs_interface	Erik Johnston	2015-08-10	12	-72/+73
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change Cache to not use *args in its interface
\| \| \| \| \| * \ \ \ \	Merge branch 'erikj/cache_varargs_interface' of ↵	Erik Johnston	2015-08-10	1	-5/+5
\| \| \| \| \| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:matrix-org/synapse into erikj/dictionary_cache
\| * \| \| \| \| \| \| \| \|	Rename keyargs to args in CacheDescriptor	Erik Johnston	2015-08-10	1	-5/+5
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \|	Merge branch 'erikj/cache_varargs_interface' of ↵	Erik Johnston	2015-08-10	1	-9/+9
\| \| \| \| \| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:matrix-org/synapse into erikj/dictionary_cache
\| * \| \| \| \| \| \| \| \|	Rename keyargs to args in Cache	Erik Johnston	2015-08-10	1	-9/+9
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \|	Do bounds check	Erik Johnston	2015-08-10	1	-1/+4
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \|	Line length	Erik Johnston	2015-08-10	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \|	Merge branch 'erikj/cache_varargs_interface' of ↵	Erik Johnston	2015-08-07	1	-1/+0
\| \| \| \| \| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:matrix-org/synapse into erikj/dictionary_cache
\| * \| \| \| \| \| \| \| \|	Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-07	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/cache_varargs_interface
\| * \ \ \ \ \ \ \ \ \	Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-07	1	-3/+4
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/cache_varargs_interface
\| * \| \| \| \| \| \| \| \| \| \|	Remove unnecessary cache	Erik Johnston	2015-08-07	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Change Cache to not use *args in its interface	Erik Johnston	2015-08-07	11	-67/+69
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-07	5	-4/+27
\| \| \| \| \| \| \| \|\ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/dictionary_cache
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #212 from matrix-org/erikj/cache_deferreds	Erik Johnston	2015-08-07	3	-19/+47
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|	Make CacheDescriptor cache deferreds rather than the deferreds' values
\| * \| \| \| \| \| \| \| \| \| \|	s/observed/observer/	Erik Johnston	2015-08-07	1	-3/+3
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Propogate stale cache errors to calling functions	Erik Johnston	2015-08-07	1	-3/+4
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #213 from matrix-org/paul/SYN-420	Paul Evans	2015-08-07	4	-1/+23
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Three small improvements to help debian package (SYN-420)
\| * \| \| \| \| \| \| \| \| \|	Don't complain about extra .pyc files we find while hunting for database schemas	Paul "LeoNerd" Evans	2015-08-07	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add a --generate-keys option	Paul "LeoNerd" Evans	2015-08-07	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Only print the pidfile path on startup if requested by a commandline flag	Paul "LeoNerd" Evans	2015-08-07	2	-1/+9
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #209 from matrix-org/erikj/cached_keyword_args	Erik Johnston	2015-08-06	6	-23/+45
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for using keyword arguments with cached functions
\| \| \| \| \| \| * \| \| \| \|	Batch up various DB requests for event -> state	Erik Johnston	2015-08-07	1	-77/+142
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \|	Implement a CacheListDescriptor	Erik Johnston	2015-08-07	1	-0/+106
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \|	Don't be too enthusiatic with defer.gatherResults	Erik Johnston	2015-08-07	1	-4/+8
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \|	Cache get_recent_events_for_room	Erik Johnston	2015-08-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \|	Remove unncessary cache	Erik Johnston	2015-08-07	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \|	Change Cache to not use *args in its interface	Erik Johnston	2015-08-07	11	-87/+73
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \|	Store absence of state in cache	Erik Johnston	2015-08-07	1	-6/+16
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \|	Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cache	Erik Johnston	2015-08-06	1	-3/+27
\| \| \| \| \| \| \|\ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Docs	Erik Johnston	2015-08-06	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Remove failed deferreds from cache	Erik Johnston	2015-08-06	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Re-implement DEBUG_CACHES flag	Erik Johnston	2015-08-06	1	-2/+17
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \|	Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cache	Erik Johnston	2015-08-06	3	-19/+22
\| \| \| \| \| \| \|\ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferreds	Erik Johnston	2015-08-06	8	-140/+305
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-06	8	-140/+305
\| \|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/cached_keyword_args
\| \| * \| \| \| \| \| \| \| \|	Make @cached cache deferreds rather than the deferreds' values	Erik Johnston	2015-08-06	3	-19/+22
\| \|/ / / / / / / / /
\| \| \| \| \| * \| \| \| \|	Merge branch 'erikj/cached_keyword_args' of github.com:matrix-org/synapse ↵	Erik Johnston	2015-08-05	6	-23/+45
\| \| \| \| \| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into erikj/dictionary_cache
\| * \| \| \| \| \| \| \| \|	Add support for using keyword arguments with cached functions	Erik Johnston	2015-07-27	6	-23/+45
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2015-08-05	2	-5/+5
\| \| \| \| \| \|\ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/dictionary_cache
* \| \| \| \| \| \| \| \|	Up the cache size for 'get_joined_hosts_for_room' and 'get_users_in_room'	Erik Johnston	2015-08-05	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Use LRU cache by default	Erik Johnston	2015-08-05	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	Use dictionary cache to do group -> state fetching	Erik Johnston	2015-08-05	7	-110/+195
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	Move DictionaryCache	Erik Johnston	2015-08-04	2	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	Add basic dictionary cache	Erik Johnston	2015-08-04	2	-0/+195
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/acl_perf	Erik Johnston	2015-08-04	2	-2/+3
\| \| \| \| \| \|\ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	Add comment	Erik Johnston	2015-08-04	1	-0/+15
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \|	Speed up event filtering (for ACL) logic	Erik Johnston	2015-08-04	5	-43/+102
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| *	Allow sign in using email address	David Baker	2015-08-04	1	-5/+12
\| \| \| \| \| \| \| \|/
\| \| \| \| \| \| \| *	Remember to yield: not much point testing is a deferred is not None	David Baker	2015-08-04	1	-1/+2
\| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| *	splt long line	David Baker	2015-08-04	1	-1/+3
\| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| *	Fix tests	David Baker	2015-08-04	1	-1/+2
\| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| *	Bump schema version	David Baker	2015-08-04	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| *	Add endpoint that proxies ID server request token and errors if the given ↵	David Baker	2015-08-04	4	-1/+71
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	email is in use on this Home Server.
* \| \| \| \| \| \|	Don't try & check the username if we don't have one (which we won't if it's ↵	David Baker	2015-08-03	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	been saved in the auth layer)
* \| \| \| \| \| \|	Add vector.im as trusted ID server	David Baker	2015-08-03	1	-1/+1
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #210 from matrix-org/reg-v2a-password-skip	David Baker	2015-07-29	3	-55/+208
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	v2_alpha /register fixes for Application Services
\| * \| \| \| \| \|	Use the same reg paths as register v1 for ASes.	Kegan Dougal	2015-07-29	2	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Namely this means using registration_handler.appservice_register.
\| * \| \| \| \| \|	Fix v2_alpha registration. Add unit tests.	Kegan Dougal	2015-07-28	3	-55/+204
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag.
* \| \| \| \| \| \|	improve OS X instructions and remove all the leading $'s to make it easier ↵	Matthew Hodgson	2015-07-29	1	-45/+47
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to c+p commands
* \| \| \| \| \|	Merge pull request #207 from ↵	Erik Johnston	2015-07-27	1	-34/+43
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/erikj/generate_local_thumbnails_on_thread Generate local thumbnails on a thread
\| * \| \| \| \|	Generate local thumbnails on a thread	Erik Johnston	2015-07-23	1	-34/+43
\|/ / / / /
* \| \| \| \|	Merge pull request #205 from matrix-org/erikj/pick_largest_thumbnail	Mark Haines	2015-07-23	1	-1/+2
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|	Pick larger than desired thumbnail for 'crop'
\| * \| \| \|	Pick larger than desired thumbnail for 'crop'	Erik Johnston	2015-07-23	1	-1/+2
\|/ / / /
* \| \| \|	Disable receipts for now	Matrix	2015-07-22	1	-0/+2
\| \| \| \|
* \| \| \|	Query for all the ones we were asked about, not just the last...	David Baker	2015-07-21	1	-1/+1
\| \| \| \|
* \| \| \|	Dodesn't seem to make any difference: guess it does work with the object ↵	David Baker	2015-07-21	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reference
* \| \| \|	I think this was what was intended...	David Baker	2015-07-21	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2015-07-21	4	-4/+30
\|\ \ \ \
\| * \| \| \|	typo	Matthew Hodgson	2015-07-08	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'release-v0.9.3' of github.com:matrix-org/synapse v0.9.3	Erik Johnston	2015-07-01	25	-481/+787
\| \|\ \ \ \
\| \| * \| \| \|	Bump changelog and version to v0.9.3	Erik Johnston	2015-07-01	2	-2/+7
\| \| \| \| \| \|
\| \| * \| \| \|	Update change log v0.9.3-rc1	Erik Johnston	2015-06-23	1	-0/+18
\| \| \| \| \| \|
\| \| * \| \| \|	Bumb version	Erik Johnston	2015-06-23	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	clarify readme a bit more	Matthew Hodgson	2015-06-27	1	-1/+4
\| \| \| \| \| \|
* \| \| \| \| \|	s/take/claim/ for end to end key APIs	Mark Haines	2015-07-20	2	-8/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #204 from illicitonion/develop	Erik Johnston	2015-07-20	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve naming
\| * \| \| \| \| \|	Improve naming	Daniel Wagner-Hall	2015-07-20	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Remove semicolon.	Kegan Dougal	2015-07-20	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Parse the ID given to /invite\|ban\|kick to make sure it looks like a user ID.	Kegan Dougal	2015-07-20	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Up default cache size for _RoomStreamChangeCache	Matrix	2015-07-18	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Don't do any database hits in receipt handling if from_key == to_key	Matrix	2015-07-18	1	-0/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #199 from matrix-org/erikj/receipts	Erik Johnston	2015-07-16	19	-48/+724
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement read receipts.
\| * \| \| \| \| \|	Docs	Erik Johnston	2015-07-14	2	-6/+36
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts	Erik Johnston	2015-07-13	23	-221/+1329
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Comments	Erik Johnston	2015-07-13	2	-4/+23
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Handle error slightly better	Erik Johnston	2015-07-09	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove spurious comment	Erik Johnston	2015-07-09	1	-2/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Integer timestamps	Erik Johnston	2015-07-09	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts	Erik Johnston	2015-07-09	2	-3/+8
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Change format of receipts to allow inclusion of data	Erik Johnston	2015-07-09	3	-37/+42
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add blist to dependencies	Erik Johnston	2015-07-08	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts	Erik Johnston	2015-07-08	7	-18/+62
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add a cache to fetching of receipt streams	Erik Johnston	2015-07-08	2	-27/+96
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Split receipt events up into one per room	Erik Johnston	2015-07-08	1	-30/+21
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Hook up receipts to v1 initialSync	Erik Johnston	2015-07-08	3	-13/+77
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix test.	Erik Johnston	2015-07-07	1	-1/+11
\| \| \| \| \| \| \| \| \| \|