Brendan Abolivier e35c30ed4b Fix bogus conflict resolution

2019-09-06 15:44:48 +01:00

..

api

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

app

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

appservice

Run black.

2018-08-10 23:54:09 +10:00

config

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

crypto

Fix key verification when key stored with null valid_until_ms

2019-06-10 15:37:10 +01:00

events

Fix a number of flake8 errors

2018-10-24 10:39:03 +01:00

federation

Implement the SHHS complexity API (#5216)

2019-05-30 01:47:16 +10:00

handlers

Add test case for #5574

2019-06-28 10:29:02 +01:00

http

fix ci on py2, again

2019-06-10 17:55:01 +01:00

push

Bump bleach version so that tests can run on old deps.

2019-06-11 12:34:18 +01:00

replication

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

rest

Fix bogus conflict resolution

2019-09-06 15:44:48 +01:00

rulecheck

Merge branch 'babolivier/per_room_profiles' into dinsic

2019-05-17 15:07:41 +01:00

scripts

Port register_new_matrix_user to Python 3 and add tests (#4085)

2018-10-26 22:05:22 +11:00

server_notices

Migrate all tests to use the dict-based config format instead of hanging items off HomeserverConfig (#5171)

2019-05-13 15:01:14 -05:00

state

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

storage

Merge branch 'master' into dinsic

2019-06-12 14:36:44 +01:00

test_utils

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

util

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

__init__.py

Unify v1 and v2 REST client APIs (#5226)

2019-06-03 21:28:59 +10:00

patch_inline_callbacks.py

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

server.py

Migrate all tests to use the dict-based config format instead of hanging items off HomeserverConfig (#5171)

2019-05-13 15:01:14 -05:00

test_distributor.py

Run black.

2018-08-10 23:54:09 +10:00

test_event_auth.py

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

test_federation.py

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

test_mau.py

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

test_metrics.py

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

test_preview.py

Run black.

2018-08-10 23:54:09 +10:00

test_server.py

Use native UPSERTs where possible (#4306)

2019-01-24 21:31:54 +11:00

test_state.py

Migrate all tests to use the dict-based config format instead of hanging items off HomeserverConfig (#5171)

2019-05-13 15:01:14 -05:00

test_terms_auth.py

Terms might not be the last stage

2019-05-13 16:10:26 +01:00

test_test_utils.py

Run black.

2018-08-10 23:54:09 +10:00

test_types.py

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

test_visibility.py

Run Black on the tests again (#5170)

2019-05-10 00:12:11 -05:00

unittest.py

Change password reset links to /_matrix.

2019-06-11 11:34:33 +01:00

utils.py

Set default room version to v4. (#5379)

2019-06-06 20:13:47 +01:00