Mark Haines 2a0ec3b89d Merge branch 'develop' into markjh/edu_frequency ...

Conflicts:
	synapse/handlers/federation.py
	synapse/handlers/room.py

2015-12-02 10:40:22 +00:00

..

api

Add API for setting account_data globaly or on a per room basis

2015-12-01 18:41:32 +00:00

app

Run the background updates when starting synapse.

2015-11-10 15:50:58 +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 'develop' into markjh/edu_frequency

2015-12-02 10:40:22 +00:00

http

Host /unstable and /r0 versions of r0 APIs

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

metrics

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

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

push

Use raw string for regex here, otherwise \b is the backspace character. Fixes displayname matching.

2015-10-08 11:22:15 +01:00

rest

Add API for setting account_data globaly or on a per room basis

2015-12-01 18:41:32 +00:00

static/client

Updates to fallback CAS login to do new token login

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

storage

Add API for setting account_data globaly or on a per room basis

2015-12-01 18:41:32 +00:00

streams

s/private_user_data/account_data/

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

util

Run the background updates when starting synapse.

2015-11-10 15:50:58 +00:00

__init__.py

Bump changes and version

2015-11-19 13:09:48 +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

Remove the LockManager class because it wasn't being used

2015-11-04 14:08:15 +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