David Baker ed72fc3a50 Merge branch 'develop' into pushrules2 ...

Conflicts:
	synapse/storage/schema/pusher.sql

2015-03-04 15:24:21 +00:00

..

api

Add RegisterFallbackResource to /_matrix/static/client/register

2015-02-23 15:14:56 +00:00

app

SYN-67: Finish up implementing new database schema management

2015-03-04 12:04:19 +00:00

appservice

Add functions to return whether an AS has exclusively claimed a matching namespace.

2015-02-27 11:03:56 +00:00

config

Merge pull request #83 from matrix-org/nofile_limit_config

2015-03-02 13:52:16 +00:00

crypto

Try to only back off if we think we failed to connect to the remote

2015-02-17 18:13:34 +00:00

events

pyflakes

2015-02-11 16:52:22 +00:00

federation

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

2015-03-02 13:53:30 +00:00

handlers

Merge pull request #93 from matrix-org/application-services-exclusive

2015-03-02 14:56:32 +00:00

http

Fix bug which prevented the HS pushing events to the AS due to FrozenEvents

2015-03-02 15:36:37 +00:00

push

s/user_name/user/ as per mjark's comment

2015-03-02 18:17:19 +00:00

rest

Merge branch 'develop' into pushrules2

2015-03-04 14:56:41 +00:00

storage

Merge branch 'develop' into pushrules2

2015-03-04 15:24:21 +00:00

streams

Update copyright notices

2015-01-06 13:21:39 +00:00

util

Use contextlib.contextmanager instead of a custom class

2015-03-02 13:32:44 +00:00

__init__.py

Change version scheme

2015-02-20 15:00:14 +00:00

notifier.py

Notify appservices of invites mid-poll.

2015-02-27 09:39:12 +00:00

python_dependencies.py

Bump webclient version

2015-03-02 14:57:37 +00:00

server.py

Actually treat this as static content, not random Resources.

2015-02-23 15:35:09 +00:00

state.py

Factor out ExpiringCache from StateHandler

2015-02-16 16:16:47 +00:00

types.py

Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier

2015-01-28 17:16:12 +00:00