Erik Johnston 47519cd8c2 Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor ...

Conflicts:
	synapse/handlers/events.py
	synapse/rest/events.py
	synapse/rest/room.py

2014-08-27 14:13:06 +01:00

..

schema

Add a unique constraint on the room hosts table

2014-08-24 11:29:29 +01:00

__init__.py

Added support for GET /events/$eventid with auth checks.

2014-08-27 10:33:01 +01:00

_base.py

Stop internal keys from getting into SynapseEvents

2014-08-21 15:06:00 +01:00

directory.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

feedback.py

Feedback: Removed FeedbackRestServlet. Modified keys on FeedbackEvent. Expanded the feedback constants to fully explain what type of feedback they are.

2014-08-26 17:49:46 +01:00

pdu.py

Add a 'backfill room' button

2014-08-19 14:20:03 +01:00

presence.py

retcols is mandatory. i have no idea how this could ever have worked?

2014-08-16 01:46:35 +01:00

profile.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00

registration.py

Be more helpful when failing to register/login, stating why (communication error, user in user, wrong credentials, etc). Make the HS send M_USER_IN_USE.

2014-08-14 16:03:04 +01:00

room.py

Fix pyflakes errors

2014-08-26 16:02:59 +01:00

roommember.py

Fix pyflakes errors

2014-08-26 16:02:59 +01:00

stream.py

WIP: Completely change how event streaming and pagination work. This reflects the change in the underlying storage model.

2014-08-26 18:57:46 +01:00

transactions.py

add in whitespace after copyright statements to improve legibility

2014-08-13 03:14:34 +01:00