Merge branch 'release/6.1.2'

in2code-de · Dec 3, 2020 · 23a23bf · 23a23bf
2 parents 85a572f + 5a8171a
commit 23a23bf
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 13 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,6 +2,7 @@
 
 .gitkeep                         export-ignore
 /.env                            export-ignore
+/.project                        export-ignore
 /.editorconfig                   export-ignore
 /.gitattributes                  export-ignore
 /.gitignore                      export-ignore

diff --git a/Documentation/Changelog/Index.rst b/Documentation/Changelog/Index.rst
@@ -17,6 +17,13 @@ All changes are documented on https://docs.typo3.org/typo3cms/extensions/femanag
    :Changes:
       Release Description
 
+- :Version:
+      6.1.2
+   :Date:
+      2020-12-03
+   :Changes:
+      * [BUGFIX] JavaScript error in FeManager.js - thanks to https://github.com/grischpel
+
 - :Version:
       6.1.1
    :Date:
@@ -56,6 +63,27 @@ All changes are documented on https://docs.typo3.org/typo3cms/extensions/femanag
       * [TASK] Update Unit and Behaviour Tests - Sponsored by inixmedia and in2code
       * [TASK] Remove legacy password hashing code - Sponsored by in2code
 
+- :Version:
+      5.4.2
+   :Date:
+      2020-12-03
+   :Changes:
+      * [BUGFIX] JavaScript error in FeManager.js - thanks to https://github.com/grischpel
+
+- :Version:
+      5.4.1
+   :Date:
+      2020-10-26
+   :Changes:
+      * [BUGFIX] Prevent Exceptions on wrong file upload - thanks to https://github.com/in2code-de/femanager/pull/262
+
+- :Version:
+      5.4.0
+   :Date:
+      2020-08-30
+   :Changes:
+      * [FEATURE] Add support for country selection options (for TYPO3 V8 / V9) - :ref:`see documentation <countryselect>`- Sponsored by Resultify.se
+
 - :Version:
       5.3.1
    :Date:

diff --git a/Resources/Private/JavaScript/Femanager.js b/Resources/Private/JavaScript/Femanager.js
@@ -1,5 +1,11 @@
 jQuery(document).ready(function($) {
-    var labels = JSON.parse(document.querySelector('.tx-femanager[data-labels]').dataset['labels']);
+	var labels;
+
+	if (document.querySelector(".tx-femanager[data-labels]") != null) {
+		labels = JSON.parse(document.querySelector('.tx-femanager[data-labels]').dataset['labels']);
+	} else {
+		labels = [];
+	}
 
 	// javascript validation
 	$('.feManagerValidation').femanagerValidation($);

diff --git a/Resources/Private/gulpfile.js b/Resources/Private/gulpfile.js
@@ -27,7 +27,7 @@ gulp.task('css', function() {
 });
 
 gulp.task('js', function() {
-	gulp.src('JavaScript/**/*.js')
+	return gulp.src('JavaScript/**/*.js')
 			.pipe(plumber())
 			.pipe(uglify())
 			.pipe(rename({
@@ -43,11 +43,11 @@ gulp.task('js', function() {
  *********************************/
 
 gulp.task('watch', function() {
-	gulp.watch('Sass/**/*.scss', ['css']);
-	gulp.watch('JavaScript/**/*.js', ['js']);
+	gulp.watch('Sass/**/*.scss', gulp.task('css'));
+	gulp.watch('JavaScript/**/*.js', gulp.task('js'));
 });
 
-gulp.task('default', ['css', 'js', 'watch']);
+gulp.task('default', gulp.series('css', 'js', 'watch'));
 
 /**
  * Get arguments from commandline

diff --git a/Resources/Private/package.json b/Resources/Private/package.json
@@ -12,10 +12,10 @@
   "author": "in2code.de",
   "license": "GPL2",
   "devDependencies": {
-    "gulp": "^3.9.0",
+    "gulp": "^4.0.0",
     "gulp-plumber": "^1.0.1",
     "gulp-rename": "^1.2.2",
-    "gulp-sass": "^2.1.1",
+    "gulp-sass": "^3.2.1",
     "gulp-uglify": "^1.5.1",
     "npm-run-all": "^4.1.5"
   }

diff --git a/Resources/Public/JavaScript/Femanager.min.js b/Resources/Public/JavaScript/Femanager.min.js
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -23,7 +23,7 @@
     'modify_tables' => '',
     'clearCacheOnLoad' => 0,
     'lockType' => '',
-    'version' => '6.1.1',
+    'version' => '6.1.2',
     'constraints' => [
         'depends' => [
             'typo3' => '10.0.0-10.4.99',

diff --git a/readme.md b/readme.md
@@ -34,10 +34,14 @@ Official support (fee-based) via https://www.in2code.de/kontakt
 
 | Version    | Date       | State        | Description                                                                                                                |
 | ---------- | ---------- | ------------ | -------------------------------------------------------------------------------------------------------------------------- |
+| 6.1.2      | 2020-12-03 | Bugfix       | Prevent JS Validation error |
 | 6.1.1      | 2020-08-13 | Bugfix       | Prevent some notices and errors, exception during file upload and changed method call                                      |
 | 6.1.0      | 2020-08-13 | Minor        | Add Support for country select options                                                                                     |
 | 6.0.1      | 2020-05-26 | Major        | Drop false declared support for TYPO3 9 in V6 Branch                                                                       |
 | 6.0.0      | 2020-05-26 | Major        | !!!Support TYPO3 10 LTS only                                                                                               |
+| 5.4.2      | 2020-12-03 | Bugfix       | Prevent JS Validation error |
+| 5.4.1      | 2020-10-26 | Bugfix       | Prevents Exception when uploading a file which is not allowed                                                              |
+| 5.4.0      | 2020-08-30 | Minor update | New validation option for countries with state subselection (TYPO3 V8/V9)                                                  |
 | 5.3.1      | 2020-08-06 | Bugfix       | Allow validation with captcha                                                                                              |
 | 5.2.0      | 2019-05-26 | Security     | !!!Implement CSFR Protection - please check upgrade instructions                                                           |
 | 5.1.1      | 2019-05-26 | Bugfix       | Repair Admin Confirmation for TYPO3 9                                                                                      |
@@ -66,12 +70,15 @@ Official support (fee-based) via https://www.in2code.de/kontakt
 
 ## Your Contribution
 
-**Pull requests** are welcome in general! Nevertheless please don't forget to add a description to your pull requests. This
-is very helpful to understand what kind of issue the **PR** is going to solve.
+**Pull requests** are welcome in general! Please note these requirements:
+* Unit Tests must still work
+* Behaviour Tests must still work
+* Describe how to test your pull request
+* TYPO3 coding guidelines must be respected
 
-- Bugfixes: Please describe what kind of bug your fix solve and give us feedback how to reproduce the issue. We're going
+- **Bugfixes**: Please describe what kind of bug your fix solve and give us feedback how to reproduce the issue. We're going
 to accept only bugfixes that can be reproduced.
-- Features: Not every feature is relevant for the bulk of the users. In addition: We don't want to make the extension
+- **Features**: Not every feature is relevant for the bulk of the users. In addition: We don't want to make the extension
 even more complicated in usability for an edge case feature. Please discuss a new feature before.
 
 ## Screenshots