Skip to content

Commit

Permalink
Merge branch 'develop' into trunk for 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
helen committed Feb 24, 2021
2 parents 9491cb0 + 5f0c82b commit b2936ab
Show file tree
Hide file tree
Showing 15 changed files with 15,914 additions and 54 deletions.
10 changes: 10 additions & 0 deletions .distignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/.git
/.github
/.wordpress-org
/node_modules

.distignore
.gitignore
package-lock.json
package.json
README.md
32 changes: 32 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Deploy to WordPress.org
on:
release:
types: [published]
jobs:
tag:
name: New release
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Build
run: |
npm install
npm run build
- name: WordPress Plugin Deploy
id: deploy
uses: 10up/action-wordpress-plugin-deploy@stable
with:
generate-zip: true
env:
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
- name: Upload release asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: ${{github.workspace}}/${{ github.event.repository.name }}.zip
asset_name: ${{ github.event.repository.name }}.zip
asset_content_type: application/zip
20 changes: 20 additions & 0 deletions .github/workflows/update-readme-asset.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Plugin asset/readme update
on:
push:
branches:
- trunk
jobs:
trunk:
name: Push to trunk
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Build
run: |
npm install
npm run build
- name: WordPress.org plugin asset/readme update
uses: 10up/action-wordpress-plugin-asset-update@stable
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.vscode
build
node_modules

.DS_Store
Binary file added .wordpress-org/screenshot-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
30 changes: 24 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Revision Notes #
Contributors: helen
Requires at least: 4.4
Requires at least: 4.7
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Stable tag: trunk
Stable tag: 2.0

Add a note explaining the changes you're about to save. It's like commit messages, except for your WordPress content.

Expand All @@ -29,13 +29,31 @@ Revision Notes is meant to be a plugin that "just works" when activated, and doe

## Screenshots ##

1. Revision note field in the publish metabox
2. Note displayed in the revisions metabox
3. Note displayed on the revisions comparison screen
4. Note displayed in the posts list table
### 1. Revision note field in the block editor sidebar

![Screenshot of block editor](.wordpress-org/screenshot-1.png)

### 2. Revision note field in the classic editor publish metabox

![Screenshot of classic editor](.wordpress-org/screenshot-2.png)

### 3. Note displayed in the revisions metabox

![Screenshot of revisions metabox](.wordpress-org/screenshot-3.png)

### 4. Note displayed on the revisions comparison screen

![Screenshot of revisions screen](.wordpress-org/screenshot-4.png)

### 5. Note displayed in the posts list table

![Screenshot of posts list](.wordpress-org/screenshot-5.png)

## Changelog ##

### 2.0 ###
* Block editor support (with thanks to theMikeD, TimothyBJacobs, and johnwatkins0)

### 1.1 ###
Thanks to Kenshino for the following:
* Initialize the plugin after the point custom post types are registered.
Expand Down
Loading

0 comments on commit b2936ab

Please sign in to comment.