Erik Johnston 335e5d131c Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop ...

Conflicts:
	tests/handlers/test_profile.py

2014-09-18 14:31:47 +01:00

..

api

Merge branch 'develop' into test-sqlite-memory

2014-09-17 18:27:47 +01:00

app

prepare_database() on db_conn, not plain name, so we can pass in the connection from outside

2014-09-10 16:23:58 +01:00

config

Added support for the HS to send emails. Use it to send password resets. Added email_smtp_server and email_from_address config args. Added emailutils.

2014-09-16 12:36:39 +01:00

crypto

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

federation

Fix bug where we incorrectly calculated 'age_ts' from 'age' key rather than the reverse. Don't transmit age_ts to clients for now.

2014-09-15 16:55:39 +01:00

handlers

SYWEB-3 : Added 'visibility' key to rooms returned via /initialSync

2014-09-17 16:09:07 +01:00

http

Fix 'age' key to update on retries

2014-09-15 16:24:03 +01:00

rest

Comment out password reset for now, until the mechanism is fully discussed (IS token auth vs HS auth)

2014-09-16 13:32:33 +01:00

storage

Merge branch 'develop' into test-sqlite-memory

2014-09-17 18:27:47 +01:00

streams

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

util

Added support for the HS to send emails. Use it to send password resets. Added email_smtp_server and email_from_address config args. Added emailutils.

2014-09-16 12:36:39 +01:00

__init__.py

Bump versions

2014-09-17 17:49:01 +01:00

notifier.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00

server.py

Merge remote-tracking branch 'origin/develop' into test-sqlite-memory

2014-09-15 14:15:10 +01:00

state.py

Make the state resolution use actual power levels rather than taking them from a Pdu key.

2014-09-12 17:11:09 +01:00

types.py

fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.

2014-09-03 17:31:57 +01:00