Skip to content

Commit

Permalink
Merge branch 'release/v1.2.15'
Browse files Browse the repository at this point in the history
  • Loading branch information
bjornharvold committed May 16, 2022
2 parents 401afb8 + ce6ec82 commit 73c25fa
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 5 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,29 @@

All notable changes to this project will be documented in this file.

## [1.2.15] - 2022-05-16

### Bug Fixes

- :bug: fixed local development

### Styling

- :lipstick: added square brand icon

### Build

- :construction_worker: bumped version numbers
- :construction_worker: changed git cliff tag name to fit the actual tag
- Bookmark: merge to master
- :construction_worker: bumped version number everywhere
- Bookmark: merge to master
- :construction_worker: bumped correct version number in ikotravel.php
- Bookmark: merge to master
- Bookmark: merge to master
- Bookmark: merge to master
- :construction_worker: bumped version number correctly

## [1.2.9] - 2022-05-16

### Build
Expand Down
7 changes: 5 additions & 2 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Contributors: MB-Jan, ikotravel
Tags: travel, iko, booking
Requires at least: 4.7
Tested up to: 6.0
Stable tag: 1.2.14
Version: 1.2.14
Stable tag: 1.2.15
Version: 1.2.15
Requires PHP: 7.4
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -49,6 +49,9 @@ If you notice any issues, please contact us.

== Changelog ==

= 1.2.15 =
* Build related.

= 1.2.14 =
* Build related.

Expand Down
2 changes: 1 addition & 1 deletion ikoTravel.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Plugin Name: iko.travel Affiliate
* Description: This plugin integrates your iko.travel affiliate account with WordPress. It integrates with Gutenberg, Elementor, Avada, WPBakery and as shortcodes.
* Version: 1.2.14
* Version: 1.2.15
* Author: iko.travel
* Author URI: https://iko.travel/
* License: GPL-3.0
Expand Down
4 changes: 2 additions & 2 deletions releaseToMaster.bash
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ echo "Enter version number. E.g. 1.2.3";

read versionNumber

git cliff --latest --tag $versionNumber --sort newest --prepend CHANGELOG.md

versionNumber="v${versionNumber}";

git cliff --unreleased --tag $versionNumber --sort newest --prepend CHANGELOG.md

echo "Committing version changes for $versionNumber"
git commit -a -m "build: bookmark: merge to master
Expand Down

0 comments on commit 73c25fa

Please sign in to comment.