Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit 74278be

Browse files
Merge pull request #182 from technote-space/release/v2.1.3
Release/v2.1.3
2 parents 172c740 + 4edd845 commit 74278be

File tree

7 files changed

+137
-5
lines changed

7 files changed

+137
-5
lines changed

.github/CODE_OF_CONDUCT.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at technote.space@gmail.com. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

.github/CONTRIBUTING.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Contributing
2+
3+
[issues]: /issues
4+
[fork]: /fork
5+
[pr]: /compare
6+
[js-style]: https://standardjs.com/
7+
[eslint]: https://eslint.org/
8+
[jest]: https://jestjs.io/
9+
[mocha]: https://mochajs.org/
10+
[phpcs]: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage
11+
[phpmd]: https://phpmd.org/documentation/index.html
12+
[wp-test]: https://developer.wordpress.org/cli/commands/scaffold/plugin-tests/
13+
[code-of-conduct]: CODE_OF_CONDUCT.md
14+
15+
When contributing to this repository, please first discuss the change you wish to make via [issue][issues] with the owners of this repository before making a change.
16+
17+
Please note we have a [Contributor Code of Conduct][code-of-conduct], please follow it in all your interactions with the project.
18+
19+
## Submitting a pull request
20+
21+
1. [Fork][fork] and clone the repository
22+
1. Configure and install the dependencies:
23+
- `composer setup` # install and build
24+
- `composer bin:download` # download test scripts
25+
- `composer bin:prepare` # prepare test settings and download dependent plugins
26+
1. Make sure the tests pass on your machine: `composer bin:test-p`, which contains
27+
- [`PHPCS`][phpcs]
28+
- [`PHPMD`][phpmd]
29+
- [`WordPress Plugin Tests`][wp-test]
30+
- [`ESLint`][eslint]
31+
- [`Jest`][jest] or [`Mocha`][mocha]
32+
- `Build test`
33+
1. Create a new branch: `git checkout -b my-branch-name`
34+
1. Make your change, add tests, and make sure the tests still pass.
35+
1. Push to your fork and [submit a pull request][pr].
36+
1. Pat your self on the back and wait for your pull request to be reviewed and merged.
37+
38+
Here are a few things you can do that will increase the likelihood of your pull request being accepted:
39+
- Follow the style guides ([JavaScript Standard Style][js-style], [PHPCS][phpcs], [PHPMD][phpmd]). Any linting errors should be shown when running
40+
- `composer bin:js-lint`
41+
- `composer bin:phpcs`
42+
- `composer bin:phpmd`
43+
- Write and update tests.
44+
- Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests.
45+
- Write a [good commit message](https://github.com/erlang/otp/wiki/writing-good-commit-messages).
46+
47+
Work in Progress pull request are also welcome to get feedback early on, or if there is something blocked you.
48+
49+
## Resources
50+
51+
- [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)
52+
- [Using Pull Requests](https://help.github.com/articles/about-pull-requests/)
53+
- [GitHub Help](https://help.github.com)

assets/js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "marker-animation",
3-
"version": "2.1.0",
3+
"version": "2.1.3",
44
"description": "marker animation for wordpress",
55
"main": "marker-animation.min.js",
66
"scripts": {

composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
]
8080
},
8181
"config": {
82-
"process-timeout": 1200
82+
"process-timeout": 1200,
83+
"platform": {
84+
"php": "5.6"
85+
}
8386
}
8487
}

marker-animation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Plugin URI: https://github.com/technote-space/marker-animation
55
* Description: This plugin will add "Marker animation" function
66
* Author: Technote
7-
* Version: 2.1.2
7+
* Version: 2.1.3
88
* Author URI: https://technote.space
99
* Text Domain: marker-animation
1010
* Domain Path: /languages/

readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Tags: marker, marker animation, highlighter, 蛍光ペン, マーカー, アン
44
Requires at least: 4.6
55
Requires PHP: 5.6
66
Tested up to: 5.2
7-
Stable tag: 2.1.2
7+
Stable tag: 2.1.3
88
Donate link: https://paypal.me/technote0space
99
License: GPLv2 or later
1010
License URI: http://www.gnu.org/licenses/gpl-2.0.html

update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Marker Animation",
33
"slug": "marker-animation",
44
"download_url": "https://github.com/technote-space/marker-animation/releases/latest/download/marker-animation.zip",
5-
"version": "2.1.2",
5+
"version": "2.1.3",
66
"tested": "5.2",
77
"homepage": "https://technote.space/",
88
"author": "Technote",

0 commit comments

Comments
 (0)