Neil Johnson fef6c2cdcc Merge branch 'master' into develop

2018-06-06 12:28:15 +01:00

..

api

Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (#3307)

2018-05-31 19:03:47 +10:00

app

Add hacky cache factor override system

2018-06-04 15:39:28 +01:00

appservice

also redact __str__ of ApplicationService used for logging

2018-06-06 10:35:29 +01:00

config

Changes in synapse v0.31.0 (2018-06-06)

2018-06-06 12:27:33 +01:00

crypto

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

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

events

Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (#3307)

2018-05-31 19:03:47 +10:00

federation

federation/send_queue.py: fix usage of sortedcontainers.SortedDict

2018-06-06 02:45:18 +03:00

groups

Replace some more comparisons with six

2018-05-19 17:56:31 +02:00

handlers

Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (#3307)

2018-05-31 19:03:47 +10:00

http

redact_uri in two missed log paths

2018-06-06 10:25:48 +01:00

metrics

Hopefully, fix LaterGuage error handling

2018-06-04 15:59:14 +01:00

module_api

Delete devices in various logout situations

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

push

Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (#3307)

2018-05-31 19:03:47 +10:00

replication

Fix replication metrics

2018-06-04 16:23:05 +01:00

rest

Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (#3307)

2018-05-31 19:03:47 +10:00

server_notices

Avoid sending consent notice to guest users

2018-05-25 11:36:43 +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 #3324 from matrix-org/rav/remove_dead_method

2018-06-04 18:18:08 +01:00

streams

replace 'except:' with 'except Exception:'

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

util

Port to sortedcontainers (with tests!) (#3332)

2018-06-06 00:13:57 +10:00

__init__.py

bump version and changelog

2018-06-06 11:26:21 +01:00

event_auth.py

Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (#3307)

2018-05-31 19:03:47 +10:00

notifier.py

cleanup pep8 errors

2018-05-22 16:54:22 -05:00

python_dependencies.py

Port to sortedcontainers (with tests!) (#3332)

2018-06-06 00:13:57 +10:00

server.py

Stub out ServerNoticesSender on the workers

2018-05-22 11:54:51 +01:00

server.pyi

Send users a server notice about consent

2018-05-22 11:54:51 +01:00

state.py

Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (#3307)

2018-05-31 19:03:47 +10: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