Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Add config option to prevent media downloads from listed domains. #15197

Merged
merged 17 commits into from
May 9, 2023
Merged

Add config option to prevent media downloads from listed domains. #15197

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
aa7c7af
Prevent downloads from configured domains
turt2live Mar 2, 2023
5215707
Changelog
turt2live Mar 2, 2023
960650b
Define a variable that we use
turt2live Mar 2, 2023
f7fa9f7
Remove dollar signs
turt2live Mar 3, 2023
5c6e2ec
Merge branch 'develop' into travis/block-media-by-domain
turt2live Mar 9, 2023
0d2ea49
Try writing the file too?
turt2live Mar 9, 2023
c4855c2
I guess await doesn't work
turt2live Mar 9, 2023
d9daa63
Access properties that might work
turt2live Mar 9, 2023
33f3107
Appease CI
turt2live Mar 9, 2023
b292cd1
Merge branch 'develop' into travis/block-media-by-domain
erikjohnston Mar 28, 2023
298c96c
Fix up tests
erikjohnston Mar 28, 2023
bd13239
Apply suggestions from code review
turt2live May 8, 2023
2dd8d5d
Finish field rename
turt2live May 8, 2023
e339fa9
Merge branch 'develop' into travis/block-media-by-domain
turt2live May 8, 2023
673e4fc
Fix imports
turt2live May 8, 2023
9c6e0b5
Fix code style
turt2live May 8, 2023
2987d9a
Clean up imports
turt2live May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Clean up imports
  • Loading branch information
@turt2live
turt2live committed May 8, 2023
commit 2987d9af80b4c1b97ee89c93110f3cd9daadf63b
1 change: 0 additions & 1 deletion tests/rest/media/test_domain_blocking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from binascii import unhexlify
from typing import Dict

from twisted.test.proto_helpers import MemoryReactor
Expand Down