diff --git a/cache/lastCache.txt b/cache/lastCache.txt index 50cb51d..4f15335 100644 --- a/cache/lastCache.txt +++ b/cache/lastCache.txt @@ -1 +1 @@ -1556956478 \ No newline at end of file +1556962245 \ No newline at end of file diff --git a/composer.lock b/composer.lock index b27916b..d0aacb4 100644 --- a/composer.lock +++ b/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], "content-hash": "90ca8c01f77b4f6cff7e68e20e9097f3", @@ -530,16 +530,16 @@ }, { "name": "slim/slim", - "version": "3.12.0", + "version": "3.12.1", "source": { "type": "git", "url": "https://github.com/slimphp/Slim.git", - "reference": "f4947cc900b6e51cbfda58b9f1247bca2f76f9f0" + "reference": "eaee12ef8d0750db62b8c548016d82fb33addb6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/f4947cc900b6e51cbfda58b9f1247bca2f76f9f0", - "reference": "f4947cc900b6e51cbfda58b9f1247bca2f76f9f0", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/eaee12ef8d0750db62b8c548016d82fb33addb6b", + "reference": "eaee12ef8d0750db62b8c548016d82fb33addb6b", "shasum": "" }, "require": { @@ -597,7 +597,7 @@ "micro", "router" ], - "time": "2019-01-15T13:21:25+00:00" + "time": "2019-04-16T16:47:29+00:00" }, { "name": "slim/twig-view", @@ -652,7 +652,7 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.4.24", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -773,7 +773,7 @@ }, { "name": "symfony/yaml", - "version": "v2.8.49", + "version": "v2.8.50", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", @@ -823,16 +823,16 @@ }, { "name": "twig/twig", - "version": "v1.38.4", + "version": "v1.40.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "7732e9e7017d751313811bd118de61302e9c8b35" + "reference": "35889516bbd6bbe46a600c2c33b03515df4a076e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/7732e9e7017d751313811bd118de61302e9c8b35", - "reference": "7732e9e7017d751313811bd118de61302e9c8b35", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/35889516bbd6bbe46a600c2c33b03515df4a076e", + "reference": "35889516bbd6bbe46a600c2c33b03515df4a076e", "shasum": "" }, "require": { @@ -847,7 +847,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.38-dev" + "dev-master": "1.40-dev" } }, "autoload": { @@ -885,7 +885,7 @@ "keywords": [ "templating" ], - "time": "2019-03-23T14:27:19+00:00" + "time": "2019-04-29T14:12:28+00:00" }, { "name": "vlucas/valitron", diff --git a/system/Settings.php b/system/Settings.php index 8aa82e0..50204f3 100644 --- a/system/Settings.php +++ b/system/Settings.php @@ -9,10 +9,11 @@ class Settings $defaultSettings = self::getDefaultSettings(); $userSettings = self::getUserSettings(); - $settings = array_merge($defaultSettings, $userSettings); + $settings = $defaultSettings; if($userSettings) - { + { + $settings = array_merge($defaultSettings, $userSettings); $settings['setup'] = false; } @@ -47,7 +48,7 @@ class Settings 'contentFolder' => 'content', 'cache' => true, 'cachePath' => $rootPath . 'cache', - 'version' => '1.2.12', + 'version' => '1.2.13', 'setup' => true, 'welcome' => true, 'images' => ['live' => ['width' => 820], 'mlibrary' => ['width' => 50, 'height' => 50]], diff --git a/system/author/auth/welcome.twig b/system/author/auth/welcome.twig index f47e616..c69dab2 100644 --- a/system/author/auth/welcome.twig +++ b/system/author/auth/welcome.twig @@ -11,7 +11,7 @@

Hurra!

Your account has been created and you are logged in now.

Next step: Visit the author panel and setup your new website. You can configure the system, choose themes and add plugins.

-

New:With this latest version you can add a new content block with the visual editor everywhere on a page, not just at the end of the text. Sounds natural, but was pretty hard to code :)

+

New: Have you ever heared of definition lists? With this latest version you can add this exotic and very semantic markdown-feature easily with the visual editor.

Get help: If you have any questions, please consult the docs or open a new issue on github.

Configure your website diff --git a/system/author/layouts/layout.twig b/system/author/layouts/layout.twig index 58fcd66..af51cc3 100644 --- a/system/author/layouts/layout.twig +++ b/system/author/layouts/layout.twig @@ -16,9 +16,9 @@ - + - + @@ -35,7 +35,7 @@ - - + + \ No newline at end of file diff --git a/system/author/layouts/layoutAuth.twig b/system/author/layouts/layoutAuth.twig index bc40b75..85dc53b 100644 --- a/system/author/layouts/layoutAuth.twig +++ b/system/author/layouts/layoutAuth.twig @@ -17,9 +17,9 @@ - + - + @@ -29,6 +29,6 @@ {% block content %}{% endblock %} - + \ No newline at end of file diff --git a/system/author/layouts/layoutBlank.twig b/system/author/layouts/layoutBlank.twig index f0050a7..508b907 100644 --- a/system/author/layouts/layoutBlank.twig +++ b/system/author/layouts/layoutBlank.twig @@ -16,9 +16,9 @@ - + - +
diff --git a/system/author/layouts/layoutBlox.twig b/system/author/layouts/layoutBlox.twig index 9feb476..c0f1c0f 100644 --- a/system/author/layouts/layoutBlox.twig +++ b/system/author/layouts/layoutBlox.twig @@ -17,9 +17,9 @@ - + - + @@ -36,14 +36,14 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/system/author/layouts/layoutEditor.twig b/system/author/layouts/layoutEditor.twig index 86de3b7..9e38e05 100644 --- a/system/author/layouts/layoutEditor.twig +++ b/system/author/layouts/layoutEditor.twig @@ -17,9 +17,9 @@ - + - + @@ -36,13 +36,13 @@ - - - - - - - - + + + + + + + + \ No newline at end of file