Version 1.2.13: Definition lists and horizontal lines

cache/lastCache.txt

@@ -1 +1 @@
-1556956478
+1556962245

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",

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]],

system/author/auth/welcome.twig

@@ -11,7 +11,7 @@
 				<h1>Hurra!</h1>
 				<p>Your account has been created and you are logged in now.</p>
 				<p><strong>Next step:</strong> Visit the author panel and setup your new website. You can configure the system, choose themes and add plugins.</p>
-				<p><strong>New:</strong>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 :) </p>
+				<p><strong>New:</strong> 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. </p>
 				<p><strong>Get help:</strong> If you have any questions, please consult the <a target="_blank" href="https://typemill.net/typemill"><i class="icon-link-ext"></i> docs</a> or open a new issue on <a target="_blank" href="https://github.com/typemill/typemill"><i class="icon-link-ext"></i> github</a>.</p>
 			</div>
 			<a class="button" href="{{ path_for('settings.show') }}">Configure your website</a>

system/author/layouts/layout.twig

@@ -16,9 +16,9 @@
 		<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ base_url }}/system/author/img/apple-touch-icon-144x144.png" />
 		<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ base_url }}/system/author/img/apple-touch-icon-152x152.png" />		
 		
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/fontello/css/fontello.css" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/fontello/css/fontello.css?20190504" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20190504" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 	</head>
 	<body>	
@@ -35,7 +35,7 @@
 			</article>
 			<footer></footer>
 		</div>
-		<script src="{{ base_url }}/system/author/js/color-picker.min.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/author.js?20190412"></script>
+		<script src="{{ base_url }}/system/author/js/color-picker.min.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/author.js?20190504"></script>
 	</body>
 </html>

system/author/layouts/layoutAuth.twig

@@ -17,9 +17,9 @@
 		<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ base_url }}/system/author/img/apple-touch-icon-144x144.png" />
 		<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ base_url }}/system/author/img/apple-touch-icon-152x152.png" />
 		
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/fontello/css/fontello.css" />		
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/fontello/css/fontello.css?20190504" />		
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20190504" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 	</head>
 	<body>	
@@ -29,6 +29,6 @@
 			{% block content %}{% endblock %}
 
 		</div>
-		<script src="{{ base_url }}/system/author/js/auth.js?20190412"></script>		
+		<script src="{{ base_url }}/system/author/js/auth.js?20190504"></script>		
 	</body>
 </html>

system/author/layouts/layoutBlank.twig

@@ -16,9 +16,9 @@
 		<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ base_url }}/system/author/img/apple-touch-icon-144x144.png" />
 		<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ base_url }}/system/author/img/apple-touch-icon-152x152.png" />		
 		
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/fontello/css/fontello.css" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/fontello/css/fontello.css?20190504" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20190504" />
 	</head>
 	<body>	
 		<header class="main-header">

system/author/layouts/layoutBlox.twig

@@ -17,9 +17,9 @@
 		<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ base_url }}/system/author/img/apple-touch-icon-152x152.png" />
 
 		
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/fontello/css/fontello.css" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/fontello/css/fontello.css?20190504" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20190217" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20190504" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 	</head>
 	<body>	
@@ -36,14 +36,14 @@
 			</article>
 			<footer></footer>		
 		</div>
-		<script src="{{ base_url }}/system/author/js/vue.min.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/autosize.min.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/sortable.min.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/author.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/vue-blox.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/vue-navi.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/lazy-video.js?20190412"></script>
+		<script src="{{ base_url }}/system/author/js/vue.min.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/autosize.min.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/sortable.min.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/author.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/vue-blox.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/vue-navi.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/lazy-video.js?20190504"></script>
 	</body>
 </html>

system/author/layouts/layoutEditor.twig

@@ -17,9 +17,9 @@
 		<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ base_url }}/system/author/img/apple-touch-icon-152x152.png" />
 
 		
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/fontello/css/fontello.css" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/fontello/css/fontello.css?20190504" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20190412" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20190504" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 	</head>
 	<body>	
@@ -36,13 +36,13 @@
 			</article>
 			<footer></footer>
 		</div>
-		<script src="{{ base_url }}/system/author/js/vue.min.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/autosize.min.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/sortable.min.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/author.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20190412"></script>		
-		<script src="{{ base_url }}/system/author/js/vue-editor.js?20190412"></script>
-		<script src="{{ base_url }}/system/author/js/vue-navi.js?20190412"></script>
+		<script src="{{ base_url }}/system/author/js/vue.min.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/autosize.min.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/sortable.min.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/author.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20190504"></script>		
+		<script src="{{ base_url }}/system/author/js/vue-editor.js?20190504"></script>
+		<script src="{{ base_url }}/system/author/js/vue-navi.js?20190504"></script>
 	</body>
 </html>