Mark Haines 2d4d2bbae4 Merge branch 'develop' into markjh/config_cleanup ...

Conflicts:
	synapse/config/captcha.py

2015-04-30 16:54:55 +01:00

..

api

Merge branch 'develop' into key_distribution

2015-04-29 13:15:14 +01:00

app

Merge branch 'develop' into markjh/config_cleanup

2015-04-30 16:54:55 +01:00

appservice

Fix more AS sender ID thinkos.

2015-04-01 14:05:24 +01:00

config

Merge branch 'develop' into markjh/config_cleanup

2015-04-30 16:54:55 +01:00

crypto

Use a defer.gatherResults to collect results from the perspective servers

2015-04-29 13:31:14 +01:00

events

Store the rejected reason in (Frozen)Event structs

2015-03-25 19:06:05 +00:00

federation

Add missing servlet to list

2015-03-19 17:48:21 +00:00

handlers

Make simple query rather than long one and then throw away half the results

2015-04-30 10:16:12 +01:00

http

Unused import

2015-04-30 13:33:30 +01:00

metrics

Appease pep8

2015-04-01 19:17:38 +01:00

push

Also log when we've started pushers

2015-04-29 18:37:42 +01:00

rest

Merge branch 'develop' into key_distribution

2015-04-29 13:15:14 +01:00

storage

Add get_rooms_for_user cache

2015-04-30 16:47:51 +01:00

streams

Update copyright notices

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

util

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

2015-04-27 14:41:40 +01:00

__init__.py

Bump version

2015-04-17 13:25:16 +01:00

notifier.py

Change from exception to warn

2015-04-15 15:12:57 +01:00

python_dependencies.py

bump syutil to 0.0.6

2015-04-29 14:16:41 +01:00

server.py

Manually generate the default config yaml, remove most of the commandline arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class

2015-04-30 04:24:44 +01:00

state.py

Remove concept of context.auth_events, instead use context.current_state

2015-03-16 13:06:23 +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