summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-11 17:46:23 +0000
committerErik Johnston <erik@matrix.org>2014-12-11 17:46:23 +0000
commit85574cfbf06ffab46b511ec684b40fb8239b7807 (patch)
tree6596757f5eabfd708df0fc42de2320bb27517de0 /synapse/api
parentImplement .cancel_call_later() in MockClock (diff)
parentAllow only one download for a given image at a time, so that we don't end up ... (diff)
downloadsynapse-85574cfbf06ffab46b511ec684b40fb8239b7807.tar.xz
Merge pull request #23 from matrix-org/media_repository
Media repository
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/errors.py1
-rw-r--r--synapse/api/urls.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py

index 581439ceb3..e250b9b211 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py
@@ -34,6 +34,7 @@ class Codes(object): LIMIT_EXCEEDED = "M_LIMIT_EXCEEDED" CAPTCHA_NEEDED = "M_CAPTCHA_NEEDED" CAPTCHA_INVALID = "M_CAPTCHA_INVALID" + TOO_LARGE = "M_TOO_LARGE" class CodeMessageException(Exception): diff --git a/synapse/api/urls.py b/synapse/api/urls.py
index 6dc19305b7..d7625127f8 100644 --- a/synapse/api/urls.py +++ b/synapse/api/urls.py
@@ -20,3 +20,4 @@ FEDERATION_PREFIX = "/_matrix/federation/v1" WEB_CLIENT_PREFIX = "/_matrix/client" CONTENT_REPO_PREFIX = "/_matrix/content" SERVER_KEY_PREFIX = "/_matrix/key/v1" +MEDIA_PREFIX = "/_matrix/media/v1"