1
0
mirror of https://github.com/Hutchy68/pivot.git synced 2024-11-24 03:19:02 +01:00

Merge pull request #36 from Hutchy68/release-prep

Release prep
This commit is contained in:
Tom Hutchison 2017-04-28 16:44:50 -04:00 committed by GitHub
commit 755d190211
6 changed files with 44 additions and 7 deletions

25
.github/CONTRIBUTING.md vendored Normal file
View File

@ -0,0 +1,25 @@
# Contributing to Pivot
Pivot is released using [Semantic Versioning 2.0.0](http://semver.org/). Please read about how Semantic Versioning is used for software releases, understand what a breaking change is and backwards compatibility.
## Bug fixes
All bug fixes should PR against the branch of the version of Pivot with the bug. If you want to fix a bug, please do the following:
1. Open an issue in [Issues](https://github.com/Hutchy68/pivot/issues) and make sure you tag it with a `bug` tag. If the bug already is a known issue, skip this step.
2. Create a branch in your repo with the name of the `bug` or whatever you feel comfortable with(patch-1, bugX, etc.) using the Pivot's `master` branch as a base.
3. If it will take time to fix, periodically check and pull down updates to Pivot's `master` branch as you are working on the bug fix. Commits can and will occur to `master` which may affect your `bug fix` branch.
4. When you are ready to issue a PR against the `master` branch of Pivot, please use `[bug]` as a tag at the beginning of the PR's title.
5. Please reference the issue# in the PR's description and include any information for testing the bug fix.
## Development of New Feature
All new features for Pivot should PR against the `master` branch. If you want to add a new feature, you should do the following:
1. Open an issue in [Issues](https://github.com/hutchy68/pivot/issues) and make sure you tag it with the `feature` tag.
2. Create a branch in your repo with the name of the `feature` or whatever you feel comfortable with using Pivot's `master` branch as a base.
3. Periodically check and pull down updates to Pivot's `master` branch as you are working on your proposed feature. Commits can and will occur to `master` which may affect your `feature` branch.
4. When you are ready to issue a PR against the `master` branch of Pivot, please use `[feature]` as a tag at the beginning of the PR's title.
5. Please reference the issue# in the PR's description and include any information for testing the feature.

9
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1,9 @@
### PR Submission:
All PR's welcome, even those without an Issue
* [ ] Have tested this PR and it adds a feature or fixes and issue noted below.
### Additional Information Below
<!-- Erase this line and add information about the PR, eg. issues fixed, feature added, enhancement made. -->

View File

@ -3,9 +3,6 @@ language: php
php:
- 7
- 5.6
- 5.5
- 5.4
- 5.3
- hhvm
- nightly

View File

@ -1,8 +1,14 @@
## Version 1.0.4
* [bug fix] Don't style sitenotice and user message
* [bug fix] Echo compatibility with Echo REL_1_28 release
* [bug fix] Page indicator margins
## Version 1.0.3
* Added support for Visual Editor
* Added support for Page Indicators
* Minor CSS changes for Echo integration and NO Print elements
* [enhancement] Added support for Visual Editor
* [enhancement] Added support for Page Indicators
* [bug fix] Minor CSS changes for Echo integration and NO Print elements
## Version 1.0.2

View File

@ -1,6 +1,6 @@
{
"name": "Pivot",
"version": "1.0.3",
"version": "1.0.4",
"author": [
"Tom Hutchison",
"..."