diff --git a/applications/calendar/data/lang.xml b/applications/calendar/data/lang.xml
index e933b1e5..4593cd9f 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 a3d755fc..50ea58c1 100644
--- a/applications/calendar/data/theme.xml
+++ b/applications/calendar/data/theme.xml
@@ -1449,13 +1449,13 @@
\
");]]>- @@ -1492,7 +1492,7 @@
- @@ -1503,7 +1503,7 @@
- - + {{endforeach}} diff --git a/applications/calendar/data/versions.json b/applications/calendar/data/versions.json index ab9a5a29..7c8f8522 100644 --- a/applications/calendar/data/versions.json +++ b/applications/calendar/data/versions.json @@ -275,5 +275,7 @@ "5000023": "5.0.0 Alpha 15", "5000024": "5.0.0 Alpha 16", "5000025": "5.0.0 Alpha 16", - "5000026": "5.0.0 Beta 1" + "5000026": "5.0.0 Beta 1", + "5000027": "5.0.0 Beta 2", + "5000028": "5.0.0 Beta 2" } \ No newline at end of file diff --git a/applications/calendar/setup/upg_5000027/data.json b/applications/calendar/setup/upg_5000027/data.json new file mode 100644 index 00000000..48aadac7 --- /dev/null +++ b/applications/calendar/setup/upg_5000027/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000027, + "name": "5.0.0 Beta 2", + "steps": { + "queries": false, + "lang": false, + "theme": true, + "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_5000027/theme.json b/applications/calendar/setup/upg_5000027/theme.json new file mode 100644 index 00000000..3659b71d --- /dev/null +++ b/applications/calendar/setup/upg_5000027/theme.json @@ -0,0 +1,19 @@ +{ + "html": { + "added": [], + "edited": [ + "front\/submit\/datesForm" + ], + "removed": [] + }, + "css": { + "added": [], + "edited": [], + "removed": [] + }, + "resources": { + "added": [], + "edited": [], + "removed": [] + } +} \ No newline at end of file diff --git a/applications/calendar/setup/upg_5000028/data.json b/applications/calendar/setup/upg_5000028/data.json new file mode 100644 index 00000000..a10afe2d --- /dev/null +++ b/applications/calendar/setup/upg_5000028/data.json @@ -0,0 +1,22 @@ +{ + "id": 5000028, + "name": "5.0.0 Beta 2", + "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/Application.php b/applications/cms/Application.php index 077a4433..ee9a9296 100644 --- a/applications/cms/Application.php +++ b/applications/cms/Application.php @@ -390,12 +390,19 @@ class Application extends SystemApplication continue; } - $block = Widget::load( $this, 'RecordFeed' . $db->id, mt_rand(), array(), $widget['restrict'] ); - $block->allowReuse = (boolean) $widget['allow_reuse']; - $block->menuStyle = $widget['menu_style']; - $block->allowCustomPadding = (bool) $widget['padding']; - $block->layouts = $block->getSupportedLayouts(); - $blocks[] = $block; + try + { + $block = Widget::load( $this, 'RecordFeed' . $db->id, mt_rand(), array(), $widget['restrict'] ); + $block->allowReuse = (boolean)$widget['allow_reuse']; + $block->menuStyle = $widget['menu_style']; + $block->allowCustomPadding = (bool)$widget['padding']; + $block->layouts = $block->getSupportedLayouts(); + $blocks[] = $block; + } + catch ( Exception $e ) + { + continue; + } } } diff --git a/applications/cms/api/comments.php b/applications/cms/api/comments.php index 079b635f..036719f1 100644 --- a/applications/cms/api/comments.php +++ b/applications/cms/api/comments.php @@ -110,7 +110,6 @@ class comments extends CommentController { throw new OutOfRangeException; } - $this->class = 'IPS\cms\Records\Comment' . $database->id; } catch ( OutOfRangeException $e ) { @@ -220,6 +219,14 @@ class comments extends CommentController { throw new Exception( 'INVALID_ID', '2T311/5', 403 ); } + if( $record->useForumComments() ) + { + $this->class = 'IPS\cms\Records\CommentTopicSync' . $database->id; + } + else + { + $this->class = 'IPS\cms\Records\Comment' . $database->id; + } /* Get author */ if ( $this->member ) @@ -242,7 +249,7 @@ class comments extends CommentController } else { - if ( Request::i()->author === 0 ) + if ( (int) Request::i()->author === 0 ) { $author = new Member; $author->name = Request::i()->author_name; diff --git a/applications/cms/api/records.php b/applications/cms/api/records.php index 7a190ec6..7660cd64 100644 --- a/applications/cms/api/records.php +++ b/applications/cms/api/records.php @@ -281,7 +281,7 @@ class records extends ItemController } else { - if ( Request::i()->author === 0 ) + if ( (int) Request::i()->author === 0 ) { $author = new Member; $author->name = Request::i()->author_name; diff --git a/applications/cms/api/reviews.php b/applications/cms/api/reviews.php index 68343f79..7a8650fd 100644 --- a/applications/cms/api/reviews.php +++ b/applications/cms/api/reviews.php @@ -247,7 +247,7 @@ class reviews extends CommentController } else { - if ( Request::i()->author === 0 ) + if ( (int) Request::i()->author === 0 ) { $author = new Member; $author->name = Request::i()->author_name; diff --git a/applications/cms/data/cms_theme.xml b/applications/cms/data/cms_theme.xml index d995e959..89cf8bbe 100644 --- a/applications/cms/data/cms_theme.xml +++ b/applications/cms/data/cms_theme.xml @@ -1463,7 +1463,7 @@ data-view-tracking-data="{expression="base64_encode(json_encode( $review->getVie {lang="or"} - options['unlimited'] === $input->value}}checked aria-checked='true'{{endif}} {{if $input->options['disabled']}}disabled{{endif}} {{if $input->toggles AND \count( $input->toggles )}}{{if $input->toggleOn === FALSE}}data-togglesOff{{else}}data-togglesOn{{endif}}="{expression="implode( ',', $input->toggles )"}"{{endif}} aria-labelledby='label_{$input->name}_unlimited' class="ipsInput ipsInput--toggle"> + options['unlimited'] === $input->value}}checked{{endif}} {{if $input->options['disabled']}}disabled{{endif}} {{if $input->toggles AND \count( $input->toggles )}}{{if $input->toggleOn === FALSE}}data-togglesOff{{else}}data-togglesOn{{endif}}="{expression="implode( ',', $input->toggles )"}"{{endif}} aria-labelledby='label_{$input->name}_unlimited' class="ipsInput ipsInput--toggle"> {{endif}} @@ -1616,7 +1616,7 @@ data-view-tracking-data="{expression="base64_encode(json_encode( $review->getVie {lang="or"} - options['unlimited'] === $input->value}}checked aria-checked='true'{{endif}} {{if $input->options['disabled']}}disabled{{endif}} {{if \count( $input->toggles )}}{{if $input->toggleOn === FALSE}}data-togglesOff{{else}}data-togglesOn{{endif}}="{expression="implode( ',', $input->toggles )"}"{{endif}} aria-labelledby='label_{$input->name}_unlimited' class="ipsInput ipsInput--toggle"> + options['unlimited'] === $input->value}}checked{{endif}} {{if $input->options['disabled']}}disabled{{endif}} {{if \count( $input->toggles )}}{{if $input->toggleOn === FALSE}}data-togglesOff{{else}}data-togglesOn{{endif}}="{expression="implode( ',', $input->toggles )"}"{{endif}} aria-labelledby='label_{$input->name}_unlimited' class="ipsInput ipsInput--toggle"> {{endif}} diff --git a/applications/cms/data/javascript.xml b/applications/cms/data/javascript.xml index 308599b7..bb3cacfe 100644 --- a/applications/cms/data/javascript.xml +++ b/applications/cms/data/javascript.xml @@ -1,6 +1,6 @@
@@ -1551,7 +1551,7 @@
-
{{foreach \IPS\calendar\Date::getDayNames() as $day }}
@@ -54826,7 +54744,7 @@ ips.templates.set('dashboard.menuItem', `
{{name}}
`);]]>
- \
- \
\
{{#lang}}menuManagerNewItem{{/lang}}\
@@ -54873,7 +54791,7 @@ ips.templates.set( 'menuManager.temporaryMenuItem', "\
ips.templates.set( 'menuManager.emptyList', "\
{{#lang}}menuManagerEmptyList{{/lang}} \
");]]>
- {{langString}}...\
");
-ips.templates.set('core.forms.toggle', " \
- \
- \
- \
-");
ips.templates.set('core.forms.validationWrapper', " \
\
+ \
{{{formattedName}}}\
");
@@ -56126,7 +56039,7 @@ ips.templates.set('tableOfContents.linkOptions', `\
`);]]>
- \
\
\
@@ -56145,7 +56058,7 @@ ips.templates.set('club.request.decline', "\
ips.templates.set('club.menu.dragHandle', "\
\
");]]>
- \
\
@@ -56156,7 +56069,7 @@ ips.templates.set('messages.view.placeholder', " \
ips.templates.set('messages.main.folderMenu', "\
{{name}} {{count}} \
");]]>
-
@@ -56175,7 +56088,7 @@ ips.templates.set('core.streams.noMore', `
ips.templates.set('core.streams.loadMore', `
{{#lang}}loadNewActivity{{/lang}}
`);]]>
- \
{{/hasNotifications}}\
@@ -56184,7 +56097,7 @@ ips.templates.set('core.streams.loadMore', `
{{/hasNotifications}}\
{{text}}\
");]]>
- {{title}}\
");
@@ -56330,7 +56243,7 @@ ips.templates.set('vse.colorizer.panel', " \
\
\
");]]>\
@@ -54839,7 +54757,7 @@ ips.templates.set( 'moderatorPermissions.checkUncheckAll', "\
\
\
");]]>- {{content}}
Once you save a chart with your desired filter settings, they will all show here for quick and easy access.]]>
]]>As the user types, suggestions will appear. Any custom emoji you have set up with text starting and ending with : will be included.]]>
{lang="or"}
-
+
{{endif}}
@@ -5155,7 +5155,7 @@
value='1'
id='check_{$name}'
class="ipsInput ipsInput--toggle"
- {{if $value}}checked aria-checked='true'{{endif}}
+ {{if $value}}checked{{endif}}
{{if $disabled}}disabled aria-disabled='true'{{endif}}
{{if !empty($togglesOn) OR !empty($togglesOff)}}data-control="toggle"{{endif}}
{{if !empty($togglesOn)}} data-togglesOn="{expression="implode( ',', $togglesOn )"}" aria-controls="{expression="implode( ',', $togglesOn )"}"{{endif}}
@@ -5199,7 +5199,7 @@
name="{expression="trim( $name, '[]' )"}_unlimited"
value='{$unlimited}'
id="{expression="trim( $id ?: $name, '[]' )"}_unlimited"
- {{if $unlimited === $value}}checked aria-checked='true'{{else}}aria-checked='false'{{endif}}
+ {{if $unlimited === $value}}checked{{endif}}
{{if $disabled}}disabled aria-disabled='true'{{endif}}
class="ipsSwitch"
data-role="checkboxsetUnlimitedToggle"
@@ -5302,7 +5302,7 @@
{lang="or"}
-
+
{{endif}}
@@ -5439,7 +5439,7 @@
{lang="or"}
-
+
{{endif}}]]>
+
{{endif}}]]>
-
+
{{endif}}
{{endforeach}}
@@ -6415,7 +6415,7 @@
{lang="or"}
-
+
{{endif}}
@@ -6478,9 +6478,9 @@
{lang='reg_connect'}
@@ -19015,6 +19018,7 @@ data-view-tracking-data="{expression="base64_encode(json_encode( $review->getVie {{endif}} +{{if count(\IPS\core\Reports\Types::roots() )>0}}{lang="responses_to_report"}
@@ -19033,7 +19037,7 @@ data-view-tracking-data="{expression="base64_encode(json_encode( $review->getVie-
@@ -22359,7 +22363,7 @@ data-view-tracking-data="{expression="base64_encode(json_encode( $review->getVie
{lang="or"}
-
+
]]>
{setting="base_url"}{$url}]]>
@@ -26059,7 +26063,7 @@ data-view-tracking-data="{expression="base64_encode(json_encode( $review->getVie
{lang="remember_me_desc"}
@@ -26769,9 +26773,9 @@ data-view-tracking-data="{expression="base64_encode(json_encode( $review->getVie
{lang='reg_connect'}