MatrixSynapse/synapse
Erik Johnston 57e0e619f3 Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts:
	tests/handlers/test_room.py
2014-12-15 14:45:59 +00:00
..
api Make auth module use EventTypes constants 2014-12-12 16:31:50 +00:00
app Get uploads working with new media repo 2014-12-02 19:51:47 +00:00
config Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop 2014-12-13 18:16:12 +00:00
crypto Try and figure out how and why signatures are being changed. 2014-12-10 11:37:47 +00:00
events Fix bug where we ignored event_edge_hashes table 2014-12-15 13:55:22 +00:00
federation Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor 2014-12-10 13:18:40 +00:00
handlers Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor 2014-12-15 14:45:59 +00:00
http Fix tests and remove debug logging 2014-12-12 15:08:29 +00:00
media Update docs in media_repository 2014-12-15 13:56:43 +00:00
rest Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor 2014-12-15 14:45:59 +00:00
storage Fix bug where we ignored event_edge_hashes table 2014-12-15 13:55:22 +00:00
streams Allow GET /room/:room_id/messages without 'limit' parameter to default to 10 2014-12-02 18:01:16 +00:00
util Add PEP8 newlines 2014-12-09 11:01:44 +00:00
__init__.py Bump version and change log 2014-12-13 18:04:37 +00:00
notifier.py Fix pep8 codestyle warnings 2014-11-20 17:26:36 +00:00
server.py Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor 2014-12-11 17:48:48 +00:00
state.py Fix public room joining by making sure replaces_state never points to itself. 2014-12-11 15:56:06 +00:00
types.py Change DomainSpecificString so that it doesn't use a HomeServer object 2014-12-02 10:42:28 +00:00