Skip to content

Commit

Permalink
Merge branch 'release/1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
remcotolsma committed Aug 4, 2015
2 parents 0cdfd89 + 064fb5d commit 0360915
Show file tree
Hide file tree
Showing 25 changed files with 206 additions and 185 deletions.
33 changes: 24 additions & 9 deletions CHANGELOG.md
@@ -1,12 +1,27 @@
# Changelog
# Change Log

## 1.1.0
* Improved support for user defined purchase ID's.
All notable changes to this project will be documented in this file.

## 1.0.1
* Changed WordPress pay core library requirment from ~1.0.0 to >=1.0.0.
* Changed WordPress pay iDEAL library requirment from ~1.0.0 to >=1.0.0.
* Changed WordPress pay iDEAL Advanced library requirment from ~1.0.0 to >=1.0.0.
This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a CHANGELOG](http://keepachangelog.com/).

## 1.0.0
* First release.
## [Unreleased][unreleased]
-

## [1.1.1] - 2015-08-04
- Make sure to use the wp-pay/core functions.

## [1.1.0] - 2015-03-09
- Improved support for user defined purchase ID's.

## [1.0.1] - 2015-03-03
- Changed WordPress pay core library requirment from ~1.0.0 to >=1.0.0.
- Changed WordPress pay iDEAL library requirment from ~1.0.0 to >=1.0.0.
- Changed WordPress pay iDEAL Advanced library requirment from ~1.0.0 to >=1.0.0.

## 1.0.0 - 2015-01-19
- First release.

[unreleased]: https://github.com/wp-pay-gateways/ideal-advanced-v3/compare/1.1.1...HEAD
[1.1.1]: https://github.com/wp-pay-gateways/ideal-advanced-v3/compare/1.1.0...1.1.1
[1.1.0]: https://github.com/wp-pay-gateways/ideal-advanced-v3/compare/1.0.1...1.1.0
[1.0.1]: https://github.com/wp-pay-gateways/ideal-advanced-v3/compare/1.0.0...1.0.1
16 changes: 8 additions & 8 deletions Gruntfile.js
@@ -1,4 +1,6 @@
module.exports = function( grunt ) {
require( 'load-grunt-tasks' )( grunt );

// Project
grunt.initConfig( {
// Package
Expand All @@ -11,12 +13,15 @@ module.exports = function( grunt ) {
// PHP Code Sniffer
phpcs: {
application: {
dir: [ 'src' ],
src: [
'**/*.php',
'!node_modules/**',
'!vendor/**'
],
},
options: {
standard: 'phpcs.ruleset.xml',
extensions: 'php',
ignore: '<%= dirs.ignore %>'
showSniffCodes: true
}
},

Expand Down Expand Up @@ -50,11 +55,6 @@ module.exports = function( grunt ) {
}
} );

grunt.loadNpmTasks( 'grunt-phpcs' );
grunt.loadNpmTasks( 'grunt-phplint' );
grunt.loadNpmTasks( 'grunt-phpmd' );
grunt.loadNpmTasks( 'grunt-phpunit' );

// Default task(s).
grunt.registerTask( 'default', [ 'phplint', 'phpmd', 'phpcs', 'phpunit' ] );
};
4 changes: 2 additions & 2 deletions composer.json
Expand Up @@ -14,9 +14,9 @@
],
"require": {
"php": ">=5.2.4",
"wp-pay/core": ">=1.0.0",
"wp-pay/core": ">=1.2.1",
"wp-pay-gateways/ideal": ">=1.1.0",
"wp-pay-gateways/ideal-advanced": ">=1.1.0"
"wp-pay-gateways/ideal-advanced": ">=1.1.1"
},
"require-dev": {
"satooshi/php-coveralls": "dev-master"
Expand Down

0 comments on commit 0360915

Please sign in to comment.