Mark Haines 998a72d4d9 Merge branch 'develop' into markjh/twisted-15 ...

Conflicts:
	synapse/http/matrixfederationclient.py

2015-08-12 17:21:14 +01:00

..

api

Add missing space because linter

2015-08-11 16:43:27 +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

Fix the --generate-keys option. Make it do the same thing as --generate-config does when the config file exists, but without printing a warning

2015-08-12 11:57:37 +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

Implement bulk verify_signed_json API

2015-06-26 10:39:34 +01:00

handlers

Add vector.im as trusted ID server

2015-08-03 15:31:21 +01:00

http

Merge branch 'develop' into markjh/twisted-15

2015-08-12 17:21:14 +01:00

metrics

Appease pep8

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

push

Oops: underride rule had an identifier with override in it.

2015-06-23 14:26:14 +01:00

rest

Don't try & check the username if we don't have one (which we won't if it's been saved in the auth layer)

2015-08-03 17:03:27 +01:00

storage

Use TypeError instead of ValueError and give a nicer error mesasge

2015-08-10 14:07:17 +01:00

streams

Wire together receipts and the notifer/federation

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

util

Make @cached cache deferreds rather than the deferreds' values

2015-08-06 13:33:34 +01:00

__init__.py

Bump changelog and version to v0.9.3

2015-07-01 15:12:32 +01:00

notifier.py

Improve naming

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

python_dependencies.py

Merge branch 'develop' into markjh/twisted-15

2015-08-12 17:21:14 +01:00

server.py

Correctly handle x_forwaded listener option

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

state.py

Merge pull request #180 from matrix-org/erikj/prev_state_context

2015-06-03 17:20:56 +01:00

types.py

Minor docs cleanup

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