Neil Johnson 85b8acdeb4 Merge branch 'master' into develop

2018-05-16 16:48:10 +01:00

..

api

Apply some limits to depth to counter abuse

2018-05-01 17:54:19 +01:00

app

Merge pull request #3163 from matrix-org/cohort_analytics

2018-05-16 10:09:24 +00:00

appservice

Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background

2018-04-27 14:31:23 +01:00

config

ConsentResource to gather policy consent from users

2018-05-15 15:11:59 +01:00

crypto

Fixes #3135 - Replace _OpenSSLECCurve with crypto.get_elliptic_curve (#3157)

2018-04-30 16:21:11 +01:00

events

add comment explaining attributeerror

2018-04-30 09:49:10 +02:00

federation

Merge pull request #3209 from damir-manapov/master

2018-05-11 00:35:13 +01:00

groups

Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background

2018-04-27 14:31:23 +01:00

handlers

Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivate

2018-05-14 11:31:48 +01:00

http

Merge pull request #3213 from matrix-org/rav/consent_handler

2018-05-16 07:19:18 +01:00

metrics

Note that label values can be anything

2018-05-03 16:25:05 +01:00

module_api

Delete devices in various logout situations

2017-11-29 16:44:35 +00:00

push

Merge pull request #3152 from NotAFile/py3-local-imports

2018-04-30 01:28:13 +01:00

replication

make imports local

2018-04-28 13:41:41 +02:00

rest

Merge pull request #3213 from matrix-org/rav/consent_handler

2018-05-16 07:19:18 +01:00

static/client

Updates to fallback CAS login to do new token login

2015-11-06 09:57:17 +00:00

storage

Merge pull request #3163 from matrix-org/cohort_analytics

2018-05-16 10:09:24 +00:00

streams

replace 'except:' with 'except Exception:'

2017-10-23 15:52:32 +01:00

util

Merge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_fail

2018-05-03 14:59:29 +01:00

__init__.py

bump version and changelog for 0.29.0

2018-05-16 15:44:59 +01:00

event_auth.py

Fix templating error with unban permission message

2018-01-07 19:52:58 -07:00

notifier.py

Merge remote-tracking branch 'origin/develop' into rav/deferred_timeout

2018-04-27 14:18:00 +01:00

python_dependencies.py

Miscellaneous fixes to python_dependencies

2018-05-01 18:13:54 +01:00

server.py

ConsentResource to gather policy consent from users

2018-05-15 15:11:59 +01:00

server.pyi

Factor out resolve_state_groups to a separate handler

2018-02-01 12:40:04 +00:00

state.py

Measure time it takes to calculate state group ID

2018-03-28 11:03:52 +01:00

types.py

In DomainSpecificString, override __repr__ in addition to __str__

2018-04-10 11:35:29 +02:00

visibility.py

Remove preserve_context_over_{fn, deferred}

2017-11-14 11:22:42 +00:00