Merge branch 'develop' for 1.3.0

Author: helen

.gitattributes

@@ -3,11 +3,10 @@
 
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.travis.yml
 /CHANGELOG.md export-ignore
 /CODE_OF_CONDUCT.md export-ignore
-/composer.json
-/composer.lock
+/composer.json export-ignore
+/composer.lock export-ignore
 /CONTRIBUTING.md export-ignore
 /CREDITS.md export-ignore
 /LICENSE.md export-ignore

.github/workflows/test.yml

@@ -0,0 +1,31 @@
+name: Automated Tests
+
+on:
+  pull_request:
+    branches:
+      - develop
+  push:
+    branches:
+      - develop
+jobs:
+  test_php:
+    name: Test PHP
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-versions: ['5.6', '7.3']
+    
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Set PHP version
+      uses: shivammathur/setup-php@v1
+      with:
+        php-version: ${{ matrix.php-versions }}
+        coverage: none
+    - name: PHP version
+      run: php --version
+    - name: Install dependencies
+      run: composer install --ignore-platform-reqs
+    - name: Run PHPCS
+      run: composer run lint

.travis.yml

@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
+## [1.3.0] - 2020-05-01
+### Added
+- Support for app-ads.txt filetype (props [@helen](https://github.com/helen), [@westi](https://github.com/westi), [@p0mmy](https://github.com/p0mmy) via [#60](https://github.com/10up/ads-txt/pull/60))
+
+### Removed
+- Stop attempting to show an error notice about an existing `ads.txt` file due to too many false positives. We will bring this back later in a better way. (see [#61](https://github.com/10up/ads-txt/issues/61))
+
+### Changed
+- Bump WordPress version support to 5.4 (props [@tmoorewp](https://github.com/tmoorewp), [@jeffpaul](https://github.com/jeffpaul) via [#56](https://github.com/10up/ads-txt/pull/56))
+- Switched to using GitHub Actions instead of Travis for Continuous Integration (props [@helen](https://github.com/helen) via [#54](https://github.com/10up/ads-txt/pull/54))
+- Updated plugin screenshots and FAQs (props [@jeffpaul](https://github.com/jeffpaul), [@helen](https://github.com/helen) via [#58](https://github.com/10up/ads-txt/pull/58), [#55](https://github.com/10up/ads-txt/pull/55))
+
+### Fixed
+- Update capability check when saving ads.txt (props [@ethanclevenger91](https://github.com/ethanclevenger91) via [#51](https://github.com/10up/ads-txt/pull/51))
+
 ## [1.2.0] - 2019-11-26
 ### Added
 - Make revisions accessible in the admin - now you can restore older versions of your ads.txt or view how it's changed over time (props [@adamsilverstein](https://github.com/adamsilverstein), [@helen](https://github.com/helen) via [#9](https://github.com/10up/ads-txt/pull/9))
@@ -18,15 +33,16 @@ All notable changes to this project will be documented in this file, per [the Ke
 - Early escaping (props [@tomjn](https://github.com/tomjn) via [#25](https://github.com/10up/ads-txt/pull/25))
 - PHPCS issues and added PHPCS scanning (props [@adamsilverstein](https://github.com/adamsilverstein) via [#38](https://github.com/10up/ads-txt/pull/38))
 
-## [1.1] - 2018-02-05
+## [1.1.0] - 2018-02-05
 ### Fixed
 - Better error message formatting (wraps values in <code> tags for better readability)
 - WordPress.com VIP-approved escaping
 
-## [1.0] - 2017-12-18
+## [1.0.0] - 2017-12-18
 - Initial plugin release
 
 [Unreleased]: https://github.com/10up/ads-txt/compare/master...develop
+[1.3.0]: https://github.com/10up/ads-txt/compare/1.2.0...1.3.0
 [1.2.0]: https://github.com/10up/ads-txt/compare/1.1...1.2.0
-[1.1]: https://github.com/10up/ads-txt/compare/1.0...1.1
-[1.0]: https://github.com/10up/ads-txt/releases/tag/1.0
+[1.1.0]: https://github.com/10up/ads-txt/compare/1.0...1.1
+[1.0.0]: https://github.com/10up/ads-txt/releases/tag/1.0

.wordpress-org/screenshot-1.png

@@ -49,10 +49,6 @@ During weekly triage, the tested up to version should be compared against the la
 
 New releases are targeted based on number and severity of changes along with human availability. When a release is targeted, a due date will be assigned to the appropriate milestone.
 
-### Roadmap
-
-We are currently working toward [version 1.2](https://github.com/10up/ads-txt/milestone/1), which will include exposing a UI for revisions and detecting the presence of an actual `ads.txt` file. There is not yet a targeted release date, and features and enhancements may still be added to the milestone.
-
 ### Testing
 
 Make an ads.txt with the following contents and ensure that you receive the same errors as below. There are no automated tests at this time - contributions very welcome in this area!

.wordpress-org/screenshot-2.png

@@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo
 
 Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.
 
-[Helen Hou-Sandi (@helen)](https://github.com/helen), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [@philipjohn](https://github.com/philipjohn), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Ethan Clevenger (@ethanclevenger91)](https://github.com/ethanclevenger91), [Tom J Nowell (@tomjn)](https://github.com/tomjn), [John Eckman (@jeckman)](https://github.com/jeckman), [Keanan Koppenhaver (@kkoppenhaver)](https://github.com/kkoppenhaver), [Matthew McAchran (@mmcachran)](https://github.com/mmcachran).
+[10up (@10up)](https://github.com/10up), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Philip John (@philipjohn)](https://github.com/philipjohn), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Ethan Clevenger (@ethanclevenger91)](https://github.com/ethanclevenger91), [Tom J Nowell (@tomjn)](https://github.com/tomjn), [John Eckman (@jeckman)](https://github.com/jeckman), [Keanan Koppenhaver (@kkoppenhaver)](https://github.com/kkoppenhaver), [Matthew McAchran (@mmcachran)](https://github.com/mmcachran), [Peter Westwood (@westi)](https://github.com/westi), [cp101 (@p0mmy)](https://github.com/p0mmy), [Tim Moore (@tmoorewp)](https://github.com/tmoorewp), [Per Søderlind (@soderlind)](https://github.com/soderlind).
 
 ## Libraries
 

.wordpress-org/screenshot-3.png

@@ -2,11 +2,11 @@
 
 > Create, manage, and validate your Ads.txt from within WordPress, just like any other content asset.
 
-[![Build Status](https://travis-ci.org/10up/ads-txt.svg?branch=develop)](https://travis-ci.org/10up/ads-txt) [![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/tag/10up/ads-txt.svg?label=release)](https://github.com/10up/ads-txt/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.3%20tested-success.svg) [![GPLv2 License](https://img.shields.io/github/license/10up/ads-txt.svg)](https://github.com/10up/ads-txt/blob/develop/LICENSE.md)
+[![Automated Tests](https://github.com/10up/ads-txt/workflows/Automated%20Tests/badge.svg)](https://github.com/10up/ads-txt/actions?query=workflow%3A%22Automated+Tests%22) [![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/tag/10up/ads-txt.svg?label=release)](https://github.com/10up/ads-txt/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.4%20tested-success.svg) [![GPLv2 License](https://img.shields.io/github/license/10up/ads-txt.svg)](https://github.com/10up/ads-txt/blob/develop/LICENSE.md)
 
 ## Features
 
-![Screenshot of ads.txt editor](.wordpress-org/screenshot-1.png "Example of editing an ads.txt file with errors")
+![Screenshot of ads.txt editor](.wordpress-org/screenshot-1.png "Example of editing an ads.txt file with errors and a link to browse ads.txt file revisions.")
 
 [Ads.txt](https://iabtechlab.com/ads-txt/) is an initiative by the Interactive Advertising Bureau to enable publishers to take control over who can sell their ad inventory. Through our work at 10up with various publishers, we've created a way to manage and validate your ads.txt file from within WordPress, eliminating the need to upload a file. The validation baked into the plugin helps avoid malformed records, which can cause issues that end up cached for up to 24 hours and can lead to a drop in ad revenue.
 
@@ -16,13 +16,17 @@ We're closely monitoring continued developments in the ad fraud space, and see t
 
 ### What about app-ads.txt?
 
-We plan on adding support for this file in the future! If you'd like to follow along with development or even help us get it done, please see #40.
+We plan on adding support for this file in the future! If you'd like to follow along with development or even help us get it done, please see [#40](https://github.com/10up/ads-txt/issues/40).
+
+### Can I use this with multisite?
+
+Yes! However, if you are using a subfolder installation it will only work for the main site. This is because you can only have one ads.txt for a given domain or subdomain per the [ads.txt spec](https://iabtechlab.com/ads-txt/).  Our recommendation is to only activate Ads.txt Manager per-site.
 
 ## Requirements
 
 * Requires PHP 5.3+.
 * Requires WordPress 4.9+. Older versions of WordPress will not display any syntax highlighting and may break JavaScript and/or be unable to localize the plugin.
-* Ad blockers may break syntax highlighting and pre-save error checking on the edit screen. See #20.
+* Ad blockers may break syntax highlighting and pre-save error checking on the edit screen. See [#20](https://github.com/10up/ads-txt/issues/20).
 * Rewrites need to be enabled. Without rewrites, WordPress cannot know to supply `/ads.txt` when requested.
 * Your site URL must not contain a path (e.g. `https://example.com/site/` or path-based multisite installs). While the plugin will appear to function in the admin, it will not display the contents at `https://example.com/site/ads.txt`. This is because the plugin follows the IAB spec, which requires that the ads.txt file be located at the root of a domain or subdomain.
 
@@ -33,9 +37,23 @@ We plan on adding support for this file in the future! If you'd like to follow a
 1. Head to Settings → Ads.txt and add the records you need.
 1. Check it out at yoursite.com/ads.txt!
 
-Note: If you already have an existing ads.txt file in the web root, the plugin will not read in the contents of that file, and changes you make in WordPress admin will not overwrite contents of the physical file. 
+Note: If you already have an existing ads.txt file in the web root, the plugin will not read in the contents of that file, and changes you make in WordPress admin will not overwrite contents of the physical file.
+
+You will need to rename or remove the existing ads.txt file (keeping a copy of the records it contains to put into the new settings screen) before you will be able to see any changes you make to ads.txt inside the WordPress admin.
+
+## Screenshots
+
+### 1. Example of editing an ads.txt file with errors and a link to browse ads.txt file revisions.
+
+![Screenshot of ads.txt editor](.wordpress-org/screenshot-1.png "Example of editing an ads.txt file with errors and a link to browse ads.txt file revisions.")
+
+### 2. Example of comparing ads.txt file revisions.
+
+![Screenshot of ads.txt in Revisions editor](.wordpress-org/screenshot-2.png "Example of comparing ads.txt file revisions.")
+
+### 3. Example of comparing two disparate ads.txt file revisions.
 
-You will need to rename or remove the existing ads.txt file (keeping a copy of the records it contains to put into the new settings screen) before you will be able to see any changes you make to ads.txt inside the WordPress admin. 
+![Screenshot of ads.txt in Revisions editor](.wordpress-org/screenshot-3.png "Example of comparing two disparate ads.txt file revisions.")
 
 ## Support Level