From 2bd2371cd75c0618b33edd6d2a3cfe8ad3bb834f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 19 Dec 2019 07:25:52 +0100 Subject: [PATCH 1/6] Fixed issue number in the README. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77a0a8d..31acc69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ MONARC Changelog - Fixed the creation of the snapshots with empty comment. - Fixed the library categories management (creation of the new ones under root and sub categories). -([#212](https://github.com/monarc-project/MonarcAppFO/issues/216)); +([#216](https://github.com/monarc-project/MonarcAppFO/issues/216)); ## 2.9.4 (2019-12-11) From 6a89119ce57532745a96de89563d207c0d36624c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 19 Dec 2019 07:37:35 +0100 Subject: [PATCH 2/6] Fixed CHANGELOG. --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31acc69..ed58ea8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,9 @@ MONARC Changelog ### Fix - Fixed the creation of the snapshots with empty comment. -- Fixed the library categories management (creation of the new ones under root and sub categories). -([#216](https://github.com/monarc-project/MonarcAppFO/issues/216)); +- Fixed the library categories management (creation of the new ones under root + and sub categories) + ([#216](https://github.com/monarc-project/MonarcAppFO/issues/216)). ## 2.9.4 (2019-12-11) From 121e139b33f6ae124f3deb9ae7406281e09cdce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 19 Dec 2019 07:38:10 +0100 Subject: [PATCH 3/6] Fixed CHANGELOG. --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed58ea8..bb848f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ MONARC Changelog ================ -## 2.9.5 (2019-12-18) +## 2.9.5 (2019-12-19) ### Fix @@ -10,6 +10,7 @@ MONARC Changelog and sub categories) ([#216](https://github.com/monarc-project/MonarcAppFO/issues/216)). + ## 2.9.4 (2019-12-11) ### Fix From 593efd1613d5d88aee4ea64420b850cab9cc3310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 19 Dec 2019 07:59:17 +0100 Subject: [PATCH 4/6] updated update-all script --- scripts/update-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-all.sh b/scripts/update-all.sh index 96ff9dd..1c61e47 100755 --- a/scripts/update-all.sh +++ b/scripts/update-all.sh @@ -52,7 +52,7 @@ if [ $? != 0 ]; then exit 1 fi -composer install -o --no-dev +composer install -o pathCore="module/Monarc/Core" pathFO="module/Monarc/FrontOffice" From e1d777c875c029e96ad3f7023100dd148adcc0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 19 Dec 2019 08:03:43 +0100 Subject: [PATCH 5/6] updated update-all script --- scripts/update-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-all.sh b/scripts/update-all.sh index 1c61e47..96ff9dd 100755 --- a/scripts/update-all.sh +++ b/scripts/update-all.sh @@ -52,7 +52,7 @@ if [ $? != 0 ]; then exit 1 fi -composer install -o +composer install -o --no-dev pathCore="module/Monarc/Core" pathFO="module/Monarc/FrontOffice" From 21865f3cb92c302d6e71866ee87d51579dfef9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 19 Dec 2019 09:45:30 +0100 Subject: [PATCH 6/6] Updated version of MONARC/zm-client in composer.lock --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index aa040d2..c8b2269 100644 --- a/composer.lock +++ b/composer.lock @@ -1556,12 +1556,12 @@ "source": { "type": "git", "url": "https://github.com/monarc-project/zm-client.git", - "reference": "3259d59edc37920f3971b166bc9845fa3a031cea" + "reference": "b35200d5c42bdf7508042dc47a4dc3d3a50c9e04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/3259d59edc37920f3971b166bc9845fa3a031cea", - "reference": "3259d59edc37920f3971b166bc9845fa3a031cea", + "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/b35200d5c42bdf7508042dc47a4dc3d3a50c9e04", + "reference": "b35200d5c42bdf7508042dc47a4dc3d3a50c9e04", "shasum": "" }, "require": { @@ -1627,7 +1627,7 @@ } ], "description": "Frontoffice for monarc/monarc application", - "time": "2019-12-18T10:11:50+00:00" + "time": "2019-12-19T08:39:06+00:00" }, { "name": "monarc/phpword",