projects/fipamo
projects/fipamo
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases 24 Packages Wiki Activity Actions

Replaced Moment with Carbon #84

Merged
Ghost merged 148 commits from develop into beta 2022-09-22 05:53:36 +02:00
Conversation 1 Commits 148 Files changed 306 +6 -3
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9923f087a6 - Show all commits

7
app/Services/Data/SortingService.php
View file

@ -60,14 +60,17 @@ class SortingService
} }
$tagData = []; $tagData = [];
//dd($this->settings->getTags()['pages']); $settingsTags = [];
if (isset($this->settings->getTags()['pages'])) {
$settingsTags = $this->settings->getTags()['pages'];
}
$tagData = [ $tagData = [
'debug' => $debug, // for theme kit 'debug' => $debug, // for theme kit
'tags' => $this->p_tags, 'tags' => $this->p_tags,
'theme' => $this->info['theme'], // for theme kit 'theme' => $this->info['theme'], // for theme kit
'title' => 'Pages Tagged as Tag', 'title' => 'Pages Tagged as Tag',
'dynamicRender' => $this->info['dynamicRender'], 'dynamicRender' => $this->info['dynamicRender'],
'pages' => $this->settings->getTags()['pages'], 'pages' => $settingsTags,
'info' => $this->info, 'info' => $this->info,
'menu' => $this->settings->getMenu(), 'menu' => $this->settings->getMenu(),
'media' => [ 'media' => [

2
content/init/settings-template.json
View file

@ -6,7 +6,7 @@
"background": "/assets/images/global/default-bg.jpg", "background": "/assets/images/global/default-bg.jpg",
"private": "true", "private": "true",
"renderOnSave": "false", "renderOnSave": "false",
"theme": "fipamo-default", "theme": "fipamo-default-v2",
"display_limit": 5, "display_limit": 5,
"last_backup": null, "last_backup": null,
"externalAPI": "false", "externalAPI": "false",