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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add pepper to password hashing	Kent Shikama	2016-07-05	2	-3/+8
\| \| \| \|	Signed-off-by: Kent Shikama <kent@kentshikama.com>
*	Merge pull request #905 from KentShikama/add-password-hash	Erik Johnston	2016-07-04	2	-3/+7
\|\ \| \| \| \|	Optionally include password hash in createUser endpoint
\| *	Fix style violations	Kent Shikama	2016-07-04	2	-2/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Kent Shikama <kent@kentshikama.com>
\| *	Use .get() instead of [] to access password_hash	Kent Shikama	2016-07-04	1	-1/+1
\| \|
\| *	Optionally include password hash in createUser endpoint	Kent Shikama	2016-07-03	2	-3/+5
\|/ \| \| \|	Signed-off-by: Kent Shikama <kent@kentshikama.com>
*	code_style.rst: add link to sphinx examples	Richard van der Hoff	2016-07-01	1	-1/+3
\|
*	code_style.rst: fix link to google style	Richard van der Hoff	2016-07-01	1	-1/+1
\|
*	code_style.rst: add link to google style	Richard van der Hoff	2016-07-01	1	-2/+3
\|
*	Merge pull request #903 from matrix-org/erikj/deactivate_user	Erik Johnston	2016-06-30	3	-0/+40
\|\ \| \| \| \|	Feature: Add deactivate account admin API
\| *	Feature: Add deactivate account admin API	Erik Johnston	2016-06-30	3	-0/+40
\|/ \| \| \| \| \| \| \| \| \|	Allows server admins to "deactivate" accounts, which: - Revokes all access tokens - Removes all threepids - Removes password The API is a POST to `/admin/deactivate/<user_id>`
*	Merge pull request #902 from matrix-org/erikj/expire_media	Erik Johnston	2016-06-29	7	-21/+190
\|\ \| \| \| \|	Feature: Implement purge_media_cache admin API
\| *	Remove race	Erik Johnston	2016-06-29	1	-11/+0
\| \|
\| *	Implement purge_media_cache admin API	Erik Johnston	2016-06-29	5	-20/+130
\| \|
\| *	Track approximate last access time for remote media	Erik Johnston	2016-06-29	4	-1/+71
\|/
*	Merge pull request #900 from RickCogley/RickCogley-coturn-readme-2	David Baker	2016-06-28	1	-7/+12
\|\ \| \| \| \|	Rick cogley coturn readme 2
\| *	Update turn-howto.rst to use git clone (2)	Rick Cogley	2016-06-28	1	-1/+5
\| \| \| \| \| \| \| \| \| \|	Not logical to use svn checkout against a github repo, so changed to git clone. Signed-off-by: Rick Cogley <rick.cogley@esolia.co.jp>
\| *	Update turn-howto.rst to use git clone	Rick Cogley	2016-06-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	svn checkout is not logical for a checkout from github, so changed the checkout to "git clone". thanks @dbkr Signed-off-by: Rick Cogley <rick.cogley@esolia.co.jp>
\| *	Remove double spaces	Rick Cogley	2016-06-28	1	-12/+11
\| \| \| \| \| \|	Reading the RST spec, I was trying to get breaks to appear by entering the double spaces after the lines in the code blocks. It does not work anyway, and, as pointed out, I've removed.
\| *	Update to reflect new location at github.	Rick Cogley	2016-06-26	1	-16/+18
\| \| \| \| \| \|	Additionally it does not appear there is turnserver.conf.default, but rather, just /etc/turnserver.conf.
* \|	Merge pull request #894 from matrix-org/dbkr/push_room_naming	David Baker	2016-06-28	7	-121/+26
\|\ \ \| \| \| \| \| \|	Use similar naming we use in email notifs for push
\| * \	Merge remote-tracking branch 'origin/develop' into dbkr/push_room_naming	David Baker	2016-06-24	3	-4/+7
\| \|\ \
\| * \| \|	Remove room name & alias test	David Baker	2016-06-24	1	-41/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as get_room_name_and_alias is now gone
\| * \| \|	even more pep8	David Baker	2016-06-24	1	-0/+1
\| \| \| \|
\| * \| \|	more pep8	David Baker	2016-06-24	1	-1/+0
\| \| \| \|
\| * \| \|	pep8	David Baker	2016-06-24	1	-1/+0
\| \| \| \|
\| * \| \|	Use similar naming we use in email notifs for push	David Baker	2016-06-24	6	-79/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://github.com/vector-im/vector-web/issues/1654
* \| \| \|	remove vector.im from default secondary DS list	Matthew Hodgson	2016-06-27	1	-1/+0
\| \|/ / \|/\| \|
* \| \|	Merge pull request #895 from matrix-org/markjh/jenkins_port_range	Mark Haines	2016-06-24	3	-4/+7
\|\ \ \ \| \|/ / \|/\| \|	Fix the sytests to use a port-range rather than a port base
\| * \|	Fix the sytests to use a port-range rather than a port base	Mark Haines	2016-06-24	3	-4/+7
\|/ /
* \|	Merge branch 'master' into develop	Mark Haines	2016-06-23	2	-27/+152
\|\\|
\| *	Merge pull request #889 from matrix-org/markjh/synctl_workers	Mark Haines	2016-06-21	1	-27/+151
\| \|\ \| \| \| \| \| \|	Optionally start or stop workers in synctl.
\| \| *	Optionally start or stop workers in synctl.	Mark Haines	2016-06-21	1	-27/+151
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optionally start or stop an individual worker by passing -w with the path to the worker config. Optionally start or stop every worker and the main synapse by passing -a with a path to a directory containing worker configs. The "-w" is intended to be used to bounce individual workers proceses. THe "-a" is intended for when you want to restart all the workers simultaneuously, for example when performing database upgrades.
\| * \|	Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse v0.16.1	Erik Johnston	2016-06-20	40	-517/+617
\| \|\ \
\| * \| \|	point to the CAPTCHA docs	Matthew Hodgson	2016-06-12	1	-0/+1
\| \| \| \|
* \| \| \|	Merge pull request #892 from matrix-org/dbkr/email_notif_most_recent	David Baker	2016-06-23	1	-4/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Put most recent 20 messages in notif
\| * \| \| \|	Actually we need to order these properly	David Baker	2016-06-22	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	otherwise we'll end up returning the wrong 20
\| * \| \| \|	Style	David Baker	2016-06-22	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Put most recent 20 messages in notif	David Baker	2016-06-22	1	-3/+4
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://github.com/vector-im/vector-web/issues/1648
* \| \| \|	Merge pull request #843 from mweinelt/ldap3-rewrite	Erik Johnston	2016-06-22	4	-60/+249
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Rewrite LDAP Authentication against ldap3
\| * \| \| \|	Rework ldap integration with ldap3	Martin Weinelt	2016-06-22	4	-60/+249
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the pure-python ldap3 library, which eliminates the need for a system dependency. Offer both a `search` and `simple_bind` mode, for more sophisticated ldap scenarios. - `search` tries to find a matching DN within the `user_base` while employing the `user_filter`, then tries the bind when a single matching DN was found. - `simple_bind` tries the bind against a specific DN by combining the localpart and `user_base` Offer support for STARTTLS on a plain connection. The configuration was changed to reflect these new possibilities. Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>
* \| \| \|	Merge pull request #888 from matrix-org/markjh/content_repo	Mark Haines	2016-06-21	3	-132/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove the legacy v0 content upload API.
\| * \| \| \|	Remove the legacy v0 content upload API.	Mark Haines	2016-06-21	3	-132/+3
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The existing content can still be downloaded. The last upload to the matrix.org server was in January 2015, so it is probably safe to remove the upload API.
* \| \| \|	Merge pull request #887 from matrix-org/dbkr/notif_template_subs_fail	David Baker	2016-06-21	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix substitution failure in mail template
\| * \| \| \|	Fix substitution failure in mail template	David Baker	2016-06-21	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #879 from matrix-org/erikj/linearize_fed_server	Erik Johnston	2016-06-20	2	-67/+78
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Linearize some federation endpoints based on (origin, room_id)
\| * \| \|	Linearize some federation endpoints based on (origin, room_id)	Erik Johnston	2016-06-17	2	-67/+78
\| \|/ /
* \| \|	Bump version and changelog	Erik Johnston	2016-06-20	2	-1/+16
\| \| \|
* \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.1	Erik Johnston	2016-06-20	18	-355/+251
\|\ \ \
\| * \ \	Merge pull request #880 from matrix-org/markjh/registered_user	Mark Haines	2016-06-17	4	-27/+25
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Remove registered_users from the distributor.
\| \| * \|	Add the create_profile method back since the tests use it	Mark Haines	2016-06-17	1	-0/+6
\| \| \| \|
\| \| * \|	Add a comment on why we don't create a profile for upgrading users	Mark Haines	2016-06-17	1	-0/+1
\| \| \| \|
\| \| * \|	Remove registered_users from the distributor.	Mark Haines	2016-06-17	5	-33/+24
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The only place that was observed was to set the profile. I've made it so that the profile is set within store.register in the same transaction that creates the user. This required some slight changes to the registration code for upgrading guest users, since it previously relied on the distributor swallowing errors if the profile already existed.
\| * \|	Merge pull request #878 from matrix-org/erikj/ujson	Erik Johnston	2016-06-17	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Disable responding with canonical json for federation
\| \| * \|	Disable responding with canonical json for federation	Erik Johnston	2016-06-17	1	-1/+1
\| \| \| \|
\| * \| \|	Merge pull request #877 from matrix-org/erikj/frozen_default	Erik Johnston	2016-06-17	2	-1/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Turn use_frozen_events off by default
\| \| * \| \|	Enable use_frozen_events in tests	Erik Johnston	2016-06-17	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	Turn use_frozen_events off by default	Erik Johnston	2016-06-17	1	-1/+1
\| \| \|/ /
\| * \| \|	Merge pull request #876 from matrix-org/erikj/sign_own	Erik Johnston	2016-06-17	2	-12/+18
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Only re-sign our own events
\| \| * \| \|	Only re-sign our own events	Erik Johnston	2016-06-17	2	-12/+18
\| \| \|/ /
\| * \| \|	Merge pull request #875 from matrix-org/markjh/email_formatting	Mark Haines	2016-06-17	1	-14/+15
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Fix ``KeyError: 'msgtype'``. Use ``.get``
\| \| * \| \|	Fix ``KeyError: 'msgtype'``. Use ``.get``	Mark Haines	2016-06-17	1	-14/+15
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes a key error where the mailer tried to get the ``msgtype`` of an event that was missing a ``msgtype``. ``` File "synapse/push/mailer.py", line 264, in get_notif_vars File "synapse/push/mailer.py", line 285, in get_message_vars File ".../frozendict/__init__.py", line 10, in __getitem__ return self.__dict[key] KeyError: 'msgtype' ```
\| * / /	Fix setting gc thresholds in the workers	Mark Haines	2016-06-17	2	-2/+4
\| \|/ /
\| * \|	Merge pull request #874 from matrix-org/markjh/worker_config	Mark Haines	2016-06-17	6	-295/+181
\| \|\ \ \| \| \| \| \| \| \| \|	Inline the synchrotron and pusher configs into the main config
\| \| * \|	Use worker_ prefixes for worker config, use existing support for multiple ↵	Mark Haines	2016-06-16	5	-79/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config files
\| \| * \|	Access the event_cache_size directly from the server object.	Mark Haines	2016-06-16	5	-21/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This means that the workers can override the event_cache_size directly without clobbering the value in the main synapse config.
\| \| * \|	Access replication_url from the worker config directly	Mark Haines	2016-06-16	3	-8/+6
\| \| \| \|
\| \| * \|	Comment on what's going on in clobber_with_worker_config	Mark Haines	2016-06-16	1	-1/+12
\| \| \| \|
\| \| * \|	Merge remote-tracking branch 'origin/develop' into markjh/worker_config	Mark Haines	2016-06-16	12	-62/+140
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #873 from vt0r/bugfix/bcrypt-utf8-encode	Erik Johnston	2016-06-16	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Fix TypeError in call to bcrypt.hashpw
\| \| * \| \|	Fix TypeError in call to bcrypt.hashpw	Salvatore LaMendola	2016-06-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- At the very least, this TypeError caused logins to fail on my own running instance of Synapse, and the simple (explicit) UTF-8 conversion resolved login errors for me. Signed-off-by: Salvatore LaMendola <salvatore.lamendola@gmail.com>
\| * \| \| \|	Merge pull request #872 from matrix-org/erikj/preview_url_fixes	Erik Johnston	2016-06-16	1	-5/+6
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Fix some `/preview_url` explosions
\| \| * \| \|	Line lengths	Erik Johnston	2016-06-15	1	-3/+3
\| \| \| \| \|
\| \| * \| \|	Handle floats as img widths	Erik Johnston	2016-06-15	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Handle og props with not content	Erik Johnston	2016-06-15	1	-1/+2
\| \|/ / /
\| * \| \|	Merge pull request #867 from matrix-org/markjh/enable_jenkins_synchrotron	Mark Haines	2016-06-15	1	-0/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Enable testing the synchrotron on jenkins
\| \| * \| \|	Enable testing the synchrotron on jenkins	Mark Haines	2016-06-10	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse into develop	Erik Johnston	2016-06-15	2	-2/+28
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Update change log v0.16.1-rc1	Erik Johnston	2016-06-15	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	Bump version and changelog	Erik Johnston	2016-06-15	2	-2/+27
\|/ / / /
* \| \| \|	Merge pull request #871 from matrix-org/erikj/linearize_state_fetch_on_pdu	Erik Johnston	2016-06-15	4	-37/+58
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Linearize fetching of gaps on incoming events
\| * \| \| \|	Linearize fetching of gaps on incoming events	Erik Johnston	2016-06-15	4	-37/+58
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This potentially stops the server from doing multiple requests for the same data.
* \| \| \|	Merge pull request #870 from matrix-org/rav/work_around_tls_bug	Richard van der Hoff	2016-06-15	1	-2/+26
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Work around TLS bug in twisted
\| * \| \| \|	Work around TLS bug in twisted	Richard van der Hoff	2016-06-15	1	-2/+26
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wrap up twisted's FileBodyProducer to work around https://twistedmatrix.com/trac/ticket/8473. Hopefully this fixes https://matrix.org/jira/browse/SYN-700.
* \| \| \|	Merge pull request #869 from matrix-org/erikj/backfill_fix	Erik Johnston	2016-06-15	1	-14/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Correctly mark backfilled events as backfilled
\| * \| \| \|	Correctly mark backfilled events as backfilled	Erik Johnston	2016-06-15	1	-14/+16
\|/ / / /
* \| \| \|	Merge pull request #868 from matrix-org/erikj/invalid_id	Erik Johnston	2016-06-14	1	-1/+4
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Make get_domain_from_id throw SynapseError on invalid ID
\| * \| \|	Make get_domain_from_id throw SynapseError on invalid ID	Erik Johnston	2016-06-14	1	-1/+4
\| \| \| \|
\| \| \| *	Add worker config module	Mark Haines	2016-06-16	1	-0/+71
\| \| \| \|
\| \| \| *	Inline the synchrotron and pusher configs into the main config	Mark Haines	2016-06-16	5	-291/+154
\| \|_\|/ \|/\| \|
* \| \|	Merge pull request #866 from bartekrutkowski/develop	Erik Johnston	2016-06-10	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Change /bin/bash to /bin/sh in tox.ini
\| * \| \|	Change /bin/bash to /bin/sh in tox.ini	Bartek Rutkowski	2016-06-10	1	-2/+2
\| \|/ / \| \| \| \| \| \|	No features of Bash are used here, so using /bin/sh makes it more portable to systems that don't have Bash natively (like BSD systems).
* \| \|	Merge pull request #863 from matrix-org/markjh/load_config	Mark Haines	2016-06-10	4	-48/+126
\|\ \ \ \| \|/ / \|/\| \|	Add function to load config without generating it
\| * \|	Add function to load config without generating it	Mark Haines	2016-06-09	4	-48/+126
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renames ``load_config`` to ``load_or_generate_config`` Adds a method called ``load_config`` that just loads the config. The main synapse.app.homeserver will continue to use ``load_or_generate_config`` to retain backwards compat. However new worker processes can use ``load_config`` to load the config avoiding some of the cruft needed to generate the config. As the new ``load_config`` method is expected to be used by new configs it removes support for the legacy commandline overrides that ``load_or_generate_config`` supports
* \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2016-06-09	4	-8/+20
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse v0.16.0	Erik Johnston	2016-06-09	218	-5459/+13401
\| \|\
\| \| *	Change CHANGELOG	Erik Johnston	2016-06-09	1	-1/+1
\| \| \|
\| \| *	Bump version and changelog	Erik Johnston	2016-06-09	2	-1/+11
\| \| \|
\| * \|	Merge pull request #801 from ruma/readme-history-storage	Matthew Hodgson	2016-05-29	1	-6/+7
\| \|\ \ \| \| \| \| \| \| \| \|	Alter phrasing to clarify where info is stored.
\| \| * \|	Alter phrasing to clarify where info is stored.	Jimmy Cuadra	2016-05-29	1	-6/+7
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A user on #matrix:matrix.org was confused by the phrasing of the first sentence in the paragraph and couldn't tell whether it was saying that the homeserver stored the data or the clients did. This change splits it into two sentences to make the subject of each sentence clear.
\| * \|	Merge pull request #766 from sbts/patch-1	Erik Johnston	2016-05-09	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Fix Typo in README.rst s/Halp/Help/
\| \| * \|	Fix Typo in README.rst s/Halp/Help/	David	2016-05-06	1	-1/+1
\| \|/ /
\| * \|	Merge pull request #728 from OlegGirko/systemd_env_file	Erik Johnston	2016-04-18	1	-0/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Add environment file to systemd unit configuration.
\| \| * \|	Add environment file to systemd unit configuration.	Oleg Girko	2016-04-14	1	-0/+1
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now there is at least one environment variable that controls synapse server's behaviour: SYNAPSE_CACHE_FACTOR. So, it makes sense to make systemd unit file to use environment configuration file that can set this variable's value. Signed-off-by: Oleg Girko <ol@infoserver.lv>
* \| \|	Merge pull request #862 from matrix-org/erikj/media_remote_error	Erik Johnston	2016-06-09	1	-4/+10
\|\ \ \ \| \| \| \| \| \| \| \|	502 on /thumbnail when can't contact remote server
\| * \| \|	502 on /thumbnail when can't contact remote server	Erik Johnston	2016-06-09	1	-4/+10
\| \| \| \|
* \| \| \|	Merge pull request #860 from negzi/bug_fix_get_or_create_user	Erik Johnston	2016-06-09	2	-8/+5
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Fix a bug caused by a change in auth_handler function
\| * \| \|	Fix a bug caused by a change in auth_handler function	Negar Fazeli	2016-06-08	2	-8/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the relevant unit test cases
* \| \| \|	Merge pull request #861 from matrix-org/erikj/events_log	Erik Johnston	2016-06-09	1	-24/+21
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Remove redundant exception log in /events
\| * \| \|	Remove redundant exception log in /events	Erik Johnston	2016-06-09	1	-24/+21
\|/ / /
* \| \|	Merge pull request #859 from matrix-org/erikj/public_room_performance	Erik Johnston	2016-06-08	1	-16/+16
\|\ \ \ \| \| \| \| \| \| \| \|	Pull full state for each room all at once
\| * \| \|	Pull full state for each room all at once	Erik Johnston	2016-06-08	1	-16/+16
\| \| \| \|
* \| \| \|	Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2016-06-08	2	-1/+28
\|\ \ \ \ \| \|/ / / \|/\| \| / \| \| \|/ \| \|/\|
\| * \|	Update commit hash in changelog v0.16.0-rc2	Erik Johnston	2016-06-08	1	-1/+1
\| \| \|
\| * \|	Bump version and changelog to v0.16.0-rc2	Erik Johnston	2016-06-08	2	-1/+28
\| \| \|
\| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.0	Erik Johnston	2016-06-08	22	-398/+997
\| \|\ \
* \| \ \	Merge pull request #857 from matrix-org/erikj/default_visibility	Erik Johnston	2016-06-08	1	-2/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Don't make rooms visibile by default
\| * \| \| \|	Don't make rooms visibile by default	Erik Johnston	2016-06-08	1	-2/+0
\| \| \| \| \|
* \| \| \| \|	Disable the synchrotron on jenkins until the sytest support lands (#855)	Mark Haines	2016-06-08	1	-1/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Disable the synchrotron on jenkins until the sytest support lands * Poke jenkins * Poke jenkins * Poke jenkins * Poke jenkins * Poke jenkins * Poke jenkins * Poke jenkins * Poke jenkins
* \| \| \|	Fix up federation PublicRoomList	Erik Johnston	2016-06-08	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #856 from matrix-org/erikj/fed_pub_rooms	Erik Johnston	2016-06-08	2	-5/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Enable auth on /publicRoom endpoints
\| * \| \| \|	Log user that is making /publicRooms calls	Erik Johnston	2016-06-08	1	-0/+7
\| \| \| \| \|
\| * \| \| \|	Enable auth on federation PublicRoomList	Erik Johnston	2016-06-08	1	-5/+0
\| \| \| \| \|
* \| \| \| \|	Merge pull request #854 from matrix-org/erikj/federation_logging	Erik Johnston	2016-06-08	1	-0/+19
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Add some logging for when servers ask for missing events
\| * \| \| \|	Add some logging for when servers ask for missing events	Erik Johnston	2016-06-08	1	-0/+19
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #853 from matrix-org/erikj/replication_noop	Erik Johnston	2016-06-08	5	-0/+15
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Don't hit DB for noop replications queries
\| * \| \|	Don't hit DB for noop replications queries	Erik Johnston	2016-06-08	5	-0/+15
\|/ / /
* \| \|	Merge pull request #850 from matrix-org/erikj/gc_threshold	Erik Johnston	2016-06-08	2	-0/+28
\|\ \ \ \| \| \| \| \| \| \| \|	Add gc_threshold to pusher and synchrotron
\| * \| \|	Add gc_threshold to pusher and synchrotron	Erik Johnston	2016-06-07	2	-0/+28
\| \| \| \|
* \| \| \|	Merge pull request #852 from matrix-org/erikj/gc_metrics	Erik Johnston	2016-06-08	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Add GC counts to metrics
\| * \| \| \|	Don't track total objects as its too expensive to calculate	Erik Johnston	2016-06-07	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Record some more GC metrics	Erik Johnston	2016-06-07	1	-0/+5
\| \| \| \| \|
* \| \| \| \|	Merge pull request #851 from matrix-org/markjh/jenkins_synchrotron	Mark Haines	2016-06-07	1	-0/+84
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Add script for running sytest with dendron
\| * \| \| \|	Add script for running sytest with dendron	Mark Haines	2016-06-07	1	-0/+84
\| \| \| \| \|
* \| \| \| \|	Merge pull request #849 from matrix-org/erikj/gc_threshold	Erik Johnston	2016-06-07	4	-6/+38
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Allow setting of gc.set_thresholds
\| * \| \| \|	Allow setting of gc.set_thresholds	Erik Johnston	2016-06-07	4	-6/+38
\| \|/ / /
* \| \| \|	Merge pull request #848 from matrix-org/markjh/unusedIV	Mark Haines	2016-06-07	4	-54/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Remove dead code.
\| * \| \|	Remove dead code.	Mark Haines	2016-06-07	4	-54/+0
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Loading push rules now happens in the datastore, so we can remove the methods that loaded them outside the datastore. The ``waiting_for_join_list`` in federation handler is populated by anything, so can be removed. The ``_get_members_events_txn`` method isn't called from anywhere so can be removed.
* \| \|	Merge pull request #847 from matrix-org/erikj/gc_tick	Erik Johnston	2016-06-07	1	-8/+6
\|\ \ \ \| \| \| \| \| \| \| \|	Change the way we do stats for GC
\| * \| \|	Also record number of unreachable objects	Erik Johnston	2016-06-07	1	-2/+4
\| \| \| \|
\| * \| \|	Change the way we do stats	Erik Johnston	2016-06-07	1	-7/+3
\|/ / /
* \| \|	Merge pull request #771 from matrix-org/erikj/gc_tick	Erik Johnston	2016-06-07	1	-0/+26
\|\ \ \ \| \| \| \| \| \| \| \|	Manually run GC on reactor tick.
\| * \| \|	Count number of GC collects	Erik Johnston	2016-05-16	1	-5/+11
\| \| \| \|
\| * \| \|	Add a comment	Erik Johnston	2016-05-13	1	-0/+5
\| \| \| \|
\| * \| \|	Manually run GC on reactor tick.	Erik Johnston	2016-05-09	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also adds a metric for amount of time spent in GC.
* \| \| \|	Merge pull request #846 from matrix-org/markjh/user_joined_notifier	Mark Haines	2016-06-07	1	-8/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Notify users for events in rooms they join.
\| * \| \| \|	Notify users for events in rooms they join.	Mark Haines	2016-06-07	1	-8/+6
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change how the notifier updates the map from room_id to user streams on receiving a join event. Make it update the map when it notifies for the join event, rather than using the "user_joined_room" distributor signal
* \| \| \|	Fix AS retries, but with correct ordering	Erik Johnston	2016-06-07	2	-6/+6
\| \| \| \|
* \| \| \|	Fix AS retries	Erik Johnston	2016-06-07	2	-5/+5
\| \| \| \|
* \| \| \|	Merge pull request #845 from matrix-org/markjh/synchrotron_presence	Mark Haines	2016-06-06	1	-1/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix a KeyError in the synchrotron presence
\| * \| \| \|	Fix a KeyError in the synchrotron presence	Mark Haines	2016-06-06	1	-1/+4
\| \| \| \| \|
* \| \| \| \|	Merge pull request #844 from matrix-org/markjh/yield_on_sleep	Mark Haines	2016-06-06	2	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Yield on the sleeps intended to backoff replication
\| * \| \| \| \|	Yield on the sleeps intended to backoff replication	Mark Haines	2016-06-06	2	-2/+2
\| \|/ / / /
* \| \| \| \|	.values() returns list of sets	Erik Johnston	2016-06-06	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #842 from matrix-org/erikj/presence_timer	Erik Johnston	2016-06-06	1	-33/+37
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Fire after 30s not 8h
\| * \| \| \|	Fix typos	Erik Johnston	2016-06-06	1	-32/+36
\| \| \| \| \|
\| * \| \| \|	Fire after 30s not 8h	Erik Johnston	2016-06-06	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #841 from matrix-org/erikj/event_counter	Erik Johnston	2016-06-06	1	-0/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Add metric counter for number of persisted events
\| * \| \| \|	Add metric counter for number of persisted events	Erik Johnston	2016-06-06	1	-0/+9
\| \| \| \| \|
* \| \| \| \|	Merge pull request #840 from matrix-org/erikj/event_write_through	Erik Johnston	2016-06-06	1	-0/+41
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Add events to cache when we persist them
\| * \| \| \|	Add events to cache when we persist them	Erik Johnston	2016-06-06	1	-0/+41
\|/ / / /
* \| \| \|	Merge pull request #836 from matrix-org/erikj/change_event_cache	Erik Johnston	2016-06-03	1	-54/+59
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Change the way we cache events
\| * \| \| \|	Don't rely on options when inserting event into cache	Erik Johnston	2016-06-03	1	-40/+43
\| \| \| \| \|
\| * \| \| \|	Change the way we cache events	Erik Johnston	2016-06-03	1	-39/+41
\| \| \| \| \|
* \| \| \| \|	Merge pull request #837 from matrix-org/markjh/synchrotron_presence_list	Mark Haines	2016-06-03	1	-5/+10
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Add get_presence_list_accepted to the broken caches in synchrotron
\| * \| \| \|	Fix spelling	Mark Haines	2016-06-03	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add get_presence_list_accepted to the broken caches in synchrotron	Mark Haines	2016-06-03	1	-4/+9
\|/ / / /
* \| \| \|	Merge pull request #835 from matrix-org/erikj/get_event_txn	Erik Johnston	2016-06-03	7	-200/+75
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove event fetching from DB threads
\| * \| \| \|	Remove event fetching from DB threads	Erik Johnston	2016-06-03	7	-200/+75
\| \| \| \| \|
* \| \| \| \|	Merge pull request #834 from matrix-org/dbkr/fix_email_from	David Baker	2016-06-03	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Fix email notif From
\| * \| \| \|	3rd time lucky: we'd already calculated it above	David Baker	2016-06-03	1	-3/+1
\| \| \| \| \|
\| * \| \| \|	Oops, we're using the dict form	David Baker	2016-06-03	1	-1/+3
\| \| \| \| \|
\| * \| \| \|	Add substitutions to email notif From	David Baker	2016-06-03	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2016-06-03	2	-5/+91
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Note that v0.15.x was never released v0.16.0-rc1	Erik Johnston	2016-06-03	1	-0/+2
\| \| \| \|
\| * \| \|	Bump changelog and version	Erik Johnston	2016-06-03	2	-1/+51
\| \| \| \|
\| * \| \|	Merge branch 'release-v0.15.0' of github.com:matrix-org/synapse into ↵	Erik Johnston	2016-06-03	2	-5/+39
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	release-v0.16.0
\| \| * \| \|	Bump changelog and version v0.15.0-rc1	Erik Johnston	2016-04-26	2	-5/+39
\| \| \| \| \|
* \| \| \| \|	Merge pull request #831 from matrix-org/markjh/synchrotronII	Mark Haines	2016-06-03	1	-0/+510
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add a separate process that can handle /sync requests
\| * \| \| \| \|	Clear the list of ongoing syncs on shutdown	Mark Haines	2016-06-03	1	-0/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Appease flake8	Mark Haines	2016-06-03	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Use ClientIpStore to record client ips	Mark Haines	2016-06-03	1	-3/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' into markjh/synchrotronII	Mark Haines	2016-06-03	14	-128/+197
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Send updates to the syncing users every ten seconds or immediately if ↵	Mark Haines	2016-06-03	1	-10/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	they've just come online
\| * \| \| \| \| \|	Add a separate process that can handle /sync requests	Mark Haines	2016-06-03	1	-0/+467
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #832 from matrix-org/erikj/presence_coount	Erik Johnston	2016-06-03	1	-5/+9
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Change def of small delta in presence stream. Add metrics.
\| * \| \| \| \| \|	Change metric style	Erik Johnston	2016-06-03	1	-5/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Presence metrics. Change def of small delta	Erik Johnston	2016-06-03	1	-5/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #833 from matrix-org/markjh/client_ips	Mark Haines	2016-06-03	2	-45/+71
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	Move insert_client_ip to a separate class
\| * \| \| \| \| \|	Move insert_client_ip to a separate class	Mark Haines	2016-06-03	2	-45/+71
\|/ / / / / /
* / / / / /	Fix typo	Erik Johnston	2016-06-03	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #822 from matrix-org/matthew/brand-from-header	Matthew Hodgson	2016-06-03	2	-2/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	brand the email from header
\| * \ \ \ \	Merge branch 'develop' into matthew/brand-from-header	Matthew Hodgson	2016-06-03	35	-206/+690
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'erikj/cache_perf' of github.com:matrix-org/synapse into develop	Erik Johnston	2016-06-03	2	-10/+34
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Pull out update_results_dict	Erik Johnston	2016-06-03	1	-8/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Small optimisation to CacheListDescriptor	Erik Johnston	2016-06-03	3	-14/+21
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make cachedList go a bit faster	Erik Johnston	2016-06-03	2	-20/+46
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #830 from matrix-org/erikj/metrics_perf	Erik Johnston	2016-06-03	8	-70/+82
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	Change CacheMetrics to be quicker
\| * \| \| \| \| \|	Change CacheMetrics to be quicker	Erik Johnston	2016-06-03	8	-70/+82
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We change it so that each cache has an individual CacheMetric, instead of having one global CacheMetric. This means that when a cache tries to increment a counter it does not need to go through so many indirections.
* \| \| \| \| \|	Merge pull request #829 from matrix-org/erikj/poke_notifier	Erik Johnston	2016-06-03	1	-4/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Poke notifier on next reactor tick
\| * \| \| \| \| \|	Poke notifier on next reactor tick	Erik Johnston	2016-06-03	1	-4/+7
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #828 from matrix-org/erikj/joined_hosts_for_room	Erik Johnston	2016-06-03	1	-16/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make get_joined_hosts_for_room use get_users_in_room
\| * \| \| \| \| \|	Make get_joined_hosts_for_room use get_users_in_room	Erik Johnston	2016-06-03	1	-16/+3
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #827 from matrix-org/markjh/more_slaved_methods	Mark Haines	2016-06-03	3	-6/+81
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add methods to events, account data and receipt slaves
\| * \| \| \| \| \|	Add methods to events, account data and receipt slaves	Mark Haines	2016-06-03	3	-6/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds the methods needed by /sync to the slaved events, account data and receipt stores.
* \| \| \| \| \| \|	Merge pull request #825 from matrix-org/erikj/cache_push_rules	Erik Johnston	2016-06-03	6	-52/+71
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load push rules in storage layer so that they get cached
\| * \| \| \| \| \| \|	Load push rules in storage layer, so that they get cached	Erik Johnston	2016-06-03	5	-44/+63
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove unnecessary sets	Erik Johnston	2016-06-03	1	-6/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Only get local users	Erik Johnston	2016-06-03	2	-3/+6
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #824 from matrix-org/markjh/slaved_presence_store	Mark Haines	2016-06-03	2	-3/+62
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a slaved store for presence
\| * \| \| \| \| \| \|	Add a slaved store for presence	Mark Haines	2016-06-03	2	-3/+62
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #823 from matrix-org/markjh/more_slaved_stores	Mark Haines	2016-06-03	4	-0/+152
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Add slaved stores for filters, tokens, and push rules
\| * \| \| \| \| \|	Add a comment explaining why the filter cache doesn't need exipiring	Mark Haines	2016-06-03	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add slaved stores for filters, tokens, and push rules	Mark Haines	2016-06-03	4	-0/+151
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #811 from matrix-org/erikj/state_users_in_room	Erik Johnston	2016-06-03	5	-28/+45
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use state to calculate get_users_in_room
\| * \| \| \| \| \|	Use state to calculate get_users_in_room	Erik Johnston	2016-06-01	5	-28/+45
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #809 from matrix-org/erikj/cache_receipts_in_room	Erik Johnston	2016-06-03	2	-4/+32
\|\\| \| \| \| \| \| \| \|/ / / / / \|/\| \| \| \| \|	Add get_users_with_read_receipts_in_room cache
\| * \| \| \| \|	Add get_users_with_read_receipts_in_room cache	Erik Johnston	2016-06-01	2	-4/+32
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #821 from matrix-org/dbkr/email_unsubscribe	David Baker	2016-06-02	6	-17/+125
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Email unsubscribe links that don't require logging in
\| * \| \| \| \| \|	peppate	David Baker	2016-06-02	1	-1/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Working unsubscribe links going straight to the HS	David Baker	2016-06-02	4	-6/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and authed by macaroons that let you delete pushers and nothing else
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into ↵	David Baker	2016-06-02	3	-31/+39
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dbkr/email_unsubscribe
\| * \ \ \ \ \ \	Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe	David Baker	2016-06-02	9	-563/+813
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe	David Baker	2016-06-02	14	-35/+44
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Email unsubscribing that may in theory, work	David Baker	2016-06-02	3	-6/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Were it not for that fact that you can't use the base handler in the pusher because it pulls in the world. Comitting while I fix that on a different branch.
\| * \| \| \| \| \| \| \| \|	WIP on unsubscribing email notifs without logging in	David Baker	2016-06-01	2	-10/+70
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #820 from matrix-org/dbkr/email_notif_string_fmt_error	David Baker	2016-06-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|	Fix error in email notification string formatting
\| * \| \| \| \| \| \| \| \|	Fix error in email notification string formatting	David Baker	2016-06-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \|	brand the email from header	Matthew Hodgson	2016-06-02	2	-2/+9
\| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	add some branding debugging	Matthew Hodgson	2016-06-02	1	-0/+1
\|/ / / / / / / /
* \| \| / / / / /	Store the typing users as user_id strings. (#819)	Mark Haines	2016-06-02	2	-30/+38
\| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Rather than storing them as UserID objects.
* \| \| \| \| \| \|	Fix setting the _clock in SQLBaseStore	Mark Haines	2016-06-02	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Deduplicate presence entries in sync (#818)	Mark Haines	2016-06-02	1	-0/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Allow external processes to mark a user as syncing. (#812)	Mark Haines	2016-06-02	4	-22/+174
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add infrastructure to the presence handler to track sync requests in external processes * Expire stale entries for dead external processes * Add an http endpoint for making users as syncing Add some docstrings and comments. * Fixes
* \| \| \| \| \| \|	Merge pull request #817 from matrix-org/dbkr/split_out_auth_handler	David Baker	2016-06-02	10	-24/+23
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	Split out the auth handler
\| * \| \| \| \| \|	Split out the auth handler	David Baker	2016-06-02	10	-24/+23
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Disable INCLUDE_ALL_UNREAD_NOTIFS	Erik Johnston	2016-06-02	1	-1/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #800 from matrix-org/erikj/sync_refactor	Erik Johnston	2016-06-02	1	-537/+607
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor SyncHandler
\| * \| \| \| \| \| \|	Change short circuit path	Erik Johnston	2016-05-24	1	-16/+26
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Don't send down all ephemeral events	Erik Johnston	2016-05-24	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Only work out newly_joined_users for incremental sync	Erik Johnston	2016-05-24	1	-6/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Only include non-offline presence in initial sync	Erik Johnston	2016-05-24	1	-0/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Spell builder correctly	Erik Johnston	2016-05-24	1	-63/+63
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Inline function. Make load_filtered_recents private	Erik Johnston	2016-05-24	1	-17/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add comments	Erik Johnston	2016-05-24	1	-7/+105
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Shuffle things room	Erik Johnston	2016-05-24	1	-37/+33
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add back concurrently_execute	Erik Johnston	2016-05-23	1	-25/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Refactor SyncHandler	Erik Johnston	2016-05-23	1	-497/+481
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #814 from matrix-org/matthew/3pid_invite_auth	Matthew Hodgson	2016-06-02	1	-0/+18
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	special case m.room.third_party_invite event auth to match invites,
\| * \| \| \| \| \| \| \|	special case m.room.third_party_invite event auth to match invites, ↵	Matthew Hodgson	2016-06-01	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	otherwise they get out of sync and you get https://github.com/vector-im/vector-web/issues/1208
* \| \| \| \| \| \| \| \|	if an email pusher specifies a brand param, use it	Matthew Hodgson	2016-06-02	2	-3/+8
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|