Merge branch 'master' into develop

LimeSurvey · Jun 7, 2022 · eb606b4 · eb606b4
2 parents 6f7ca51 + 5f982ad
commit eb606b4
Show file tree

Hide file tree

Showing 15 changed files with 382 additions and 359 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -16,5 +16,5 @@
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['templateapiversion']  = 3;
-$config['assetsversionnumber'] = '30279';
+$config['assetsversionnumber'] = '30280';
 return $config;
diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
@@ -2313,13 +2313,14 @@ function XMLImportResponses($sFullFilePath, $iSurveyID, $aFieldReMap = array())
 }
 
 /**
-* This function imports a CSV file into the response table
-*
-* @param string $sFullFilePath
-* @param integer $iSurveyId
-* @param array $aOptions
-* Return array $result ("errors","warnings","success")
-*/
+ * This function imports a CSV file into the response table
+ * CSV file is deleted during process
+ *
+ * @param string $sFullFilePath
+ * @param integer $iSurveyId
+ * @param array $aOptions
+ * Return array $result ("errors","warnings","success")
+ */
 function CSVImportResponses($sFullFilePath, $iSurveyId, $aOptions = array())
 {
 
@@ -3331,6 +3332,8 @@ function importDefaultValues(SimpleXMLElement $xml, $aLanguagesSupported, $aQIDR
 
 /**
  * Read a csv file and return a tmp resources to same file in utf8
+ * CSV file is deleted during process
+ *
  * @param string $fullfilepath
  * @param string $encoding from
  * @return resource

diff --git a/docs/release_notes.txt b/docs/release_notes.txt
@@ -34,6 +34,29 @@ Thank you to everyone who helped with this new release!
 
 CHANGE LOG
 ------------------------------------------------------
+Changes from 5.3.18 (build 220530) to 5.3.19 (build 220607) June 7, 2022
+-Fixed issue: Question organizer not working (Carsten Schmitz)
+-Fixed issue: #18029 - Removed html tags in emails for v5 (#2446) (François Charles Hébert)
+-Fixed issue #18158: Property "CDbCriteria.qid" is not defined status returned by delete_question (#2444) (Edgar R. M)
+-Fixed issue #18129: Check of json data for upload question (#2433) (Denis Chenu)
+-Fixed issue #18114: Permission will now be checked for user when opening list questions by link/url (#2423) (Patricia Stell)
+-Fixed issue #18110: Unable to get empty help in question attributes (#2421) (Denis Chenu)
+-Fixed issue #18026: Session expire message when submit button is clicked twice (#2337) (Gabriel Jenik)
+-Fixed issue #17837: Directly show edit mode: some quirks (#2441) (Gabriel Jenik)
+-Fixed issue #14909: Improve language consistency (Carsten Schmitz)
+#Updated translation: Valencian by joamuran, vbraque
+#Updated translation: Turkish by kayazeren
+#Updated translation: Thai by tomzt
+#Updated translation: Slovak by c_schmitz, dusanm, jelen1, sweetakasha
+#Updated translation: Polish by elissa
+#Updated translation: Polish (Informal) by elissa
+#Updated translation: Japanese by d_inoue, nomoto
+#Updated translation: French (France) by arnaud21, b00z00, BenoitBouvarel, c_schmitz, DenisChenu, janolap1, Qat, ulysse68, Xave
+#Updated translation: Dutch by Han
+#Updated translation: Dutch (Informal) by Han
+#Updated translation: Chinese (Simplified) by duestin, FangZhijian, zengqing, zhanginshanghai
+
+
 Changes from 5.3.17 (build 220525) to 5.3.18 (build 220530) May 30, 2022
 -Fixed issue #18160: [security] Update jquery-ui to 1.13.1 (Carsten Schmitz)
 -Fixed issue #18150: Survey not properly resuming and showing blank page (#2442) (Gabriel Jenik)

diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot
diff --git a/locale/ca-valencia/ca-valencia.mo b/locale/ca-valencia/ca-valencia.mo
diff --git a/locale/fr/fr.mo b/locale/fr/fr.mo
diff --git a/locale/ja/ja.mo b/locale/ja/ja.mo
diff --git a/locale/nl-informal/nl-informal.mo b/locale/nl-informal/nl-informal.mo
diff --git a/locale/nl/nl.mo b/locale/nl/nl.mo
diff --git a/locale/pl-informal/pl-informal.mo b/locale/pl-informal/pl-informal.mo
diff --git a/locale/pl/pl.mo b/locale/pl/pl.mo
diff --git a/locale/sk/sk.mo b/locale/sk/sk.mo
diff --git a/locale/th/th.mo b/locale/th/th.mo
diff --git a/locale/tr/tr.mo b/locale/tr/tr.mo
diff --git a/locale/zh-Hans/zh-Hans.mo b/locale/zh-Hans/zh-Hans.mo