Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
dkotter committed Feb 3, 2025
2 parents a2e20d3 + fc160e2 commit 35bfd6e
Show file tree
Hide file tree
Showing 7 changed files with 4,874 additions and 4,070 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
matrix:
core:
- {name: 'WP latest', version: 'latest'}
- {name: 'WP minimum', version: 'WordPress/WordPress#6.4'}
- {name: 'WP minimum', version: 'WordPress/WordPress#6.6'}
- {name: 'WP trunk', version: 'WordPress/WordPress#master'}

steps:
Expand Down
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,23 @@ All notable changes to this project will be documented in this file, per [the Ke

## [Unreleased] - TBD

## [1.2.2] - 2025-02-03
### Changed
- Bump WordPress minimum supported version from 6.4 to 6.6 (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@jeffpaul](https://github.com/jeffpaul) via [#185](https://github.com/10up/insecure-content-warning/pull/185), [#191](https://github.com/10up/insecure-content-warning/pull/191)).

### Security
- Bump `webpack` from 5.89.0 to 5.94.0 (props [@dependabot](https://github.com/apps/dependabot), [@faisal-alvi](https://github.com/faisal-alvi) via [#186](https://github.com/10up/insecure-content-warning/pull/186)).
- Bump `@wordpress/scripts` from 27.1.0 to 30.6.0, `express` from 4.19.2 to 4.21.0 and `serve-static` from 1.15.0 to 1.16.2 (props [@dependabot](https://github.com/apps/dependabot), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#191](https://github.com/10up/insecure-content-warning/pull/191), [#193](https://github.com/10up/insecure-content-warning/pull/193)).
- Bump `ws` from 7.5.10 to 8.18.0 (props [@dependabot](https://github.com/apps/dependabot), [@iamdharmesh](https://github.com/iamdharmesh) via [#193](https://github.com/10up/insecure-content-warning/pull/193)).

### Developer
- Add banner image to README and update badges (props [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter) via [#187](https://github.com/10up/insecure-content-warning/pull/187), [#190](https://github.com/10up/insecure-content-warning/pull/190)).

## [1.2.1] - 2024-08-22
**Note that this release bumps the WordPress minimum version from 5.8 to 6.4.**

### Changed
- Bump WordPress "tested up to" version to 6.4 (props [@QAharshalkadu](https://github.com/QAharshalkadu), [@ankitguptaindia](https://github.com/ankitguptaindia), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter) via [#152](https://github.com/10up/insecure-content-warning/pull/152), [#153](https://github.com/10up/insecure-content-warning/pull/153), [#168](https://github.com/10up/insecure-content-warning/pull/168), [#176](https://github.com/10up/insecure-content-warning/pull/176)).
- Bump WordPress "tested up to" version to 6.6 (props [@QAharshalkadu](https://github.com/QAharshalkadu), [@ankitguptaindia](https://github.com/ankitguptaindia), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter) via [#152](https://github.com/10up/insecure-content-warning/pull/152), [#153](https://github.com/10up/insecure-content-warning/pull/153), [#168](https://github.com/10up/insecure-content-warning/pull/168), [#176](https://github.com/10up/insecure-content-warning/pull/176)).
- Bump WordPress minimum supported version from 5.8 to 6.4 (props [@jeffpaul](https://github.com/jeffpaul), [@ankitguptaindia](https://github.com/ankitguptaindia), [@dkotter](https://github.com/dkotter) via [#168](https://github.com/10up/insecure-content-warning/pull/168), [#176](https://github.com/10up/insecure-content-warning/pull/176)).
- Changed import of `PluginPostStatusInfo` component from `@wordpress/edit-post` to `@wordpress/editor` (props [@gabriel-glo](https://github.com/gabriel-glo), [@dkotter](https://github.com/dkotter) via [#178](https://github.com/10up/insecure-content-warning/pull/178)).

Expand Down Expand Up @@ -118,6 +130,7 @@ All notable changes to this project will be documented in this file, per [the Ke
- Initial public release! 🎉

[Unreleased]: https://github.com/10up/insecure-content-warning/compare/trunk...develop
[1.2.2]: https://github.com/10up/insecure-content-warning/compare/1.2.1...1.2.2
[1.2.1]: https://github.com/10up/insecure-content-warning/compare/1.2.0...1.2.1
[1.2.0]: https://github.com/10up/insecure-content-warning/compare/1.1.0...1.2.0
[1.1.0]: https://github.com/10up/insecure-content-warning/compare/1.0.3...1.1.0
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
# Insecure Content Warning

> Prevent editors from adding insecure content in the editor.
[![Support Level](https://img.shields.io/badge/support-stable-blue.svg)](#support-level) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/insecure-content-warning?label=WordPress) [![GPLv2 License](https://img.shields.io/github/license/10up/insecure-content-warning.svg)](https://github.com/10up/insecure-content-warning/blob/develop/LICENSE.md) [![WordPress Plugin Version](https://img.shields.io/wordpress/plugin/v/insecure-content-warning?logo=wordpress&logoColor=FFFFFF&label=Playground%20Demo&labelColor=3858E9&color=3858E9)](https://playground.wordpress.net/?blueprint-url=https://raw.githubusercontent.com/10up/insecure-content-warning/develop/.wordpress-org/blueprints/blueprint.json)
![Insecure Content Warning](https://github.com/10up/insecure-content-warning/blob/develop/.wordpress-org/banner-1544x500.png)

[![E2E test](https://github.com/10up/insecure-content-warning/actions/workflows/cypress.yml/badge.svg)](https://github.com/10up/insecure-content-warning/actions/workflows/cypress.yml) [![Linting](https://github.com/10up/insecure-content-warning/actions/workflows/lint.yml/badge.svg)](https://github.com/10up/insecure-content-warning/actions/workflows/lint.yml) [![PHP Compatibility](https://github.com/10up/insecure-content-warning/actions/workflows/php-compatibility.yml/badge.svg)](https://github.com/10up/insecure-content-warning/actions/workflows/php-compatibility.yml) [![Dependency Review](https://github.com/10up/insecure-content-warning/actions/workflows/dependency-review.yml/badge.svg)](https://github.com/10up/insecure-content-warning/actions/workflows/dependency-review.yml)
[![Support Level](https://img.shields.io/badge/support-stable-blue.svg)](#support-level) ![Required PHP Version](https://img.shields.io/wordpress/plugin/required-php/insecure-content-warning?label=Requires%20PHP) ![Required WP Version](https://img.shields.io/wordpress/plugin/wp-version/insecure-content-warning?label=Requires%20WordPress) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/insecure-content-warning?label=WordPress) [![GPLv2 License](https://img.shields.io/github/license/10up/insecure-content-warning.svg)](https://github.com/10up/insecure-content-warning/blob/develop/LICENSE.md) [![Dependency Review](https://github.com/10up/insecure-content-warning/actions/workflows/dependency-review.yml/badge.svg)](https://github.com/10up/insecure-content-warning/actions/workflows/dependency-review.yml) [![E2E test](https://github.com/10up/insecure-content-warning/actions/workflows/cypress.yml/badge.svg)](https://github.com/10up/insecure-content-warning/actions/workflows/cypress.yml) [![Linting](https://github.com/10up/insecure-content-warning/actions/workflows/lint.yml/badge.svg)](https://github.com/10up/insecure-content-warning/actions/workflows/lint.yml) [![PHP Compatibility](https://github.com/10up/insecure-content-warning/actions/workflows/php-compatibility.yml/badge.svg)](https://github.com/10up/insecure-content-warning/actions/workflows/php-compatibility.yml) [![CodeQL](https://github.com/10up/insecure-content-warning/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/10up/insecure-content-warning/actions/workflows/github-code-scanning/codeql) [![WordPress Plugin Version](https://img.shields.io/wordpress/plugin/v/insecure-content-warning?logo=wordpress&logoColor=FFFFFF&label=Playground%20Demo&labelColor=3858E9&color=3858E9)](https://playground.wordpress.net/?blueprint-url=https://raw.githubusercontent.com/10up/insecure-content-warning/develop/.wordpress-org/blueprints/blueprint.json)

![Example of attempting to publish a post with insecure content - classic editor.](.wordpress-org/screenshot-1.png)
> Prevent editors from adding insecure content in the editor.
## Description

Insecure Content Warning helps content creators with secure (HTTPS) websites avoid insecure-content warnings in the browser by flagging any elements in the editor (such as images and embeds) that are being delivered or sourced from an insecure (HTTP) web address. All insecure elements are flagged before the content is published, and can be fixed manually or simply by clicking "fix it."

Compatible with both the block and classic editors.

![Example of attempting to publish a post with insecure content - block editor.](.wordpress-org/screenshot-2.png)
![Example of attempting to publish a post with insecure content - classic editor.](.wordpress-org/screenshot-1.png)

## Requirements

* PHP 7.4+.
* WordPress 6.4+.
* WordPress 6.6+.
* A secure / SSL (HTTPS) website, front and back end.

## Installation
Expand All @@ -31,6 +29,8 @@ Compatible with both the block and classic editors.

This plugin requires no configuration. Simply activate and the plugin will prevent posts with insecure elements from being published, as well as provide a banner with information on the offending assets.

![Example of attempting to publish a post with insecure content - block editor.](.wordpress-org/screenshot-2.png)

### Optional WP-CLI Commands

These are not required for normal usage of the plugin, but are available as a utility for more advanced usage.
Expand Down
6 changes: 3 additions & 3 deletions insecure-content-warning.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Plugin Name: Insecure Content Warning
* Plugin URI: https://wordpress.org/plugins/insecure-content-warning/
* Description: Prevent editors from adding insecure content in the editor.
* Version: 1.2.1
* Requires at least: 6.4
* Version: 1.2.2
* Requires at least: 6.6
* Requires PHP: 7.4
* Author: 10up
* Author URI: https://10up.com/
Expand All @@ -22,7 +22,7 @@
define( 'INSECURE_CONTENT_TEMPLATE_URL', get_template_directory_uri() );
define( 'INSECURE_CONTENT_PATH', __DIR__ . DIRECTORY_SEPARATOR );
define( 'INSECURE_CONTENT_INC', INSECURE_CONTENT_PATH . 'includes' . DIRECTORY_SEPARATOR );
define( 'INSECURE_CONTENT_VERSION', '1.2.1' );
define( 'INSECURE_CONTENT_VERSION', '1.2.2' );

/**
* Get the minimum version of PHP required by this plugin.
Expand Down
Loading

0 comments on commit 35bfd6e

Please sign in to comment.