Daniel Wagner-Hall e8cf77fa49 Merge branch 'develop' into refresh ...

Conflicts:
	synapse/rest/client/v1/login.py

2015-08-20 16:25:40 +01:00

..

api

Merge branch 'develop' into refresh

2015-08-20 16:25:40 +01:00

app

Only print the pidfile path on startup if requested by a commandline flag

2015-08-07 16:36:42 +01:00

appservice

Make the appservice use 'users_in_room' rather than get_room_members since it is cached

2015-05-22 11:01:28 +01:00

config

Merge branch 'develop' into refresh

2015-08-20 16:25:40 +01:00

crypto

Merge pull request #194 from matrix-org/erikj/bulk_verify_sigs

2015-07-10 13:46:53 +01:00

events

Rename key and values for m.room.history_visibility. Support 'invited' value

2015-07-06 13:05:52 +01:00

federation

Merge pull request #208 from matrix-org/markjh/end-to-end-key-federation

2015-08-18 09:12:54 +01:00

handlers

Merge branch 'develop' into refresh

2015-08-20 16:25:40 +01:00

http

PEP8

2015-08-13 11:47:38 +01:00

metrics

Also check for presence of 'threadCallQueue' in reactor

2015-08-18 11:51:08 +01:00

push

Store the 'last_token' in the db, even if we processed no events

2015-08-19 10:08:31 +01:00

rest

Merge branch 'develop' into refresh

2015-08-20 16:25:40 +01:00

storage

Merge branch 'develop' into refresh

2015-08-20 16:25:40 +01:00

streams

Wire together receipts and the notifer/federation

2015-07-07 15:25:30 +01:00

util

Don't assume @cachedList function returns keys for everything

2015-08-18 11:11:33 +01:00

__init__.py

Bump version and changelog

2015-08-20 14:12:01 +01:00

notifier.py

Improve naming

2015-07-20 06:32:12 -07:00

python_dependencies.py

Switch to pymacaroons-pynacl

2015-08-19 13:21:36 +01:00

server.py

Correctly handle x_forwaded listener option

2015-06-12 17:13:23 +01:00

state.py

Move all the caches into their own package, synapse.util.caches

2015-08-11 18:00:59 +01:00

types.py

Minor docs cleanup

2015-08-11 16:35:28 +01:00