Skip to content

Commit b2936ab

Browse files
committed
Merge branch 'develop' into trunk for 2.0
2 parents 9491cb0 + 5f0c82b commit b2936ab

File tree

15 files changed

+15914
-54
lines changed

15 files changed

+15914
-54
lines changed

.distignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/.git
2+
/.github
3+
/.wordpress-org
4+
/node_modules
5+
6+
.distignore
7+
.gitignore
8+
package-lock.json
9+
package.json
10+
README.md

.github/workflows/deploy.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Deploy to WordPress.org
2+
on:
3+
release:
4+
types: [published]
5+
jobs:
6+
tag:
7+
name: New release
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout code
11+
uses: actions/checkout@v2
12+
- name: Build
13+
run: |
14+
npm install
15+
npm run build
16+
- name: WordPress Plugin Deploy
17+
id: deploy
18+
uses: 10up/action-wordpress-plugin-deploy@stable
19+
with:
20+
generate-zip: true
21+
env:
22+
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
23+
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
24+
- name: Upload release asset
25+
uses: actions/upload-release-asset@v1
26+
env:
27+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28+
with:
29+
upload_url: ${{ github.event.release.upload_url }}
30+
asset_path: ${{github.workspace}}/${{ github.event.repository.name }}.zip
31+
asset_name: ${{ github.event.repository.name }}.zip
32+
asset_content_type: application/zip
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Plugin asset/readme update
2+
on:
3+
push:
4+
branches:
5+
- trunk
6+
jobs:
7+
trunk:
8+
name: Push to trunk
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@master
12+
- name: Build
13+
run: |
14+
npm install
15+
npm run build
16+
- name: WordPress.org plugin asset/readme update
17+
uses: 10up/action-wordpress-plugin-asset-update@stable
18+
env:
19+
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
20+
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.vscode
2+
build
3+
node_modules
4+
5+
.DS_Store

.wordpress-org/screenshot-1.png

32.7 KB
Loading
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

README.md

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Revision Notes #
22
Contributors: helen
3-
Requires at least: 4.4
3+
Requires at least: 4.7
44
License: GPLv2 or later
55
License URI: http://www.gnu.org/licenses/gpl-2.0.html
6-
Stable tag: trunk
6+
Stable tag: 2.0
77

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

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

3030
## Screenshots ##
3131

32-
1. Revision note field in the publish metabox
33-
2. Note displayed in the revisions metabox
34-
3. Note displayed on the revisions comparison screen
35-
4. Note displayed in the posts list table
32+
### 1. Revision note field in the block editor sidebar
33+
34+
![Screenshot of block editor](.wordpress-org/screenshot-1.png)
35+
36+
### 2. Revision note field in the classic editor publish metabox
37+
38+
![Screenshot of classic editor](.wordpress-org/screenshot-2.png)
39+
40+
### 3. Note displayed in the revisions metabox
41+
42+
![Screenshot of revisions metabox](.wordpress-org/screenshot-3.png)
43+
44+
### 4. Note displayed on the revisions comparison screen
45+
46+
![Screenshot of revisions screen](.wordpress-org/screenshot-4.png)
47+
48+
### 5. Note displayed in the posts list table
49+
50+
![Screenshot of posts list](.wordpress-org/screenshot-5.png)
3651

3752
## Changelog ##
3853

54+
### 2.0 ###
55+
* Block editor support (with thanks to theMikeD, TimothyBJacobs, and johnwatkins0)
56+
3957
### 1.1 ###
4058
Thanks to Kenshino for the following:
4159
* Initialize the plugin after the point custom post types are registered.

0 commit comments

Comments
 (0)