From 9b71e47e0bc570c6e91acab0711b06c0817914b4 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 20 Mar 2019 13:20:50 -0400 Subject: [PATCH 1/2] clarify wording on process doc --- .github/PROCESS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/PROCESS.md b/.github/PROCESS.md index ee3418ef8e..e6ba32b055 100644 --- a/.github/PROCESS.md +++ b/.github/PROCESS.md @@ -214,9 +214,9 @@ Hotfixes bypass `master` and should only be used for urgent fixes that can't wai ## Releasing 1. Create the release branch from `master`, for example: `release-4.1.0`. -1. Submit a pull request to merge the release branch into `stable`. +1. Submit a pull request from the release branch into `stable`. Do not merge this pull request yet. 1. Verify all tests are passing, fix any bugs if needed and make sure no undesired commits are in. -1. Navigate to the root of the repository. +1. Navigate to the root of the repository while on the release branch. 1. Run `npm i` if it hasn't already been done. 1. Run `npm run release.prepare` - Select the version based on the type of commits and the [Ionic Versioning](https://ionicframework.com/docs/intro/versioning) From ca36139c8034336869e00a6fe627cf4989423a60 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 20 Mar 2019 13:48:35 -0400 Subject: [PATCH 2/2] 4.1.2 --- CHANGELOG.md | 18 ++++++++++++++++++ angular/package.json | 4 ++-- core/README.md | 4 ++-- core/package.json | 2 +- docs/package.json | 2 +- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dee78e4cc..d23f91acff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +## [4.1.2](https://github.com/ionic-team/ionic/compare/v4.1.1...v4.1.2) (2019-03-20) + + +### Bug Fixes + +* **chip:** use transparent outline on color chips ([#17719](https://github.com/ionic-team/ionic/issues/17719)) ([f6783db](https://github.com/ionic-team/ionic/commit/f6783db)) +* **datetime:** default to local date ([#17706](https://github.com/ionic-team/ionic/issues/17706)) ([bab56e8](https://github.com/ionic-team/ionic/commit/bab56e8)) +* **input:** use max-height for input for consistency across browsers ([#17394](https://github.com/ionic-team/ionic/issues/17394)) ([67a9137](https://github.com/ionic-team/ionic/commit/67a9137)) +* **item:** add missing ripple color CSS property ([#17814](https://github.com/ionic-team/ionic/issues/17814)) ([807820f](https://github.com/ionic-team/ionic/commit/807820f)), closes [#17523](https://github.com/ionic-team/ionic/issues/17523) +* **item-option:** add styling for slots other than icon-only ([#17711](https://github.com/ionic-team/ionic/issues/17711)) ([14f758c](https://github.com/ionic-team/ionic/commit/14f758c)), closes [#17737](https://github.com/ionic-team/ionic/issues/17737) [#17402](https://github.com/ionic-team/ionic/issues/17402) +* **platform:** account for larger tablets ([#17630](https://github.com/ionic-team/ionic/issues/17630)) ([29dbd07](https://github.com/ionic-team/ionic/commit/29dbd07)) +* **popover:** update animation origin in RTL/MD ([#17645](https://github.com/ionic-team/ionic/issues/17645)) ([617453b](https://github.com/ionic-team/ionic/commit/617453b)), closes [#17012](https://github.com/ionic-team/ionic/issues/17012) +* **spinner:** fix default spinner logic for relevant components ([#17660](https://github.com/ionic-team/ionic/issues/17660)) ([9c48fa7](https://github.com/ionic-team/ionic/commit/9c48fa7)), closes [#17659](https://github.com/ionic-team/ionic/issues/17659) +* **toggle:** do not use the contrast color for toggle inner color ([#17798](https://github.com/ionic-team/ionic/issues/17798)) ([2225941](https://github.com/ionic-team/ionic/commit/2225941)), closes [#17536](https://github.com/ionic-team/ionic/issues/17536) +* **transition:** animate all toolbars in iOS page transitions ([#17224](https://github.com/ionic-team/ionic/issues/17224)) ([7d01207](https://github.com/ionic-team/ionic/commit/7d01207)) + + + ## [4.1.1](https://github.com/ionic-team/ionic/compare/v4.1.0...v4.1.1) (2019-03-07) diff --git a/angular/package.json b/angular/package.json index d851b9debe..c7d3451a09 100644 --- a/angular/package.json +++ b/angular/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular", - "version": "4.1.1", + "version": "4.1.2", "description": "Angular specific wrappers for @ionic/core", "keywords": [ "ionic", @@ -45,7 +45,7 @@ "css/" ], "dependencies": { - "@ionic/core": "4.1.1", + "@ionic/core": "4.1.2", "tslib": "^1.9.3" }, "peerDependencies": { diff --git a/core/README.md b/core/README.md index dd6b586707..351c7bf91c 100644 --- a/core/README.md +++ b/core/README.md @@ -23,8 +23,8 @@ The Ionic Core package contains the Web Components that make up the reusable UI Easiest way to start using Ionic Core is by adding a script tag to the CDN: ```html - - + + ``` Any Ionic component added to the webpage will automatically load. This includes writing the component tag directly in HTML, or using JavaScript such as `document.createElement('ion-toggle')`. diff --git a/core/package.json b/core/package.json index d6a8470960..8c2e295c26 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "4.1.1", + "version": "4.1.2", "description": "Base components for Ionic", "keywords": [ "ionic", diff --git a/docs/package.json b/docs/package.json index 823e7a54dc..f06701e499 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/docs", - "version": "4.1.1", + "version": "4.1.2", "description": "Pre-packaged API documentation for the Ionic docs.", "main": "core.json", "files": [