Merge branch '1.1'

* 1.1: Set version to v1.1.6-DEV Update changelog for v1.1.5 Set version to v1.1.5 Set version to v1.0.15-DEV Allow for installation of willdurand/hateoas ^2.10 Set version to v1.0.14 Update changelog for v1.0.14
Sylius · Apr 12, 2018 · 53ec555 · 53ec555
2 parents bd09146 + 931bbe9
commit 53ec555
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/CHANGELOG-1.0.md b/CHANGELOG-1.0.md
@@ -1,5 +1,20 @@
 ## CHANGELOG
 
+### v1.0.14 2018-04-13
+
+- [#9323](https://github.com/Sylius/Sylius/pull/9323) formatting content in a email message (@axzx)
+- [#9322](https://github.com/Sylius/Sylius/pull/9322) Make build passing again (@pamil)
+- [#9316](https://github.com/Sylius/Sylius/pull/9316) Correct minor typo in docs (@cedricziel)
+- [#9315](https://github.com/Sylius/Sylius/pull/9315) [DOC] Minor documentation changes for product reviews (@cedricziel)
+- [#9314](https://github.com/Sylius/Sylius/pull/9314) Minor doc fix (@cedricziel)
+- [#9312](https://github.com/Sylius/Sylius/pull/9312) Fix JS error when autocomplete field is empty (@teohhanhui)
+- [#9308](https://github.com/Sylius/Sylius/pull/9308) [Adjustment] Inject adjustment types that shall be cleared (@Zales0123)
+- [#9302](https://github.com/Sylius/Sylius/pull/9302) willdurand/hateoas 2.12 version update (#9302) (@bartoszpietrzak1994)
+- [#9300](https://github.com/Sylius/Sylius/pull/9300) Outdated method reference removed from docs (@bartoszpietrzak1994)
+- [#9295](https://github.com/Sylius/Sylius/pull/9295) Cleanup PrioritizedCompositeServicePass definition name (@diimpp)
+- [#9284](https://github.com/Sylius/Sylius/pull/9284) [Grid] Filtering orders bug (@Zales0123)
+- [#9268](https://github.com/Sylius/Sylius/pull/9268) Documentation - Use nullable return type (@Holicz)
+
 ### v1.0.13 2018-04-04
 
 - [#9298](https://github.com/Sylius/Sylius/pull/9298) Define conflicts with incompatible dependencies versions (@pamil)

diff --git a/CHANGELOG-1.1.md b/CHANGELOG-1.1.md
@@ -1,5 +1,21 @@
 ## CHANGELOG
 
+### v1.1.5 2018-04-13
+
+- [#9323](https://github.com/Sylius/Sylius/pull/9323) formatting content in a email message (@axzx)
+- [#9322](https://github.com/Sylius/Sylius/pull/9322) Make build passing again (@pamil)
+- [#9316](https://github.com/Sylius/Sylius/pull/9316) Correct minor typo in docs (@cedricziel)
+- [#9315](https://github.com/Sylius/Sylius/pull/9315) [DOC] Minor documentation changes for product reviews (@cedricziel)
+- [#9314](https://github.com/Sylius/Sylius/pull/9314) Minor doc fix (@cedricziel)
+- [#9312](https://github.com/Sylius/Sylius/pull/9312) Fix JS error when autocomplete field is empty (@teohhanhui)
+- [#9308](https://github.com/Sylius/Sylius/pull/9308) [Adjustment] Inject adjustment types that shall be cleared (@Zales0123)
+- [#9303](https://github.com/Sylius/Sylius/pull/9303) HOTFIX: Do not require NelmioAliceBundle in shared kernel (@pamil)
+- [#9302](https://github.com/Sylius/Sylius/pull/9302) willdurand/hateoas 2.12 version update (#9302) (@bartoszpietrzak1994)
+- [#9300](https://github.com/Sylius/Sylius/pull/9300) Outdated method reference removed from docs (@bartoszpietrzak1994)
+- [#9295](https://github.com/Sylius/Sylius/pull/9295) Cleanup PrioritizedCompositeServicePass definition name (@diimpp)
+- [#9284](https://github.com/Sylius/Sylius/pull/9284) [Grid] Filtering orders bug (@Zales0123)
+- [#9268](https://github.com/Sylius/Sylius/pull/9268) Documentation - Use nullable return type (@Holicz)
+
 ### v1.1.4 2018-04-04
 
 - [#9301](https://github.com/Sylius/Sylius/pull/9301) HOTFIX: Do not require FidryAliceDataFixturesBundle in shared kernel (@pamil)

diff --git a/composer.json b/composer.json
@@ -64,7 +64,7 @@
         "twig/twig": "^2.0",
         "webmozart/assert": "^1.1",
         "white-october/pagerfanta-bundle": "^1.0.8",
-        "willdurand/hateoas": "^2.12",
+        "willdurand/hateoas": "^2.10",
         "willdurand/hateoas-bundle": "^1.2",
         "winzou/state-machine-bundle": "^0.3",
         "zendframework/zend-hydrator": "^2.2",