David Baker b8d9e108be Fix mergefail

2018-10-09 18:04:21 +01:00

..

api

Fix mergefail

2018-10-09 18:04:21 +01:00

app

Remove redundant call to start_get_pdu_cache

2018-09-28 12:01:23 +01:00

appservice

Port http/ to Python 3 (#3771)

2018-09-06 00:10:47 +10:00

config

Replaced all occurences of e.message with str(e)

2018-09-27 13:38:50 +02:00

crypto

Merge pull request #3826 from matrix-org/rav/logging_for_keyring

2018-09-12 20:43:47 +10:00

events

Disable frozen dicts by default (#3987)

2018-10-02 22:53:47 +10:00

federation

Merge pull request #3964 from matrix-org/rav/remove_localhost_checks

2018-09-28 13:35:47 +01:00

groups

Fix some looping_call calls which were broken in #3604

2018-07-26 11:48:08 +01:00

handlers

Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups

2018-10-09 10:05:02 +01:00

http

Fix error when logging incomplete requests

2018-10-02 12:06:22 +01:00

metrics

Fix exception in background metrics collection

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

module_api

Delete devices in various logout situations

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

push

fix link for case that config.email_riot_base_url is set

2018-09-13 22:43:50 +01:00

replication

Fix minor typo in exception

2018-09-13 11:51:12 -06:00

rest

isort

2018-10-09 10:33:59 +01:00

server_notices

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact

2018-08-24 17:00:37 +01:00

state

Logging improvements

2018-09-26 17:36:14 +01:00

static/client

Use recaptcha_ajax.js directly from Google

2018-08-22 14:30:49 +01:00

storage

Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups

2018-10-09 10:05:02 +01:00

streams

Fix develop because I broke it :( (#3535)

2018-07-14 09:51:00 +10:00

util

Correctly match 'dict.pop' api

2018-10-01 12:25:27 +01:00

__init__.py

full version

2018-10-04 22:37:55 +10:00

event_auth.py

Sanitise error messages when user doesn't have permission to invite

2018-10-03 14:13:07 +01:00

notifier.py

Run notify_app_services as a bg process

2018-09-26 17:00:40 +01:00

python_dependencies.py

Pin to prometheus_client<0.4 to avoid renaming all of our metrics

2018-10-03 17:20:15 +01:00

secrets.py

Port over enough to get some sytests running on Python 3 (#3668)

2018-08-20 23:54:49 +10:00

server.py

Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups

2018-10-09 10:05:02 +01:00

server.pyi

Send users a server notice about consent

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

types.py

Python 3: Convert some unicode/bytes uses (#3569)

2018-08-02 00:54:06 +10:00

visibility.py

Optimisation for filter_events_for_server

2018-10-08 13:46:52 +01:00