Merging develop into master for release.

BeWelcome · Jul 6, 2018 · 3ebfd2c · 3ebfd2c
2 parents 9061301 + 317a9c5
commit 3ebfd2c
Show file tree

Hide file tree

Showing 106 changed files with 47 additions and 220 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?1';
+            $scripts[] = 'tinymceconfig.js?2';
         }
         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?1';
+            $scripts[] = 'tinymceconfig.js?2';
         }
         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?1';
+            $scripts[] = 'tinymceconfig.js?2';
         }
         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.11/tinymce.min.js';
-            $scripts[] = 'tinymceconfig_noimages.js?2';
+            $scripts[] = 'tinymce-4.7.13/tinymce.min.js';
+            $scripts[] = 'tinymceconfig_noimages.js?3';
         }
         return $scripts;
     }

diff --git a/build/messages/templates/compose.php b/build/messages/templates/compose.php
@@ -25,9 +25,9 @@
 $model = new MembersModel();
 $member = $model->getMemberWithUsername($receiver_username);
 ?>
-<div id="message" class="floatbox">
+<div id="message" >
     <div id="shade_top"></div>
-    <div id="messageheader" class="floatbox">
+    <div id="messageheader" style="height:6em">
         <div id="messageside" class="float_right">
       <p class="small grey">
         <?=$words->get('LivesIn')?> <strong><?=$member->City?>, <?=$member->Country?></strong><br />
@@ -73,7 +73,7 @@
     </div> <!-- messageheader -->
     <form method="post" action="<?=$page_url ?>">
         <?=$callback_tag ?>
-    <div id="messagecontent">
+    <div >
 
             <?php if ($receiver_username) { ?>
             <input type="hidden" name="receiver_id" value="<?=$receiver_id ?>"/>
@@ -104,7 +104,7 @@
 
     </div> <!-- messageconent -->
     <div id="messagefooter">
-        <p class="floatbox">
+        <p>
             <input type="submit" value="<?php echo $words->getBuffered('ComposeSend');?>"/><?php echo $words->flushBuffer();?>
         </p>
     </div> <!-- messagefooter -->

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?1';
+            $scripts[] = 'tinymceconfig.js?2';
         }
         return $scripts;
     }

diff --git a/build/suggestions/pages/suggestionsbase.page.php b/build/suggestions/pages/suggestionsbase.page.php
@@ -89,7 +89,6 @@ protected function getSubmenuItems()
         // The first item might be overwritten in SuggestionsEditCreatePage
         $items[] = array('about', 'suggestions/about', $words->getSilent('SuggestionsAbout'));
 		if ($this->member) {
-			$items[] = array('create', 'suggestions/create', $words->getSilent('SuggestionsCreate'));
             $items[] = array('approve', 'suggestions/approve', $words->getSilent('SuggestionsAwaitApproval'));
         }
         $items[] = array('discuss', 'suggestions/discuss', $words->getSilent('SuggestionsDiscuss'));

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?1';
+            $scripts[] = 'tinymceconfig.js?2';
         }
         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?1';
+            $scripts[] = 'tinymceconfig.js?2';
         }
         return $scripts;
     }

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

diff --git a/htdocs/script/tinymce-4.7.11/jquery.tinymce.min.js b/htdocs/script/tinymce-4.7.11/jquery.tinymce.min.js
diff --git a/htdocs/script/tinymce-4.7.11/langs/readme.md b/htdocs/script/tinymce-4.7.11/langs/readme.md
diff --git a/htdocs/script/tinymce-4.7.11/plugins/advlist/plugin.min.js b/htdocs/script/tinymce-4.7.11/plugins/advlist/plugin.min.js
diff --git a/htdocs/script/tinymce-4.7.11/plugins/anchor/plugin.min.js b/htdocs/script/tinymce-4.7.11/plugins/anchor/plugin.min.js
diff --git a/htdocs/script/tinymce-4.7.11/plugins/autolink/plugin.min.js b/htdocs/script/tinymce-4.7.11/plugins/autolink/plugin.min.js
diff --git a/htdocs/script/tinymce-4.7.11/plugins/autoresize/plugin.min.js b/htdocs/script/tinymce-4.7.11/plugins/autoresize/plugin.min.js
diff --git a/htdocs/script/tinymce-4.7.11/plugins/autosave/plugin.min.js b/htdocs/script/tinymce-4.7.11/plugins/autosave/plugin.min.js