diff --git a/Credits.txt b/Credits.txt index 719a06a1..7d18a751 100644 --- a/Credits.txt +++ b/Credits.txt @@ -122,7 +122,7 @@ Howler HTMLPurifier Description: Validates and cleans submitted HTML for content Location: system/3rd_party/HTMLPurifier - Included version: 4.17.0 + Included version: 4.18.0 Website: http://htmlpurifier.org License: http://www.gnu.org/copyleft/lesser.html diff --git a/applications/blog/data/javascript.xml b/applications/blog/data/javascript.xml index 728e8c41..e2347878 100644 --- a/applications/blog/data/javascript.xml +++ b/applications/blog/data/javascript.xml @@ -1,6 +1,6 @@ - - \ "); diff --git a/applications/blog/data/lang.xml b/applications/blog/data/lang.xml index 65901663..911845f8 100644 --- a/applications/blog/data/lang.xml +++ b/applications/blog/data/lang.xml @@ -1,6 +1,6 @@ - + Blogs Blogs a comment on a blog entry diff --git a/applications/blog/data/versions.json b/applications/blog/data/versions.json index 052c0a7a..fbb59ba1 100644 --- a/applications/blog/data/versions.json +++ b/applications/blog/data/versions.json @@ -283,5 +283,7 @@ "5000031": "5.0.0 Beta 5", "5000032": "5.0.0 Beta 6", "5000033": "5.0.0 Beta 7", - "5000034": "5.0.0 Beta 7" + "5000034": "5.0.0 Beta 7", + "5000035": "5.0.0 Beta 7", + "5000036": "5.0.0 Beta 8" } \ No newline at end of file diff --git a/applications/blog/setup/upg_5000035/data.json b/applications/blog/setup/upg_5000035/data.json new file mode 100644 index 00000000..1d4061ed --- /dev/null +++ b/applications/blog/setup/upg_5000035/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000035, + "name": "5.0.0 Beta 7", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeeditor": true, + "javascript": false, + "emailTemplates": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_5000035/themeeditor.json b/applications/blog/setup/upg_5000035/themeeditor.json new file mode 100644 index 00000000..6493d217 --- /dev/null +++ b/applications/blog/setup/upg_5000035/themeeditor.json @@ -0,0 +1,14 @@ +{ + "categories": { + "added": [], + "edited": [], + "removed": [] + }, + "settings": { + "added": [], + "edited": [ + "layout_blog_view" + ], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/blog/setup/upg_5000036/data.json b/applications/blog/setup/upg_5000036/data.json new file mode 100644 index 00000000..b44f536c --- /dev/null +++ b/applications/blog/setup/upg_5000036/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000036, + "name": "5.0.0 Beta 8", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeeditor": true, + "javascript": false, + "emailTemplates": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/blog/setup/upg_5000036/themeeditor.json b/applications/blog/setup/upg_5000036/themeeditor.json new file mode 100644 index 00000000..6493d217 --- /dev/null +++ b/applications/blog/setup/upg_5000036/themeeditor.json @@ -0,0 +1,14 @@ +{ + "categories": { + "added": [], + "edited": [], + "removed": [] + }, + "settings": { + "added": [], + "edited": [ + "layout_blog_view" + ], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/calendar/data/javascript.xml b/applications/calendar/data/javascript.xml index 2903b917..1a05fcd9 100644 --- a/applications/calendar/data/javascript.xml +++ b/applications/calendar/data/javascript.xml @@ -1,6 +1,6 @@ - - - - - - - - - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -2113,7 +2113,7 @@ var PER_PAGE = 16; }); }(jQuery, _)); - \ ");]]> -
diff --git a/applications/calendar/data/lang.xml b/applications/calendar/data/lang.xml index f6fe5a18..2fa2cd5e 100644 --- a/applications/calendar/data/lang.xml +++ b/applications/calendar/data/lang.xml @@ -1,6 +1,6 @@ - + Events Events a comment on an event diff --git a/applications/calendar/data/versions.json b/applications/calendar/data/versions.json index 052c0a7a..fbb59ba1 100644 --- a/applications/calendar/data/versions.json +++ b/applications/calendar/data/versions.json @@ -283,5 +283,7 @@ "5000031": "5.0.0 Beta 5", "5000032": "5.0.0 Beta 6", "5000033": "5.0.0 Beta 7", - "5000034": "5.0.0 Beta 7" + "5000034": "5.0.0 Beta 7", + "5000035": "5.0.0 Beta 7", + "5000036": "5.0.0 Beta 8" } \ No newline at end of file diff --git a/applications/calendar/setup/upg_5000035/data.json b/applications/calendar/setup/upg_5000035/data.json new file mode 100644 index 00000000..c2291bd1 --- /dev/null +++ b/applications/calendar/setup/upg_5000035/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000035, + "name": "5.0.0 Beta 7", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeeditor": false, + "javascript": false, + "emailTemplates": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/calendar/setup/upg_5000036/data.json b/applications/calendar/setup/upg_5000036/data.json new file mode 100644 index 00000000..eb3c267e --- /dev/null +++ b/applications/calendar/setup/upg_5000036/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000036, + "name": "5.0.0 Beta 8", + "steps": { + "queries": false, + "lang": false, + "theme": false, + "themeeditor": false, + "javascript": false, + "emailTemplates": false, + "acpSearchKeywords": false, + "settings": false, + "tasks": false, + "modules": false, + "widgets": false, + "customOptions": false, + "customRoutines": false + }, + "forceMainUpgrader": false, + "forceManualDownloadNoCiC": false, + "forceManualDownloadCiC": false +} \ No newline at end of file diff --git a/applications/cms/data/javascript.xml b/applications/cms/data/javascript.xml index f009634e..375e6a51 100644 --- a/applications/cms/data/javascript.xml +++ b/applications/cms/data/javascript.xml @@ -1,6 +1,6 @@ - - - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -156,7 +156,7 @@ } }); }(jQuery, _)); - - - - - - - - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -1420,7 +1420,7 @@ } }); }(jQuery, _)); - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -1470,7 +1470,7 @@ } }); }(jQuery, _)); - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -1542,7 +1542,7 @@ } }); }(jQuery, _)); - - - - /** + /** * Invision Community * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com * @@ -3009,7 +3009,7 @@ } }); }(jQuery, _)); - \ {{{contents}}}\ \ @@ -3026,7 +3026,7 @@ ips.templates.set( 'templates.media.noSearchResults', "\ {{#lang}}mediaNoResults{{/lang}}\
\ ");]]>
- {{title}} \ diff --git a/applications/cms/data/lang.xml b/applications/cms/data/lang.xml index 99b8ac2a..334110e4 100644 --- a/applications/cms/data/lang.xml +++ b/applications/cms/data/lang.xml @@ -1,6 +1,6 @@ - + Pages Pages file @@ -253,6 +253,8 @@ Blocks Database Pages + CSS + Javascript You must select templates to export Upload Templates Upload @@ -363,6 +365,11 @@ All pages should be considered different In this example, the canonical tag will be set to the current page as the page of user generated content is more important.]]> Phrases you create here can be used in custom HTML pages and theme templates to provide content in different languages. + Page Wrappers + Do not import + Select the templates you wish to import, and map it to a template type + Database Templates + Custom Wrappers Page Menu Add to front navigation menu diff --git a/applications/cms/data/theme.xml b/applications/cms/data/theme.xml index 2aeebb77..cb0a236d 100644 --- a/applications/cms/data/theme.xml +++ b/applications/cms/data/theme.xml @@ -1246,7 +1246,7 @@ -