diff --git a/admin/upgrade/html/forms/noapps.phtml b/admin/upgrade/html/forms/noapps.phtml index 266c5020..c9581ddd 100644 --- a/admin/upgrade/html/forms/noapps.phtml +++ b/admin/upgrade/html/forms/noapps.phtml @@ -1,5 +1,7 @@ -

{lang="no_apps_upgrade"}

-
- {lang="exit_upgrader"} +
+

{lang="no_apps_upgrade"}

+
\ No newline at end of file diff --git a/applications/blog/data/hooks.json b/applications/blog/data/hooks.json deleted file mode 100644 index 0637a088..00000000 --- a/applications/blog/data/hooks.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/applications/blog/data/javascript.xml b/applications/blog/data/javascript.xml index 3a1ff603..4b39b049 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 ab721eab..d77e73d1 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/themesettings.json b/applications/blog/data/themesettings.json deleted file mode 100644 index 9e26dfee..00000000 --- a/applications/blog/data/themesettings.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/applications/blog/data/versions.json b/applications/blog/data/versions.json index c3cc4ef1..690ddcd5 100644 --- a/applications/blog/data/versions.json +++ b/applications/blog/data/versions.json @@ -310,5 +310,11 @@ "5000040": "5.0.0 Beta 9.1", "5000041": "5.0.0 Beta 10", "5000042": "5.0.0 Beta 11", - "5000043": "5.0.0 Beta 11.1" + "5000043": "5.0.0 Beta 11.1", + "5000044": "5.0.0 Beta 12", + "5000045": "5.0.0 Beta 13", + "5000046": "5.0.0 Beta 14", + "5000047": "5.0.0 Beta 14.1", + "5000048": "5.0.0 Beta 14.2", + "5000049": "5.0.0" } \ No newline at end of file diff --git a/applications/blog/hooks/index.html b/applications/blog/hooks/index.html deleted file mode 100644 index e69de29b..00000000 diff --git a/applications/blog/setup/upg_5000044/data.json b/applications/blog/setup/upg_5000044/data.json new file mode 100644 index 00000000..b7dbe1db --- /dev/null +++ b/applications/blog/setup/upg_5000044/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000044, + "name": "5.0.0 Beta 12", + "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_5000044/themeeditor.json b/applications/blog/setup/upg_5000044/themeeditor.json new file mode 100644 index 00000000..6493d217 --- /dev/null +++ b/applications/blog/setup/upg_5000044/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_5000045/data.json b/applications/blog/setup/upg_5000045/data.json new file mode 100644 index 00000000..5519dcc9 --- /dev/null +++ b/applications/blog/setup/upg_5000045/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000045, + "name": "5.0.0 Beta 13", + "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_5000045/themeeditor.json b/applications/blog/setup/upg_5000045/themeeditor.json new file mode 100644 index 00000000..6493d217 --- /dev/null +++ b/applications/blog/setup/upg_5000045/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_5000046/data.json b/applications/blog/setup/upg_5000046/data.json new file mode 100644 index 00000000..39151a60 --- /dev/null +++ b/applications/blog/setup/upg_5000046/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000046, + "name": "5.0.0 Beta 14", + "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_5000046/themeeditor.json b/applications/blog/setup/upg_5000046/themeeditor.json new file mode 100644 index 00000000..6493d217 --- /dev/null +++ b/applications/blog/setup/upg_5000046/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_5000047/data.json b/applications/blog/setup/upg_5000047/data.json new file mode 100644 index 00000000..90da81f3 --- /dev/null +++ b/applications/blog/setup/upg_5000047/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000047, + "name": "5.0.0 Beta 14.1", + "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_5000047/themeeditor.json b/applications/blog/setup/upg_5000047/themeeditor.json new file mode 100644 index 00000000..6493d217 --- /dev/null +++ b/applications/blog/setup/upg_5000047/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_5000048/data.json b/applications/blog/setup/upg_5000048/data.json new file mode 100644 index 00000000..a5aca401 --- /dev/null +++ b/applications/blog/setup/upg_5000048/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000048, + "name": "5.0.0 Beta 14.2", + "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_5000048/themeeditor.json b/applications/blog/setup/upg_5000048/themeeditor.json new file mode 100644 index 00000000..6493d217 --- /dev/null +++ b/applications/blog/setup/upg_5000048/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_5000049/data.json b/applications/blog/setup/upg_5000049/data.json new file mode 100644 index 00000000..45a2f05a --- /dev/null +++ b/applications/blog/setup/upg_5000049/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000049, + "name": "5.0.0", + "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_5000049/themeeditor.json b/applications/blog/setup/upg_5000049/themeeditor.json new file mode 100644 index 00000000..6493d217 --- /dev/null +++ b/applications/blog/setup/upg_5000049/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/hooks.json b/applications/calendar/data/hooks.json deleted file mode 100644 index 0637a088..00000000 --- a/applications/calendar/data/hooks.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/applications/calendar/data/javascript.xml b/applications/calendar/data/javascript.xml index 47e0dc15..8f5fbead 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 90cb83fc..08ff7259 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/theme.xml b/applications/calendar/data/theme.xml index 24f705c5..ef948fd2 100644 --- a/applications/calendar/data/theme.xml +++ b/applications/calendar/data/theme.xml @@ -1944,10 +1944,12 @@
{{endif}} -
+
{$event->container()->_title} - {{if $event->container()->allow_comments}}{lang="event_comment_count" pluralize="$event->comments"}{{endif}} - {{if $event->container()->allow_reviews}}{lang="event_review_count" pluralize="$event->reviews"}{{endif}} +
+ {{if $event->container()->allow_comments}}{lang="event_comment_count" pluralize="$event->comments"}{{endif}} + {{if $event->container()->allow_reviews}}{lang="event_review_count" pluralize="$event->reviews"}{{endif}} +
@@ -1984,6 +1986,11 @@ {{endforeach}} ]]> + - + -