Skip to content
Permalink
Browse files

Preparing for release 2.9.4.

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

This file was deleted.

Oops, something went wrong.
@@ -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/

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

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

0 comments on commit 91968ba

Please sign in to comment.
You can’t perform that action at this time.