From dc1226a0d5ae6a650b24b43283dfbf3512c25e70 Mon Sep 17 00:00:00 2001 From: LePetitTim Date: Thu, 3 Oct 2019 14:33:10 +0200 Subject: [PATCH 1/5] Back to development --- npm-shrinkwrap.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 22da3ee55..f6148c2c3 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "geotrekrando", - "version": "2.21.4", + "version": "2.21.5-dev0", "dependencies": { "@gulp-sourcemaps/identity-map": { "version": "1.0.1", diff --git a/package.json b/package.json index 66f4ac49d..4712a5454 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "geotrekrando", - "version": "2.21.4", + "version": "2.21.5-dev0", "description": "Geotrek rando public portal of Geotrek", "author": "Makina Corpus", "main": "src/app/app.js", From e8aba12105c45d6e3f5005a15b575f12aff835d9 Mon Sep 17 00:00:00 2001 From: LePetitTim Date: Thu, 3 Oct 2019 14:42:11 +0200 Subject: [PATCH 2/5] Change changelog --- CHANGES.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index e69f564c8..742dc3991 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,9 +1,17 @@ -2.21.4-dev0 +2.21.5-dev0 +=================== + +**Bug fixes** + +* + +2.21.4 / 2019-10-03 =================== **Bug fixes** * Fix services not displayed properly +* Fix sensitivity html tags 2.21.3 / 2019-09-25 =================== From a170db5e27a9f41acbfb3149b69beb3d048f7f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20UTARD?= Date: Mon, 7 Oct 2019 16:46:23 +0200 Subject: [PATCH 3/5] Fix doc --- docs/settings-custom-json-all-options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/settings-custom-json-all-options.md b/docs/settings-custom-json-all-options.md index 41462e858..6dc473c10 100644 --- a/docs/settings-custom-json-all-options.md +++ b/docs/settings-custom-json-all-options.md @@ -84,7 +84,7 @@ ENABLE_TOURISTIC_CONTENT | Boolean | `true` | Enable touristic contents service ENABLE_TOURISTIC_EVENTS | Boolean | `true` | Enable touristic events service and fetching from the API ENABLE_DIVES | Boolean | `false` | Enable dives service and fetching from the API DEFAULT_ACTIVE_CATEGORIES | Array of strings (categories id) | `["T"]` | List of default active categories. -LIST_EXCLUDE_CATEGORIES | Array of strings (categories id) | | `[]` | List of categories excluded from the filters on results page. +LIST_EXCLUDE_CATEGORIES | Array of strings (categories id) | `[]` | List of categories excluded from the menu. ENABLE_UNIQUE_CAT | Boolean | `false` | If true, only one category can be activated at the same time in the result page filters. FILTERS_DEFAULT_OPEN | Boolean | `false` | Disable filters by default. DEFAULT_INTEREST | String | `"pois"` | Chose which interest to open by default on detail page. Possible values: `"pois"`, `"near"`, `"children"`, `"parents"`, "" From a13194274067ba33d60580678b0dafec6d61f38c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20UTARD?= Date: Wed, 30 Oct 2019 13:03:01 +0100 Subject: [PATCH 4/5] Fix duration showed on touristic contents --- CHANGES.md | 2 +- src/app/categories/services.js | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 742dc3991..37a5fd589 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,7 +3,7 @@ **Bug fixes** -* +* Fix duration showed on touristic contents 2.21.4 / 2019-10-03 =================== diff --git a/src/app/categories/services.js b/src/app/categories/services.js index a6be8837e..1708e057f 100644 --- a/src/app/categories/services.js +++ b/src/app/categories/services.js @@ -217,10 +217,6 @@ function categoriesService(globalSettings, $q, treksService, contentsService, ev type: 'checkbox', values: aContent.properties.type2 ? angular.copy(aContent.properties.type2) : [] }, - duration: { - type: 'range', - values: globalSettings.DURATION_FILTER ? globalSettings.DURATION_FILTER : [] - }, themes: { type: 'checkbox', values: aContent.properties.themes ? angular.copy(aContent.properties.themes) : [] From 435775ef3680dd2f7dc06d17a51212893176ec64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20UTARD?= Date: Wed, 30 Oct 2019 13:14:36 +0100 Subject: [PATCH 5/5] Preparing release 2.21.5 --- CHANGES.md | 2 +- npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 37a5fd589..87b679c0f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -2.21.5-dev0 +2.21.5 / 2019-10-30 =================== **Bug fixes** diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index f6148c2c3..bead4edc7 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "geotrekrando", - "version": "2.21.5-dev0", + "version": "2.21.5", "dependencies": { "@gulp-sourcemaps/identity-map": { "version": "1.0.1", diff --git a/package.json b/package.json index 4712a5454..3c81ef928 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "geotrekrando", - "version": "2.21.5-dev0", + "version": "2.21.5", "description": "Geotrek rando public portal of Geotrek", "author": "Makina Corpus", "main": "src/app/app.js",