Jeroen b5e157d895 Merge branch 'develop' into send_sni_for_federation_requests ...

# Conflicts:
#	synapse/http/endpoint.py

2018-07-09 08:51:11 +02:00

..

api

Implementation of server_acls

2018-07-04 19:06:20 +01:00

app

send SNI for federation requests

2018-06-24 22:38:43 +02:00

appservice

add ip_range_whitelist parameter to limit where ASes can connect from

2018-06-28 20:32:00 +01:00

config

More server_name validation

2018-07-04 18:59:51 +01:00

crypto

Merge branch 'develop' into send_sni_for_federation_requests

2018-07-09 08:51:11 +02: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

Implementation of server_acls

2018-07-04 19:06:20 +01:00

groups

Replace some more comparisons with six

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

handlers

Merge pull request #3456 from matrix-org/hawkowl/federation-prevevent-checking

2018-06-29 13:55:02 +01:00

http

Merge branch 'develop' into send_sni_for_federation_requests

2018-07-09 08:51:11 +02:00

metrics

Attempt to be more performant on PyPy (#3462)

2018-06-28 14:49:57 +01:00

module_api

Delete devices in various logout situations

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

push

Remove all global reactor imports & pass it around explicitly (#3424)

2018-06-25 14:08:28 +01:00

replication

Attempt to be more performant on PyPy (#3462)

2018-06-28 14:49:57 +01:00

rest

Attempt to be more performant on PyPy (#3462)

2018-06-28 14:49:57 +01: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

Invalidate cache on correct thread

2018-07-02 11:36:44 +01:00

streams

replace 'except:' with 'except Exception:'

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

util

Attempt to be more performant on PyPy (#3462)

2018-06-28 14:49:57 +01:00

__init__.py

version

2018-07-07 10:48:06 +10:00

event_auth.py

Avoid relying on int vs None comparison

2018-07-02 11:40:32 +01:00

notifier.py

Pass around the reactor explicitly (#3385)

2018-06-22 09:37:10 +01:00

python_dependencies.py

Correct attrs package name in requirements (#3492)

2018-07-07 10:46:59 +10:00

server.py

Pass around the reactor explicitly (#3385)

2018-06-22 09:37:10 +01:00

server.pyi

Send users a server notice about consent

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

state.py

fix idiotic typo in state res

2018-06-11 14:43:55 +01:00

types.py

In DomainSpecificString, override __repr__ in addition to __str__

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

visibility.py

Revert "Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility""

2018-06-25 13:42:55 +01:00