Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git int…

…o answers_html # Conflicts: # application/config/version.php
LimeSurvey · Oct 14, 2016 · ada5d2f · ada5d2f
2 parents cc3775f + 1602b3f
commit ada5d2f
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 85 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -12,7 +12,7 @@
  *150413
  */
 
-$config['versionnumber'] = '2.54.2';
+$config['versionnumber'] = '2.54.3';
 $config['dbversionnumber'] = 261;
 $config['buildnumber'] = '';
 $config['updatable'] = true;

diff --git a/docs/release_notes.txt b/docs/release_notes.txt
@@ -36,7 +36,17 @@ CHANGE LOG
 ------------------------------------------------------
 
 
-Changes from  2.54.1 (build 161007) to 2.54.2 (build 161012) Oct 12, 2016
+Changes from  2.54.2 (build 161012) to 2.54.3 (build 161014) Oct 14, 2016
+-Fixed issue #11746: Notice when previewing a hidden question and debug mode activated (Carsten Schmitz)
+-Fixed issue #11765: Admin data entry doesn't work if survey has restricted access (Olle Haerstedt)
+-Fixed issue: Mass-exporting survey archives shows error (Carsten Schmitz)
+-Fixed issue: Remove session warning message from question organizer (Olle Haerstedt)
+#Updated translation: Catalan by qualitatuvic
+#Updated translation: French (France) by arnaud21, DenisChenu
+#Updated translation: German (Informal) by c_schmitz
+#Updated translation: Spanish (Spain) by aesteban
+
+Changes from  2.54.1 (build 161010) to 2.54.2 (build 161012) Oct 12, 2016
 -Fixed issue #11752: Mandatory radio star show 4 stars only (markusfluer)
 -Fixed issue #11760: Helper class ls\ajax\AjaxHelper uses echo keyword as method name (Olle Haerstedt)
 -Fixed issue #11772: Expression manager convert_value does not obey strict setting (Olle Haerstedt)

diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot
diff --git a/locale/ca/ca.mo b/locale/ca/ca.mo
diff --git a/locale/de-informal/de-informal.mo b/locale/de-informal/de-informal.mo
diff --git a/locale/es/es.mo b/locale/es/es.mo
diff --git a/locale/fr/fr.mo b/locale/fr/fr.mo