Preparing for release 2.9.4.

BeWelcome · Jul 30, 2018 · 91968ba · 91968ba
2 parents 3ebfd2c + 1fd3a75
commit 91968ba
Show file tree

Hide file tree

Showing 101 changed files with 204 additions and 17 deletions.
diff --git a/build/activities/activitieseditcreate.page.php b/build/activities/activitieseditcreate.page.php
@@ -61,7 +61,7 @@ public function getLateLoadScriptFiles()
         $scripts = parent::getLateLoadScriptfiles();
         $pref = $this->member->getPreference("PreferenceDisableTinyMCE", $default = "No");
         if ($this->member->getPreference("PreferenceDisableTinyMCE", $default = "No") == 'No') {
-            $scripts[] = 'tinymceconfig.js?2';
+            $scripts[] = 'tinymceconfig.js?3';
         }
         return $scripts;
     }

diff --git a/build/invite/invite.page.php b/build/invite/invite.page.php
@@ -113,7 +113,7 @@ public function getLateLoadScriptFiles()
         $scripts = parent::getLateLoadScriptfiles();
         $member = $this->getModel()->getLoggedInMember();
         if ($member->getPreference("PreferenceDisableTinyMCE", $default = "No") == 'No') {
-            $scripts[] = 'tinymceconfig.js?2';
+            $scripts[] = 'tinymceconfig.js?3';
         }
         return $scripts;
     }
@@ -181,7 +181,7 @@ public function getLateLoadScriptFiles()
         $scripts = parent::getLateLoadScriptfiles();
         $member = $this->getModel()->getLoggedInMember();
         if ($member->getPreference("PreferenceDisableTinyMCE", $default = "No") == 'No') {
-            $scripts[] = 'tinymceconfig.js?2';
+            $scripts[] = 'tinymceconfig.js?3';
         }
         return $scripts;
     }

diff --git a/build/messages/pages/compose.page.php b/build/messages/pages/compose.page.php
@@ -93,8 +93,8 @@ public function getLateLoadScriptFiles()
     {
         $scripts = parent::getLateLoadScriptfiles();
         if ($this->sender && $this->sender->getPreference("PreferenceDisableTinyMCE", $default = "No") == 'No') {
-            $scripts[] = 'tinymce-4.7.13/tinymce.min.js';
-            $scripts[] = 'tinymceconfig_noimages.js?3';
+            $scripts[] = 'tinymce-4.8.1/tinymce.min.js';
+            $scripts[] = 'tinymceconfig_noimages.js?4';
         }
         return $scripts;
     }

diff --git a/build/suggestions/pages/suggestionsaddoptions.page.php b/build/suggestions/pages/suggestionsaddoptions.page.php
@@ -42,7 +42,7 @@ public function getLateLoadScriptFiles()
         $scripts = parent::getLateLoadScriptfiles();
         $pref = $this->member->getPreference("PreferenceDisableTinyMCE", $default = "No");
         if ($this->member->getPreference("PreferenceDisableTinyMCE", $default = "No") == 'No') {
-            $scripts[] = 'tinymceconfig.js?2';
+            $scripts[] = 'tinymceconfig.js?3';
         }
         return $scripts;
     }

diff --git a/build/suggestions/pages/suggestionseditcreate.page.php b/build/suggestions/pages/suggestionseditcreate.page.php
@@ -60,7 +60,7 @@ public function getLateLoadScriptFiles()
         $scripts = parent::getLateLoadScriptfiles();
         $pref = $this->member->getPreference("PreferenceDisableTinyMCE", $default = "No");
         if ($this->member->getPreference("PreferenceDisableTinyMCE", $default = "No") == 'No') {
-            $scripts[] = 'tinymceconfig.js?2';
+            $scripts[] = 'tinymceconfig.js?3';
         }
         return $scripts;
     }

diff --git a/build/suggestions/pages/suggestionseditoption.page.php b/build/suggestions/pages/suggestionseditoption.page.php
@@ -42,7 +42,7 @@ public function getLateLoadScriptFiles()
         $scripts = parent::getLateLoadScriptfiles();
         $pref = $this->member->getPreference("PreferenceDisableTinyMCE", $default = "No");
         if ($this->member->getPreference("PreferenceDisableTinyMCE", $default = "No") == 'No') {
-            $scripts[] = 'tinymceconfig.js?2';
+            $scripts[] = 'tinymceconfig.js?3';
         }
         return $scripts;
     }

diff --git a/htdocs/script/main.js b/htdocs/script/main.js
@@ -206,7 +206,7 @@ bwrox.selectScripts([
         ]
     },
     {
-        file: "tinymce-4.7.13/tinymce.min.js",
+        file: "tinymce-4.8.1/tinymce.min.js",
         pages: [
             "activities",
             "blog",

diff --git a/htdocs/script/tinymce-4.7.13/tinymce.min.js b/htdocs/script/tinymce-4.7.13/tinymce.min.js
diff --git a/htdocs/script/tinymce-4.8.1/langs/readme.md b/htdocs/script/tinymce-4.8.1/langs/readme.md
@@ -0,0 +1,3 @@
+This is where language files should be placed.
+
+Please DO NOT translate these directly use this service: https://www.transifex.com/projects/p/tinymce/
diff --git a/htdocs/script/tinymce-4.7.13/license.txt → htdocs/script/tinymce-4.8.1/license.txt b/htdocs/script/tinymce-4.7.13/license.txt → htdocs/script/tinymce-4.8.1/license.txt
diff --git a/htdocs/script/tinymce-4.8.1/plugins/advlist/plugin.min.js b/htdocs/script/tinymce-4.8.1/plugins/advlist/plugin.min.js
diff --git a/htdocs/script/tinymce-4.8.1/plugins/anchor/plugin.min.js b/htdocs/script/tinymce-4.8.1/plugins/anchor/plugin.min.js
diff --git a/htdocs/script/tinymce-4.8.1/plugins/autolink/plugin.min.js b/htdocs/script/tinymce-4.8.1/plugins/autolink/plugin.min.js
diff --git a/htdocs/script/tinymce-4.8.1/plugins/autoresize/plugin.min.js b/htdocs/script/tinymce-4.8.1/plugins/autoresize/plugin.min.js
diff --git a/htdocs/script/tinymce-4.8.1/plugins/autosave/plugin.min.js b/htdocs/script/tinymce-4.8.1/plugins/autosave/plugin.min.js
diff --git a/htdocs/script/tinymce-4.8.1/plugins/bbcode/plugin.min.js b/htdocs/script/tinymce-4.8.1/plugins/bbcode/plugin.min.js