diff --git a/antora.yml b/antora.yml index 4405bd2983..e01888d61b 100644 --- a/antora.yml +++ b/antora.yml @@ -26,7 +26,7 @@ asciidoc: # product variables productname: TinyMCE productmajorversion: 7 - productminorversion: '7.4' + productminorversion: '7.5' ##### product name in codeblock prodnamecode: tinymce #### more names diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc index 92772e0965..1e721d3c37 100644 --- a/modules/ROOT/nav.adoc +++ b/modules/ROOT/nav.adoc @@ -407,7 +407,23 @@ ** xref:tinymce-and-csp.adoc[Content Security Policies (CSP)] ** xref:tinymce-and-cors.adoc[Cross-Origin Resource Sharing (CORS)] * Release information -** xref:release-notes.adoc[Release notes for {productname} {productmajorversion}] +** xref:release-notes.adoc[Release notes for {productname}] +*** {productname} 7.5 +**** xref:7.5-release-notes.adoc#overview[Overview] +**** xref:7.5-release-notes.adoc#new-premium-plugin[New Premium Plugin] +**** xref:7.5-release-notes.adoc#new-open-source-plugin[New Open Source Plugin] +**** xref:7.5-release-notes.adoc#accompanying-premium-plugin-changes[Accompanying Premium Plugin changes] +**** xref:7.5-release-notes.adoc#accompanying-premium-plugin-end-of-life-announcement[Accompanying Premium Plugin end-of-life announcement] +**** xref:7.5-release-notes.adoc#accompanying-open-source-plugin-end-of-life-announcement[Accompanying Open Source Plugin end-of-life announcement] +**** xref:7.5-release-notes.adoc#accompanying-enhanced-skins-and-icon-packs-changes[Accompanying Enhanced Skins & Icon Packs changes] +**** xref:7.5-release-notes.adoc#improvements[Improvements] +**** xref:7.5-release-notes.adoc#additions[Additions] +**** xref:7.5-release-notes.adoc#changes[Changes] +**** xref:7.5-release-notes.adoc#removed[Removed] +**** xref:7.5-release-notes.adoc#bug-fixes[Bug fixes] +**** xref:7.5-release-notes.adoc#security-fixes[Security fixes] +**** xref:7.5-release-notes.adoc#deprecated[Deprecated] +**** xref:7.5-release-notes.adoc#known-issues[Known issues] *** {productname} 7.4.1 **** xref:7.4.1-release-notes.adoc#overview[Overview] **** xref:7.4.1-release-notes.adoc#security-fix[Security fix] diff --git a/modules/ROOT/pages/7.5-release-notes.adoc b/modules/ROOT/pages/7.5-release-notes.adoc new file mode 100644 index 0000000000..e53496932d --- /dev/null +++ b/modules/ROOT/pages/7.5-release-notes.adoc @@ -0,0 +1,193 @@ += {productname} {release-version} +:release-version: 7.5 +:navtitle: {productname} {release-version} +:description: Release notes for {productname} {release-version} +:keywords: releasenotes, new, changes, bugfixes +:page-toclevels: 1 + +include::partial$misc/admon-releasenotes-for-stable.adoc[] + + +[[overview]] +== Overview + +{productname} {release-version} was released for {enterpriseversion} and {cloudname} on Wednesday, November 06^th^, 2024. These release notes provide an overview of the changes for {productname} {release-version}, including: + +* xref:new-premium-plugin[New Premium plugin] +* xref:new-open-source-plugin[New Open Source plugin] +* xref:accompanying-premium-plugin-changes[Accompanying Premium plugin changes] +* xref:accompanying-premium-plugin-end-of-life-announcement[Accompanying Premium plugin end-of-life announcement] +* xref:accompanying-open-source-plugin-end-of-life-announcement[Accompanying open source plugin end-of-life-announcement] +* xref:accompanying-enhanced-skins-and-icon-packs-changes[Accompanying Enhanced Skins & Icon Packs changes] +* xref:improvements[Improvements] +* xref:additions[Additions] +* xref:changes[Changes] +* xref:bug-fixes[Bug fixes] +* xref:security-fixes[Security fixes] +* xref:deprecated[Deprecated] +* xref:known-issues[Known issues] + + +[[new-premium-plugin]] +New Premium plugin + +The following new Premium plugin was released alongside {productname} {release-version}. + +=== + +The new Premium plugin, **** // description here. + +For information on the **** plugin, see xref:.adoc[]. + + +[[new-open-source-plugin]] +== New Open Source plugin + +The following new Open Source plugin was released alongside {productname} {release-version}. + +=== + +The new open source plugin, **** // description here. + +For information on the **** plugin, see xref:.adoc[]. + + +[[accompanying-premium-plugin-changes]] +== Accompanying Premium plugin changes + +The following premium plugin updates were released alongside {productname} {release-version}. + +=== + +The {productname} {release-version} release includes an accompanying release of the **** premium plugin. + +**** includes the following . + +==== + +// CCFR here. + +For information on the **** plugin, see: xref:.adoc[]. + + +[[accompanying-premium-plugin-end-of-life-announcement]] +== Accompanying Premium plugin end-of-life announcement + +The following Premium plugin has been announced as reaching its end-of-life: + +=== + +{productname}’s xref:.adoc[] plugin will be deactivated on
, , and is no longer available for purchase. + + +[[accompanying-open-source-plugin-end-of-life-announcement]] +== Accompanying open source plugin end-of-life announcement + +The following open source plugin has been announced as reaching its end-of-life: + +=== + +{productname}’s xref:.adoc[] plugin will be deactivated on
, , and is no longer available for purchase. + + +[[accompanying-enhanced-skins-and-icon-packs-changes]] +== Accompanying Enhanced Skins & Icon Packs changes + +The {productname} {release-version} release includes an accompanying release of the **Enhanced Skins & Icon Packs**. + +=== Enhanced Skins & Icon Packs + +The **Enhanced Skins & Icon Packs** release includes the following updates: + +The **Enhanced Skins & Icon Packs** were rebuilt to pull in the changes also incorporated into the default {productname} {release-version} skin, Oxide. + +For information on using Enhanced Skins & Icon Packs, see: xref:enhanced-skins-and-icon-packs.adoc[Enhanced Skins & Icon Packs]. + + +[[improvements]] +== Improvements + +{productname} {release-version} also includes the following improvement: + +=== +// #TINY-vwxyz1 + +// CCFR here. + + +[[additions]] +== Additions + +{productname} {release-version} also includes the following addition: + +=== +// #TINY-vwxyz1 + +// CCFR here. + + +[[changes]] +== Changes + +{productname} {release-version} also includes the following change: + +=== +// #TINY-vwxyz1 + +// CCFR here. + + +[[removed]] +== Removed + +{productname} {release-version} also includes the following removal: + +=== +// #TINY-vwxyz1 + +// CCFR here. + + +[[bug-fixes]] +== Bug fixes + +{productname} {release-version} also includes the following bug fix: + +=== +// #TINY-vwxyz1 + +// CCFR here. + + +[[security-fixes]] +== Security fixes + +{productname} {release-version} includes : + +=== +// #TINY-vwxyz1 + +// CCFR here. + + +[[deprecated]] +== Deprecated + +{productname} {release-version} includes the following deprecation: + +=== The `` configuration property, ``, has been deprecated + +// placeholder here. + + +[[known-issues]] +== Known issues + +This section describes issues that users of {productname} {release-version} may encounter and possible workarounds for these issues. + +There known issue in {productname} {release-version}. + +=== +// #TINY-vwxyz1 + +// CCFR here. \ No newline at end of file diff --git a/modules/ROOT/pages/changelog.adoc b/modules/ROOT/pages/changelog.adoc index 5c73967a52..634ed30a85 100644 --- a/modules/ROOT/pages/changelog.adoc +++ b/modules/ROOT/pages/changelog.adoc @@ -4,6 +4,10 @@ NOTE: This is the {productname} Community version changelog. For information about the latest {cloudname} or {enterpriseversion} Release, see: xref:release-notes.adoc[{productname} Release Notes]. +// Unreleased +== 7.5 - 2024-11-06 +// TODO + == 7.4.1 - 2024-10-10 === Fixed diff --git a/modules/ROOT/pages/cloud-quick-start.adoc b/modules/ROOT/pages/cloud-quick-start.adoc index 689819c54d..90929f19a8 100644 --- a/modules/ROOT/pages/cloud-quick-start.adoc +++ b/modules/ROOT/pages/cloud-quick-start.adoc @@ -6,3 +6,5 @@ :productSource: cloud include::partial$install/basic-quickstart-base.adoc[] + +include::partial$misc/admin-account-creation-and-social-option.adoc[] \ No newline at end of file diff --git a/modules/ROOT/pages/introduction-to-tinymce.adoc b/modules/ROOT/pages/introduction-to-tinymce.adoc index fbe9e37a5d..b87a663de5 100644 --- a/modules/ROOT/pages/introduction-to-tinymce.adoc +++ b/modules/ROOT/pages/introduction-to-tinymce.adoc @@ -2,4 +2,4 @@ :description: What is TinyMCE and how do I add it to my project. :keywords: tinymce, script, textarea -include::partial$what-is-tinymce.adoc[] +include::partial$what-is-tinymce.adoc[] \ No newline at end of file diff --git a/modules/ROOT/pages/invalid-api-key.adoc b/modules/ROOT/pages/invalid-api-key.adoc index 97bab0c5b1..04ce95bedc 100644 --- a/modules/ROOT/pages/invalid-api-key.adoc +++ b/modules/ROOT/pages/invalid-api-key.adoc @@ -11,6 +11,8 @@ Affected users will receive a xref:cloud-troubleshooting.adoc#A-valid-API-key-is-required-starting-2024-to-continue-using-TinyMCE.-Please-alert-your-admin-to-sign-up-to-get-your-free-API-key.[notification in their editor]. If you receive this notification, please contact the Administrator for your application/site. Admins will need to https://www.tiny.cloud/my-account/integrate/[get a valid API key] and paste it into the code to continue using {productname}. ==== +include::partial$misc/admin-account-creation-and-social-option.adoc[] + == How will I know if this change affects me? If {productname} detects an invalid API key, it will display a notification. If you know or suspect you have been actively hiding or suppressing this notification, please remove these overrides. If you then see a notification, please follow the instructions to resolve the issue. If no notification appears, you are not affected. @@ -64,4 +66,4 @@ You can view the list of approved domains by logging into https://www.tiny.cloud * If you plan to use only open-source {productname} features, the open-source version is available under the _GNU General Public License Version 2 or later license_. * If you want to self-host {productname} and use our Premium features, https://www.tiny.cloud/contact/[get in touch with our Sales team] for a custom quote. -TIP: For additional information on Troubleshooting Tiny Cloud visit: xref:cloud-troubleshooting.adoc[Cloud Troubleshooting]. +TIP: For additional information on Troubleshooting Tiny Cloud visit: xref:cloud-troubleshooting.adoc[Cloud Troubleshooting]. \ No newline at end of file diff --git a/modules/ROOT/pages/release-notes.adoc b/modules/ROOT/pages/release-notes.adoc index 099d57d46e..19605ce3d0 100644 --- a/modules/ROOT/pages/release-notes.adoc +++ b/modules/ROOT/pages/release-notes.adoc @@ -9,6 +9,12 @@ This section lists the releases for {productname} 7 and the changes made in each [cols="1,1"] |=== +a| +[.lead] +xref:7.5-release-notes.adoc#overview[{productname} 7.5] + +Release notes for {productname} 7.5 + a| [.lead] xref:7.4.1-release-notes.adoc#overview[{productname} 7.4.1] @@ -70,6 +76,6 @@ xref:7.0-release-notes.adoc#overview[{productname} 7.0] Release notes for {productname} 7.0 // Uncomment this dummy cell when the number of cells above is odd to ensure the table renders correctly. -// a| +a| |=== diff --git a/modules/ROOT/pages/usage-based-billing.adoc b/modules/ROOT/pages/usage-based-billing.adoc index f26a7fe227..07f4915299 100644 --- a/modules/ROOT/pages/usage-based-billing.adoc +++ b/modules/ROOT/pages/usage-based-billing.adoc @@ -6,7 +6,10 @@ [NOTE] -The below information is only relevant to Tiny Cloud users. Users who self-host the open source version of {productname} are not subject to Usage-Based Billing terms, but are required to comply with the open source license terms. +The below information is only relevant to Tiny Cloud users. Users who self-host the open source version of {productname} are not subject to Usage-Based Billing terms, but are required to comply with the open source license terms. + + +include::partial$misc/admin-account-creation-and-social-option.adoc[] == Definitions @@ -67,4 +70,6 @@ If you have an annual plan, your editor loads are calculated on a monthly basis === If I’m on the Essential plan and reach 5,000 editor loads, will I automatically be upgraded to the Professional plan? -You will not automatically be upgraded. You will remain on your current plan and will automatically be charged $40 USD for each additional block of 1,000 editor loads over your plan limit. To avoid these charges, we encourage you to periodically review your editor load count to ensure you’re on the most appropriate pricing plan. You can always upgrade your plan in our Customer Portal > Settings > Billing Portal > Change Plans. \ No newline at end of file +You will not automatically be upgraded. You will remain on your current plan and will automatically be charged $40 USD for each additional block of 1,000 editor loads over your plan limit. To avoid these charges, we encourage you to periodically review your editor load count to ensure you’re on the most appropriate pricing plan. You can always upgrade your plan in our Customer Portal > Settings > Billing Portal > Change Plans. + +include::partial$misc/admin-account-creation-and-social-option.adoc[] \ No newline at end of file diff --git a/modules/ROOT/partials/misc/admin-account-creation-and-social-option.adoc b/modules/ROOT/partials/misc/admin-account-creation-and-social-option.adoc new file mode 100644 index 0000000000..de9d696276 --- /dev/null +++ b/modules/ROOT/partials/misc/admin-account-creation-and-social-option.adoc @@ -0,0 +1,84 @@ +++++ + + + +++++ \ No newline at end of file diff --git a/modules/ROOT/partials/misc/supported-versions.adoc b/modules/ROOT/partials/misc/supported-versions.adoc index d7408304e6..6664138b98 100644 --- a/modules/ROOT/partials/misc/supported-versions.adoc +++ b/modules/ROOT/partials/misc/supported-versions.adoc @@ -6,6 +6,7 @@ Supported versions of {productname}: [cols="^,^,^",options="header"] |=== |Version |Release Date |End of Premium Support +|7.5 |2025-11/06 |2027-05-06 |7.4 |2024-10-09 |2026-04-09 |7.3 |2024-08-07 |2026-02-07 |7.2 |2024-06-19 |2025-12-19 diff --git a/modules/ROOT/partials/what-is-tinymce.adoc b/modules/ROOT/partials/what-is-tinymce.adoc index 009ac8c3c8..55bcb2f1a3 100644 --- a/modules/ROOT/partials/what-is-tinymce.adoc +++ b/modules/ROOT/partials/what-is-tinymce.adoc @@ -1,5 +1,7 @@ {productname} is a rich-text editor that allows users to create formatted content within a user-friendly interface. +include::partial$misc/admin-account-creation-and-social-option.adoc[] + liveDemo::default-editor[] The output created is in HTML5 and can include lists, tables, and other useful elements, depending on your configuration. The functionality of the editor can be extended through plugins and customizations, or limited to suit your use-case. {productname} can also be customized to look and feel like part of your application or webpage by customizing the user interface. {productname} can be integrated into a range of frameworks and Content Management Systems (CMSs), and can be either: @@ -7,3 +9,5 @@ The output created is in HTML5 and can include lists, tables, and other useful e * Loaded from the {cloudname} CDN (Content Delivery Network), which will ensure {productname} is always using the latest version. * Installed with a package manager (self-hosted). * Extracted from a .zip file (self-hosted). + +include::partial$misc/admin-account-creation-and-social-option.adoc[] \ No newline at end of file