Mark Haines 5f5817ab05 Merge pull request #632 from matrix-org/markjh/py3v2 ...

Fix relative imports so they work in both py3 and py27

2016-03-08 18:11:10 +00:00

..

api

Send the user ID matching the guest access token, since there is no Matrix API to discover what user ID an access token is for.

2016-03-07 17:13:56 +00:00

app

Use syntax that works on both py2.7 and py3

2016-03-07 20:13:10 +00:00

appservice

Fix flake8 warnings for new flake8

2016-02-02 17:18:50 +00:00

config

Use syntax that works on both py2.7 and py3

2016-03-07 20:13:10 +00:00

crypto

Fix up logcontexts

2016-02-08 14:26:45 +00:00

events

Atomically persit push actions when we persist the event

2016-02-09 16:19:15 +00:00

federation

Add profile information to invites

2016-03-04 14:35:02 +00:00

handlers

Merge pull request #631 from matrix-org/markjh/py3v1

2016-03-08 11:08:20 +00:00

http

pep8

2016-03-08 10:09:07 +00:00

metrics

copyrights

2016-01-07 04:26:29 +00:00

push

Fix relative imports so they work in both py3 and py27

2016-03-08 11:45:50 +00:00

replication

s/stream_ordering/event_stream_ordering/ in push

2016-03-04 16:15:23 +00:00

rest

Fix relative imports so they work in both py3 and py27

2016-03-08 11:45:50 +00:00

static/client

Updates to fallback CAS login to do new token login

2015-11-06 09:57:17 +00:00

storage

Merge pull request #632 from matrix-org/markjh/py3v2

2016-03-08 18:11:10 +00:00

streams

Hook up the push rules to the notifier

2016-03-03 14:57:45 +00:00

util

Use syntax that works on both py2.7 and py3

2016-03-07 20:13:10 +00:00

__init__.py

Bump version and changelog

2016-02-11 16:04:15 +00:00

notifier.py

Hook up the push rules to the notifier

2016-03-03 14:57:45 +00:00

python_dependencies.py

Allow third_party_signed to be specified on /join

2016-02-23 15:11:25 +00:00

server.py

Fix flake8 warnings for new flake8

2016-02-02 17:18:50 +00:00

state.py

Fix flake8 warnings for new flake8

2016-02-02 17:18:50 +00:00

types.py

Hook up the push rules to the notifier

2016-03-03 14:57:45 +00:00