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

..

events

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

__init__.py

add in whitespace after copyright statements to improve legibility

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

auth.py

Modified /join/$identifier to support $identifier being a room ID in addition to a room alias.

2014-08-27 09:43:42 +01:00

constants.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

errors.py

Added M_UNKNOWN_TOKEN error code and send it when there is an unrecognised access_token

2014-08-14 13:47:39 +01:00

urls.py

Added /matrix/content path, HS resource_for_content_repo attribute and FileUploadResource. Added stub methods.

2014-08-18 17:18:54 +01:00