Amber Brown 1f69693347

Merge pull request #3244 from NotAFile/py3-six-4 ...

replace some iteritems with six

2018-05-24 13:04:07 -05:00

..

api

custom error code for not leaving server notices room

2018-05-22 17:27:27 +01:00

app

Fix dependency on jinja2

2018-05-22 14:03:45 +01:00

appservice

Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background

2018-04-27 14:31:23 +01:00

config

Allow overriding the server_notices user's avatar

2018-05-23 17:43:30 +01:00

crypto

Fixes #3135 - Replace _OpenSSLECCurve with crypto.get_elliptic_curve (#3157)

2018-04-30 16:21:11 +01:00

events

Replace some more comparisons with six

2018-05-19 17:56:31 +02:00

federation

Merge pull request #3209 from damir-manapov/master

2018-05-11 00:35:13 +01:00

groups

Replace some more comparisons with six

2018-05-19 17:56:31 +02:00

handlers

Merge pull request #3244 from NotAFile/py3-six-4

2018-05-24 13:04:07 -05:00

http

Merge pull request #3246 from NotAFile/py3-repr-string

2018-05-24 13:00:20 -05:00

metrics

replace some iteritems with six

2018-05-19 17:59:26 +02:00

module_api

Delete devices in various logout situations

2017-11-29 16:44:35 +00:00

push

Merge pull request #3244 from NotAFile/py3-six-4

2018-05-24 13:04:07 -05:00

replication

Merge pull request #3244 from NotAFile/py3-six-4

2018-05-24 13:04:07 -05:00

rest

Merge pull request #3244 from NotAFile/py3-six-4

2018-05-24 13:04:07 -05:00

server_notices

Allow overriding the server_notices user's avatar

2018-05-23 17:43:30 +01: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 #3244 from NotAFile/py3-six-4

2018-05-24 13:04:07 -05:00

streams

replace 'except:' with 'except Exception:'

2017-10-23 15:52:32 +01:00

util

Merge pull request #3247 from NotAFile/py3-misc

2018-05-24 12:58:37 -05:00

__init__.py

bump version

2018-05-24 14:05:07 +01:00

event_auth.py

Fix templating error with unban permission message

2018-01-07 19:52:58 -07:00

notifier.py

Merge remote-tracking branch 'origin/develop' into rav/deferred_timeout

2018-04-27 14:18:00 +01:00

python_dependencies.py

Miscellaneous fixes to python_dependencies

2018-05-01 18:13:54 +01:00

server.py

Stub out ServerNoticesSender on the workers

2018-05-22 11:54:51 +01:00

server.pyi

Send users a server notice about consent

2018-05-22 11:54:51 +01:00

state.py

Measure time it takes to calculate state group ID

2018-03-28 11:03:52 +01:00

types.py

In DomainSpecificString, override __repr__ in addition to __str__

2018-04-10 11:35:29 +02:00

visibility.py

Remove preserve_context_over_{fn, deferred}

2017-11-14 11:22:42 +00:00