diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-19 16:18:41 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-19 16:18:41 +0000 |
| commit | 00f1c3b40d9ad6cd82fea8e1bad94241ecdb4c22 (patch) | |
| tree | c6db0247e2908e984f8dbd0ffd06faea36b0df88 /synapse/api | |
| parent | Markdownification and other fixes to CONTRIBUTING (#6461) (diff) | |
| parent | Merge pull request #6329 from matrix-org/babolivier/context_filters (diff) | |
| download | synapse-00f1c3b40d9ad6cd82fea8e1bad94241ecdb4c22.tar.xz | |
Merge pull request #6329 from matrix-org/babolivier/context_filters
* commit 'c530f9af4': Un-remove room purge test Incorporate review Format changelog Update changelog since this isn't going to be featured in 1.6.0 Also filter state events Only filter if a filter was provided Update copyright Lint Update copyrights Changelog Add tests for /search Merge labels tests for /context and /messages Add test case Filter events_before and events_after in /context requests
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/constants.py | 3 | ||||
| -rw-r--r-- | synapse/api/filtering.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index c79c53cce1..405d08b2cc 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- # Copyright 2014-2016 OpenMarket Ltd # Copyright 2017 Vector Creations Ltd -# Copyright 2018 New Vector Ltd +# Copyright 2018-2019 New Vector Ltd +# Copyright 2019 The Matrix.org Foundation C.I.C. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py index bec13f08d8..6eab1f13f0 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py @@ -1,5 +1,8 @@ # -*- coding: utf-8 -*- # Copyright 2015, 2016 OpenMarket Ltd +# Copyright 2017 Vector Creations Ltd +# Copyright 2018-2019 New Vector Ltd +# Copyright 2019 The Matrix.org Foundation C.I.C. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. |