Permalink
Browse files

Merging develop into master for release.

  • Loading branch information...
thisismeonmounteverest committed Jul 6, 2018
2 parents 9061301 + 317a9c5 commit 3ebfd2ce4e3565bb400aeed9825f4a2793b0b8f0
Showing with 47 additions and 220 deletions.
  1. +1 −1 build/activities/activitieseditcreate.page.php
  2. +2 −2 build/invite/invite.page.php
  3. +2 −2 build/messages/pages/compose.page.php
  4. +4 −4 build/messages/templates/compose.php
  5. +1 −1 build/suggestions/pages/suggestionsaddoptions.page.php
  6. +0 −1 build/suggestions/pages/suggestionsbase.page.php
  7. +1 −1 build/suggestions/pages/suggestionseditcreate.page.php
  8. +1 −1 build/suggestions/pages/suggestionseditoption.page.php
  9. +1 −1 htdocs/script/main.js
  10. +0 −1 htdocs/script/tinymce-4.7.11/jquery.tinymce.min.js
  11. +0 −3 htdocs/script/tinymce-4.7.11/langs/readme.md
  12. +0 −1 htdocs/script/tinymce-4.7.11/plugins/advlist/plugin.min.js
  13. +0 −1 htdocs/script/tinymce-4.7.11/plugins/anchor/plugin.min.js
  14. +0 −1 htdocs/script/tinymce-4.7.11/plugins/autolink/plugin.min.js
  15. +0 −1 htdocs/script/tinymce-4.7.11/plugins/autoresize/plugin.min.js
  16. +0 −1 htdocs/script/tinymce-4.7.11/plugins/autosave/plugin.min.js
  17. +0 −1 htdocs/script/tinymce-4.7.11/plugins/bbcode/plugin.min.js
  18. +0 −1 htdocs/script/tinymce-4.7.11/plugins/charmap/plugin.min.js
  19. +0 −1 htdocs/script/tinymce-4.7.11/plugins/code/plugin.min.js
  20. +0 −138 htdocs/script/tinymce-4.7.11/plugins/codesample/css/prism.css
  21. +0 −1 htdocs/script/tinymce-4.7.11/plugins/codesample/plugin.min.js
  22. +0 −1 htdocs/script/tinymce-4.7.11/plugins/colorpicker/plugin.min.js
  23. +0 −1 htdocs/script/tinymce-4.7.11/plugins/contextmenu/plugin.min.js
  24. +0 −1 htdocs/script/tinymce-4.7.11/plugins/directionality/plugin.min.js
  25. +0 −1 htdocs/script/tinymce-4.7.11/plugins/emoticons/plugin.min.js
  26. +0 −1 htdocs/script/tinymce-4.7.11/plugins/fullpage/plugin.min.js
  27. +0 −1 htdocs/script/tinymce-4.7.11/plugins/fullscreen/plugin.min.js
  28. +0 −1 htdocs/script/tinymce-4.7.11/plugins/help/plugin.min.js
  29. +0 −1 htdocs/script/tinymce-4.7.11/plugins/hr/plugin.min.js
  30. +0 −1 htdocs/script/tinymce-4.7.11/plugins/image/plugin.min.js
  31. +0 −1 htdocs/script/tinymce-4.7.11/plugins/imagetools/plugin.min.js
  32. +0 −1 htdocs/script/tinymce-4.7.11/plugins/importcss/plugin.min.js
  33. +0 −1 htdocs/script/tinymce-4.7.11/plugins/insertdatetime/plugin.min.js
  34. +0 −1 htdocs/script/tinymce-4.7.11/plugins/legacyoutput/plugin.min.js
  35. +0 −1 htdocs/script/tinymce-4.7.11/plugins/link/plugin.min.js
  36. +0 −1 htdocs/script/tinymce-4.7.11/plugins/lists/plugin.min.js
  37. +0 −1 htdocs/script/tinymce-4.7.11/plugins/media/plugin.min.js
  38. +0 −1 htdocs/script/tinymce-4.7.11/plugins/nonbreaking/plugin.min.js
  39. +0 −1 htdocs/script/tinymce-4.7.11/plugins/noneditable/plugin.min.js
  40. +0 −1 htdocs/script/tinymce-4.7.11/plugins/pagebreak/plugin.min.js
  41. +0 −1 htdocs/script/tinymce-4.7.11/plugins/paste/plugin.min.js
  42. +0 −1 htdocs/script/tinymce-4.7.11/plugins/preview/plugin.min.js
  43. +0 −1 htdocs/script/tinymce-4.7.11/plugins/print/plugin.min.js
  44. +0 −1 htdocs/script/tinymce-4.7.11/plugins/save/plugin.min.js
  45. +0 −1 htdocs/script/tinymce-4.7.11/plugins/searchreplace/plugin.min.js
  46. +0 −1 htdocs/script/tinymce-4.7.11/plugins/spellchecker/plugin.min.js
  47. +0 −1 htdocs/script/tinymce-4.7.11/plugins/tabfocus/plugin.min.js
  48. +0 −1 htdocs/script/tinymce-4.7.11/plugins/table/plugin.min.js
  49. +0 −1 htdocs/script/tinymce-4.7.11/plugins/template/plugin.min.js
  50. +0 −1 htdocs/script/tinymce-4.7.11/plugins/textcolor/plugin.min.js
  51. +0 −1 htdocs/script/tinymce-4.7.11/plugins/textpattern/plugin.min.js
  52. +0 −1 htdocs/script/tinymce-4.7.11/plugins/toc/plugin.min.js
  53. +0 −1 htdocs/script/tinymce-4.7.11/plugins/visualblocks/plugin.min.js
  54. +0 −1 htdocs/script/tinymce-4.7.11/plugins/visualchars/plugin.min.js
  55. +0 −1 htdocs/script/tinymce-4.7.11/plugins/wordcount/plugin.min.js
  56. +0 −1 htdocs/script/tinymce-4.7.11/themes/inlite/theme.min.js
  57. +0 −1 htdocs/script/tinymce-4.7.11/themes/mobile/theme.min.js
  58. +0 −1 htdocs/script/tinymce-4.7.11/themes/modern/theme.min.js
  59. +0 −2 htdocs/script/tinymce-4.7.11/tinymce.min.js
  60. 0 htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/license.txt
  61. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-cool.gif
  62. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-cry.gif
  63. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-embarassed.gif
  64. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-foot-in-mouth.gif
  65. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-frown.gif
  66. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-innocent.gif
  67. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-kiss.gif
  68. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-laughing.gif
  69. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-money-mouth.gif
  70. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-sealed.gif
  71. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-smile.gif
  72. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-surprised.gif
  73. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-tongue-out.gif
  74. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-undecided.gif
  75. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-wink.gif
  76. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/emoticons/img/smiley-yell.gif
  77. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/help/img/logo.png
  78. 0 htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/plugins/visualblocks/css/visualblocks.css
  79. +1 −1 htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/content.inline.min.css
  80. +1 −1 htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/content.min.css
  81. 0 htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/content.mobile.min.css
  82. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/fonts/tinymce-mobile.woff
  83. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/fonts/tinymce-small.eot
  84. 0 htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/fonts/tinymce-small.svg
  85. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/fonts/tinymce-small.ttf
  86. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/fonts/tinymce-small.woff
  87. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/fonts/tinymce.eot
  88. 0 htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/fonts/tinymce.svg
  89. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/fonts/tinymce.ttf
  90. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/fonts/tinymce.woff
  91. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/img/anchor.gif
  92. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/img/loader.gif
  93. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/img/object.gif
  94. BIN htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/img/trans.gif
  95. +1 −1 htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/skin.min.css
  96. +1 −0 htdocs/script/tinymce-4.7.13/skins/lightgray/skin.min.css.map
  97. 0 htdocs/script/{tinymce-4.7.11 → tinymce-4.7.13}/skins/lightgray/skin.mobile.min.css
  98. +1 −0 htdocs/script/tinymce-4.7.13/skins/lightgray/skin.mobile.min.css.map
  99. +2 −0 htdocs/script/tinymce-4.7.13/tinymce.min.js
  100. +7 −3 htdocs/script/tinymceconfig.js
  101. +6 −2 htdocs/script/tinymceconfig_noimages.js
  102. +8 −3 htdocs/script/tinymceconfig_php.js
  103. +2 −2 htdocs/styles/css/minimal/minimal.css
  104. +2 −1 htdocs/styles/css/minimal/screen/content_minimal.css
  105. +1 −1 htdocs/styles/css/minimal/screen/tinymce.css
  106. +1 −1 tools/page/html.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;
}
@@ -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;
}
@@ -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;
}
@@ -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 -->
@@ -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;
}
@@ -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'));
@@ -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;
}
@@ -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;
}
@@ -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",

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 3ebfd2c

Please sign in to comment.