`master` is the new default branch
`master` is now the only permanent branch. Features and fixes should be merged into `master` when stable. Pull requests should be forked from `master`. `develop` branch disappear entirely in favor of temporary features/fixes branches.
This commit is contained in:
Adrien Crivelli
parent
04b5bf593d
commit
0e8fde9be6
|
|
@ -56,4 +56,4 @@ jobs:
|
|||
github-token: $GITHUB_TOKEN
|
||||
on:
|
||||
all_branches: true
|
||||
condition: $TRAVIS_BRANCH =~ ^master|develop$
|
||||
condition: $TRAVIS_BRANCH =~ ^master$
|
||||
|
|
|
|||
|
|
@ -28,6 +28,10 @@ and this project adheres to [Semantic Versioning](https://semver.org).
|
|||
- Fix time format for duration is incorrect - [#666](https://github.com/PHPOffice/PhpSpreadsheet/pull/666)
|
||||
- Fix iconv unsupported `//IGNORE//TRANSLIT` on IBM i - [#791](https://github.com/PHPOffice/PhpSpreadsheet/issues/791)
|
||||
|
||||
### Changed
|
||||
|
||||
- `master` is the new default branch, `develop` does not exist anymore
|
||||
|
||||
## [1.5.2] - 2018-11-25
|
||||
|
||||
### Security
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
If you would like to contribute, here are some notes and guidelines:
|
||||
|
||||
- All new development happens on feature/fix branches referenced with the GitHub issue number, and are then merged to the develop branch; so the develop branch is always the most up-to-date, working code
|
||||
- The master branch only contains tagged releases
|
||||
- If you are going to be submitting a pull request, please fork from develop, and submit your pull request back as a fix/feature branch referencing the GitHub issue number
|
||||
- All new development happens on feature/fix branches, and are then merged to the `master` branch once stable; so the `master` branch is always the most up-to-date, working code
|
||||
- Tagged releases are made from the `master` branch
|
||||
- If you are going to be submitting a pull request, please fork from `master`, and submit your pull request back as a fix/feature branch referencing the GitHub issue number
|
||||
- Code style might be automatically fixed by `composer fix`
|
||||
- All code changes must be validated by `composer check`
|
||||
- [Helpful article about forking](https://help.github.com/articles/fork-a-repo/ "Forking a GitHub repository")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
# PhpSpreadsheet
|
||||
|
||||
Master:
|
||||
[](https://travis-ci.org/PHPOffice/PhpSpreadsheet)
|
||||
[](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=master)
|
||||
[](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=master)
|
||||
|
|
@ -9,11 +8,6 @@ Master:
|
|||
[](https://packagist.org/packages/phpoffice/phpspreadsheet)
|
||||
[](https://gitter.im/PHPOffice/PhpSpreadsheet)
|
||||
|
||||
Develop:
|
||||
[](https://travis-ci.org/PHPOffice/PhpSpreadsheet)
|
||||
[](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=develop)
|
||||
[](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=develop)
|
||||
|
||||
PhpSpreadsheet is a library written in pure PHP and providing a set of classes that allow you to read from and to write to different spreadsheet file formats, like Excel and LibreOffice Calc.
|
||||
|
||||
## Documentation
|
||||
|
|
@ -26,7 +20,7 @@ Please ask your support questions on [StackOverflow](https://stackoverflow.com/q
|
|||
|
||||
PhpSpreadsheet is the next version of PHPExcel. It breaks compatibility to dramatically improve the code base quality (namespaces, PSR compliance, use of latest PHP language features, etc.).
|
||||
|
||||
Because all efforts have shifted to PhpSpreadsheet, PHPExcel will no longer be maintained. All contributions for PHPExcel, patches and new features, should target PhpSpreadsheet develop branch.
|
||||
Because all efforts have shifted to PhpSpreadsheet, PHPExcel will no longer be maintained. All contributions for PHPExcel, patches and new features, should target PhpSpreadsheet `master` branch.
|
||||
|
||||
## License
|
||||
|
||||
|
|
|
|||
|
|
@ -44,9 +44,6 @@ Use [composer](https://getcomposer.org) to install PhpSpreadsheet into your proj
|
|||
composer require phpoffice/phpspreadsheet
|
||||
```
|
||||
|
||||
**Note:** If you want the unreleased, unstable development version use
|
||||
`phpoffice/phpspreadsheet:dev-develop` instead.
|
||||
|
||||
## Hello World
|
||||
|
||||
This would be the simplest way to write a spreadsheet:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
site_name: PhpSpreadsheet Documentation
|
||||
repo_url: https://github.com/PHPOffice/phpspreadsheet
|
||||
edit_uri: edit/develop/docs/
|
||||
edit_uri: edit/master/docs/
|
||||
|
||||
theme: readthedocs
|
||||
extra_css:
|
||||
|
|
|
|||
Loading…
Reference in New Issue