diff --git a/.gitignore b/.gitignore index ec8b708..e49a844 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,10 @@ public/assets/scripts/* ======= !public/assets/scripts/dash.js +<<<<<<< HEAD +>>>>>>> develop +======= +!public/assets/scripts/dash.js.map >>>>>>> develop !public/assets/images public/assets/images/* diff --git a/brain/utility/Setup.php b/brain/utility/Setup.php index 5d8c544..128f06e 100644 --- a/brain/utility/Setup.php +++ b/brain/utility/Setup.php @@ -57,8 +57,8 @@ class SetUp 'id' => 1, 'uuid' => StringTools::createUUID(), 'title' => 'FIRST!', - 'feature' => '/assets/images/global/default-bg.jpg', - 'files' => '', + 'imageList' => '/assets/images/global/default-bg.jpg', + 'fileList' => '', 'path' => 'content/pages/start', 'layout' => 'index', 'tags' => 'start, welcome', diff --git a/brain/views/dash/forms/init-fresh.twig b/brain/views/dash/forms/init-fresh.twig index 58450e3..70ba1c3 100644 --- a/brain/views/dash/forms/init-fresh.twig +++ b/brain/views/dash/forms/init-fresh.twig @@ -3,7 +3,7 @@ -