Mark Haines 5fc03449c8 Merge pull request #440 from matrix-org/daniel/ise ...

Include errcode on Internal Server Error

2015-12-16 11:26:55 +00:00

..

api

Only include the archived rooms if a include_leave flag in set in the filter

2015-12-04 17:32:09 +00:00

app

Actually host r0 and unstable prefixes

2015-12-08 15:26:52 +00:00

appservice

Cap the time to retry txns to appservices to 8.5 minutes

2015-10-21 10:10:55 +01:00

config

Added a single line to explain what the server_name is used for

2015-12-02 00:37:55 +01:00

crypto

Fix typo

2015-11-20 17:17:58 +00:00

events

Only add the user_id if the sender is present

2015-12-01 11:14:48 +00:00

federation

Host /unstable and /r0 versions of r0 APIs

2015-12-01 17:34:32 +00:00

handlers

Merge branch 'release-v0.12.0' into develop

2015-12-16 11:18:45 +00:00

http

Include errcode on Internal Server Error

2015-12-14 13:50:50 +00:00

metrics

Check that /proc/self/fd exists before listing it

2015-09-07 16:45:55 +01:00

push

pep8

2015-12-09 15:57:42 +00:00

rest

Fix spacing

2015-12-14 15:20:59 +00:00

static/client

Updates to fallback CAS login to do new token login

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

storage

Merge branch 'release-v0.12.0' into develop

2015-12-16 11:18:45 +00:00

streams

s/private_user_data/account_data/

2015-11-18 15:31:04 +00:00

util

Track the time spent in the database per request.

2015-12-07 17:56:11 +00:00

__init__.py

Changelog and version bump for v0.12.0-rc2

2015-12-14 16:26:59 +00:00

notifier.py

Return non-room events from guest /events calls

2015-11-12 16:45:28 +00:00

python_dependencies.py

Add nacl.bindings to the list of modules checked. Re-arrange import order to check packages after the packages they depend on

2015-09-01 16:51:10 +01:00

server.py

Actually host r0 and unstable prefixes

2015-12-08 15:26:52 +00:00

state.py

Update some comments

2015-11-13 10:31:15 +00:00

types.py

s/private_user_data/account_data/

2015-11-18 15:31:04 +00:00