Skip to content

Commit

Permalink
Merge branch develop into master
Browse files Browse the repository at this point in the history
  • Loading branch information
helen committed Sep 6, 2019
2 parents 9cc2c1b + 2f1d2dd commit 8a5d42f
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push-asset-readme-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/checkout@master
- name: WordPress.org plugin asset/readme update
uses: 10up/actions-wordpress/dotorg-plugin-asset-update@master
uses: 10up/action-wordpress-plugin-asset-update@master
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,19 @@ All notable changes to this project will be documented in this file, per [the Ke

## [Unreleased] - TBD

## [1.0.1] - 2019-09-06
### Added
- Documentation for keyboard shortcut (props @mrwweb, @jeffpaul via #44)

### Fixed
- Ensure character map appears as expected in Firefox (props @adamsilverstein via #41)

## [1.0.0] - 2019-08-21
### Added
- Initial plugin release 🎉
- Wrap [React Character Map](https://github.com/Dayjo/react-character-map) in a Gutenberg Popover (props @adamsilverstein via #1)
- Plugin header and icon images (props @McCallumDillon via #28)

[Unreleased]: https://github.com/10up/insert-special-characters/compare/1.0.0...master
[Unreleased]: https://github.com/10up/insert-special-characters/compare/1.0.1...master
[1.0.1]: https://github.com/10up/insert-special-characters/compare/1.0.0...1.0.1
[1.0.0]: https://github.com/10up/insert-special-characters/releases/tag/1.0.0
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ The `develop` branch is the development branch which means it contains the next

1. Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes.
2. Version bump: Bump the version number in `insert-special-characters.php` and `package.json` if it does not already reflect the version being released.
3. Changelog: Add/update the changelog in `CHANGELOG.md`
3. Changelog: Add/update the changelog in `CHANGELOG.md` and `readme.txt`
4. Check to be sure any new files/paths that are unnecessary in the production version are included in `.distignore`.
5. Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `master`. `master` contains the stable development version.
6. Push: Push your master branch to GitHub, e.g. `git push origin master`.
7. Git tag: Create a [new release](https://github.com/10up/insert-special-characters/releases/new) as `X.Y.Z` on the `master` branch in GitHub.
8. Deploy to WordPress.org: Head to the [Actions](https://github.com/10up/insert-special-characters/actions) tab in the repo and wait for the Deploy to WordPress.org workflow to finish if it hasn't already. If it doesn't succeed, figure out why and head back to delete the tag and try again.
9. Edit the [X.Y.Z milestone](https://github.com/10up/insert-special-characters/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the `X.Y.Z` milestone.
10. If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X.Y.Z+1` or `Future Release`.
2 changes: 1 addition & 1 deletion CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

[Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul)
[Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Mark Root-Wiley (@mrwweb)](https://github.com/mrwweb)

## Libraries

Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

Ever wanted to add a special character while working within Gutenberg and suddenly find yourself longing for the days of the Classic Editor and the Special Character inserter? Well long no more, the Insert Special Characters plugin is here to ease your publishing woes!

**Note:** you can display the popover via the `ctrl`/`cmd` + `o` keyboard shortcut.

![Demo of special characters within Gutenberg](assets/insert-special-characters.gif "Example of a special characters in the new WordPress editor")

## Extending
Expand Down Expand Up @@ -58,7 +60,7 @@ A complete listing of all notable changes to Insert Special Characters are docum

## Contributing

Please read [CODE_OF_CONDUCT.md](https://github.com/10up/insert-special-characters/blob/develop/CODE_OF_CONDUCT.md) for details on our code of conduct, [CONTRIBUTING.md](https://github.com/10up/insert-special-characters/blob/develop/CONTRIBUTING.md) for details on the process for submitting pull requests to us, and [CREDITS.md](https://github.com/10up/insert-special-characters/blob/develop/CONTRIBUTORS.md) for a listing of maintainers of, contributors to, and libraries used by Insert Special Characters.
Please read [CODE_OF_CONDUCT.md](https://github.com/10up/insert-special-characters/blob/develop/CODE_OF_CONDUCT.md) for details on our code of conduct, [CONTRIBUTING.md](https://github.com/10up/insert-special-characters/blob/develop/CONTRIBUTING.md) for details on the process for submitting pull requests to us, and [CREDITS.md](https://github.com/10up/insert-special-characters/blob/develop/CREDITS.md) for a listing of maintainers of, contributors to, and libraries used by Insert Special Characters.

## Like what you see?

Expand Down
2 changes: 1 addition & 1 deletion insert-special-characters.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Insert Special Characters
* Plugin URI: https://github.com/10up/insert-special-characters
* Description: A Special Character inserter for the WordPress block editor (Gutenberg).
* Version: 1.0.0
* Version: 1.0.1
* Requires at least: 5.2
* Requires PHP: 5.6
* Author: 10up
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "insert-special-characters",
"version": "1.0.0",
"version": "1.0.1",
"description": "",
"main": "insert-special-characters.js",
"scripts": {
Expand Down
22 changes: 15 additions & 7 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,25 @@ Tags: Special Characters, Character Map, Omega, Gutenberg, Block, block editor
Requires at least: 5.2
Tested up to: 5.2
Requires PHP: 5.6
Stable tag: 1.0.0
Stable tag: 1.0.1
License: MIT
License URI: http://www.gnu.org/licenses/mit.html

A Special Character inserter for the WordPress block editor (Gutenberg).

== Description ==

A Special Character inserter for the WordPress block editor (Gutenberg).
Requires PHP 5.6+ and WordPress 5.2+.
Ever wanted to add a special character while working within the WordPress block editor (Gutenberg) and suddenly find yourself longing for the days of the Classic Editor and the Special Character inserter? Well long no more, the Insert Special Characters plugin is here to ease your publishing woes!

**Note:** you can display the popover via the `ctrl`/`cmd` + `o` keyboard shortcut.

Development takes place in the GitHub repository: https://github.com/10up/insert-special-characters.

=== Technical Notes ===

* Requires PHP 5.6+.
* Requires [WordPress](http://wordpress.org/) 5.2+
* Issues and Pull requests welcome in the GitHub repository: https://github.com/10up/insert-special-characters.
* Issues and Pull requests welcome in the [GitHub repository](https://github.com/10up/insert-special-characters).

== Screenshots ==

Expand All @@ -35,8 +36,15 @@ Development takes place in the GitHub repository: https://github.com/10up/insert

== Changelog ==

= 1.0.1 =
Added
* Documentation for keyboard shortcut (props [@mrwweb](https://profiles.wordpress.org/mrwweb/), [@jeffpaul](https://profiles.wordpress.org/jeffpaul/))

Fixed
* Ensure character map appears as expected in Firefox (props [@adamsilverstein](https://profiles.wordpress.org/adamsilverstein/))

= 1.0.0 =
== Added ==
Added
* Initial plugin release 🎉
* Wrap [React Character Map](https://github.com/Dayjo/react-character-map) in a Gutenberg Popover (props @adamsilverstein)
* Plugin header and icon images (props @dillonmccallum)
* Wrap [React Character Map](https://github.com/Dayjo/react-character-map) in a Gutenberg Popover (props [@adamsilverstein](https://profiles.wordpress.org/adamsilverstein/))
* Plugin header and icon images (props [@dillonmccallum](https://profiles.wordpress.org/dillonmccallum/))
6 changes: 3 additions & 3 deletions src/insert-special-characters.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ registerFormatType( type, {
};

// Pin the Popover to the caret position.
const anchorRect = () => {
const anchorRect = () => {
return getRectangleFromRange( anchorRange );
} ;
};

// Display the character map when it is active.
if ( isActive ) {
Expand All @@ -56,7 +56,7 @@ registerFormatType( type, {
<Popover
className="character-map-popover"
position="bottom center"
focusOnMount="firstElement"
focusOnMount="container"
key="charmap-popover"
onClick={ () => {} }
getAnchorRect={ anchorRect }
Expand Down

0 comments on commit 8a5d42f

Please sign in to comment.