Kegan Dougal 53557fc532 Merge branch 'develop' into application-services

2015-02-09 15:20:56 +00:00

..

api

Modify auth.get_user_by_req for authing appservices directly.

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

app

Merge branch 'develop' into application-services

2015-02-09 15:20:56 +00:00

appservice

Fix bugs so lazy room joining works as intended.

2015-02-09 15:01:28 +00:00

config

Allow ':memory:' as the database path for sqlite3

2015-01-19 15:26:19 +00:00

crypto

Fix bug in timeout handling in keyclient

2015-01-30 11:08:01 +00:00

events

Rearrange persist_event so that do all the queries that need to be done before returning early if we have already persisted that event.

2015-02-04 10:16:51 +00:00

federation

Connection errors in twisted aren't RuntimeErrors

2015-02-05 13:50:15 +00:00

handlers

Merge branch 'develop' into application-services

2015-02-09 15:20:56 +00:00

http

Merge branch 'develop' into application-services

2015-02-09 15:20:56 +00:00

push

Fix server default rule injection (downwards, not upwards!)

2015-02-09 14:17:52 +00:00

rest

Merge branch 'develop' into application-services

2015-02-09 15:20:56 +00:00

storage

Merge branch 'develop' into application-services

2015-02-09 15:20:56 +00:00

streams

Update copyright notices

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

util

Add looping_call to Clock

2015-02-09 14:47:59 +00:00

__init__.py

Merge master into develop

2015-02-02 14:05:42 +00:00

notifier.py

Glue AS work to general event notifications. Add more exception handling when poking ASes.

2015-02-05 13:19:46 +00:00

python_dependencies.py

Merge pull request #46 from matrix-org/identicons

2015-02-02 18:56:34 +00:00

server.py

Merge branch 'develop' into application-services

2015-02-02 15:57:59 +00:00

state.py

Change context.auth_events to what the auth_events would be bases on context.current_state, rather than based on the auth_events from the event.

2015-02-04 14:06:46 +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