Erik Johnston d72f897f07 Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ...

Conflicts:
	synapse/storage/stream.py

2014-08-15 11:50:14 +01:00

..

schema

Reimplement the get public rooms api to work with new DB schema

2014-08-15 10:26:35 +01:00

__init__.py

Reimplement the get public rooms api to work with new DB schema

2014-08-15 10:26:35 +01:00

_base.py

Reimplement the get public rooms api to work with new DB schema

2014-08-15 10:26:35 +01:00

directory.py

add in whitespace after copyright statements to improve legibility

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

feedback.py

Start fixing places that use the data store.

2014-08-14 17:34:37 +01:00

pdu.py

when we're talking about backfilling data in federation, call it backfilling - not pagination.

2014-08-13 18:17:09 +01:00

presence.py

An initial hack at storing presence state-change mtimes in database and presenting age durations to clients/federation events

2014-08-13 19:19:15 +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

Reimplement the get public rooms api to work with new DB schema

2014-08-15 10:26:35 +01:00

roommember.py

Fix up typos and correct sql queries

2014-08-14 18:40:50 +01:00

stream.py

Fix up typos and correct sql queries

2014-08-14 18:40:50 +01:00

transactions.py

add in whitespace after copyright statements to improve legibility

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