diff --git a/Credits.txt b/Credits.txt index 96cab489..23672d8f 100644 --- a/Credits.txt +++ b/Credits.txt @@ -34,7 +34,7 @@ Browser Icons Clipboard Description: Cross browser copy to clipboard functionality - Location: applications/core/interface/clipboard + Location: applications/core/interface/static/clipboard Included version: 2.0.6 Website: clipboardjs.com License: https://zenorocha.mit-license.org @@ -48,7 +48,7 @@ Codemirror (with C-like, CSS, HTMLMixed, JavaScript, PHP, SQL and XML modes and Cropper Description: Provides cropping functionality for profile photos - Location: applications/core/interface/cropper + Location: applications/core/interface/static/cropper Included version: 1.5.9 Website: https://github.com/fengyuanchen/cropperjs License: http://opensource.org/licenses/MIT @@ -68,7 +68,7 @@ Enum FontAwesome Description: General icons for UI - Location: applications/core/interface/fontawesome + Location: applications/core/interface/static/fontawesome Included version: 6.7.1 Website: https://fontawesome.com License: https://fontawesome.com/license/free @@ -87,7 +87,7 @@ google-code-prettify google-diff-mode-patch Description: Provides diff comparisons for CodeMirror - Location: applications/core/interface/codemirror/diff_match_patch.js + Location: applications/core/interface/static/codemirror/diff_match_patch.js Included version: 19 November 2012 Website: https://code.google.com/p/google-diff-match-patch/ License: http://www.apache.org/licenses/LICENSE-2.0 @@ -325,7 +325,7 @@ Spectrum success.mp3 Notification Sound by RCP Tones Description: "Success" sound used in ips.ui.uploader.js - Location: /applications/core/interface/sounds/success.mp3 + Location: /applications/core/interface/static/sounds/success.mp3 Website: http://rcptones.com/dev_tones/ License: http://creativecommons.org/licenses/by/3.0/us/ diff --git a/applications/blog/data/javascript.xml b/applications/blog/data/javascript.xml index 9aae9e1d..3a1ff603 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 a1f97dc4..ab721eab 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 6e67c960..c3cc4ef1 100644 --- a/applications/blog/data/versions.json +++ b/applications/blog/data/versions.json @@ -308,5 +308,7 @@ "5000038": "5.0.0 Beta 9", "5000039": "5.0.0 Beta 9.1", "5000040": "5.0.0 Beta 9.1", - "5000041": "5.0.0 Beta 10" + "5000041": "5.0.0 Beta 10", + "5000042": "5.0.0 Beta 11", + "5000043": "5.0.0 Beta 11.1" } \ No newline at end of file diff --git a/applications/blog/setup/upg_5000042/data.json b/applications/blog/setup/upg_5000042/data.json new file mode 100644 index 00000000..02ff0630 --- /dev/null +++ b/applications/blog/setup/upg_5000042/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000042, + "name": "5.0.0 Beta 11", + "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_5000042/themeeditor.json b/applications/blog/setup/upg_5000042/themeeditor.json new file mode 100644 index 00000000..6493d217 --- /dev/null +++ b/applications/blog/setup/upg_5000042/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_5000043/data.json b/applications/blog/setup/upg_5000043/data.json new file mode 100644 index 00000000..46194bd7 --- /dev/null +++ b/applications/blog/setup/upg_5000043/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000043, + "name": "5.0.0 Beta 11.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_5000043/themeeditor.json b/applications/blog/setup/upg_5000043/themeeditor.json new file mode 100644 index 00000000..6493d217 --- /dev/null +++ b/applications/blog/setup/upg_5000043/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/sources/Entry/Entry.php b/applications/blog/sources/Entry/Entry.php index 897e8518..432bbd52 100644 --- a/applications/blog/sources/Entry/Entry.php +++ b/applications/blog/sources/Entry/Entry.php @@ -899,7 +899,7 @@ class Entry extends Item implements * @apiresponse datetime date Date * @apiresponse string entry Entry content * @apiresponse int comments Number of comments - * @apiresponse int views Number of posts + * @apiresponse int views Number of views * @apiresponse string prefix The prefix tag, if there is one * @apiresponse [string] tags The tags * @apiresponse bool locked Entry is locked diff --git a/applications/calendar/Application.php b/applications/calendar/Application.php index c687bcc3..dcd5d9ca 100644 --- a/applications/calendar/Application.php +++ b/applications/calendar/Application.php @@ -217,7 +217,7 @@ class Application extends SystemApplication return array_merge( [ 'calendarEvent_rsvp' => [ 'event' => Event::class, - 'action' => "string with the state (attending/etc..)", + 'action' => "string with the state ('no','yes','maybe','leave')", 'attendee' => Member::class ] ],parent::getWebhooks()); diff --git a/applications/calendar/data/acprestrictions.json b/applications/calendar/data/acprestrictions.json index 20be2507..ec292bff 100644 --- a/applications/calendar/data/acprestrictions.json +++ b/applications/calendar/data/acprestrictions.json @@ -16,9 +16,7 @@ }, "settings": { "settings_manage": "settings_manage" - } - }, - "venues": { + }, "venues": { "venues_manage": "venues_manage" } diff --git a/applications/calendar/data/javascript.xml b/applications/calendar/data/javascript.xml index d0f1e82d..47e0dc15 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 efc46029..90cb83fc 100644 --- a/applications/calendar/data/lang.xml +++ b/applications/calendar/data/lang.xml @@ -1,6 +1,6 @@ - + Events Events a comment on an event @@ -197,7 +197,7 @@ event reviews {# [1:Review][?:Reviews]} {# [1:Comment][?:Comments]} - {# [1:user has][?:users have]} RSVPed{!#[0: ][?:, including]} + {# [1:user has][?:users have]} RSVPed{!#[0: ][?:, including]}: Upcoming Events Submit an event With '%s' diff --git a/applications/calendar/data/theme.xml b/applications/calendar/data/theme.xml index a135bbcb..24f705c5 100644 --- a/applications/calendar/data/theme.xml +++ b/applications/calendar/data/theme.xml @@ -1,79 +1,56 @@ + + {{endif}} + {{endforeach}} +{{else}} +
{lang="no_events_today"}
+{{endif}}]]> +]]>