Przeglądaj źródła

Version 1.3.0: Meta Information

trendschau 5 lat temu
rodzic
commit
e09487e668

+ 1 - 1
cache/lastCache.txt

@@ -1 +1 @@
-1577803430
+1577899842

+ 2 - 2
composer.json

@@ -18,7 +18,7 @@
 		"symfony/event-dispatcher": "~3.3",		
 		"symfony/event-dispatcher": "~3.3",		
 		"erusev/parsedown": "~1.4",
 		"erusev/parsedown": "~1.4",
 		"erusev/parsedown-extra": "dev-master",
 		"erusev/parsedown-extra": "dev-master",
-		"jbroadway/urlify": "~1.1",
+		"jbroadway/urlify": "1.1.3",
 		"vlucas/valitron": "dev-master"
 		"vlucas/valitron": "dev-master"
     },
     },
 	"autoload": {
 	"autoload": {
@@ -29,4 +29,4 @@
 	},
 	},
     "minimum-stability": "dev",
     "minimum-stability": "dev",
     "prefer-stable": true	
     "prefer-stable": true	
-}
+}

+ 23 - 56
composer.lock

@@ -4,40 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
         "This file is @generated automatically"
     ],
     ],
-    "content-hash": "328aaaddc688305607b91d9aacb0eddb",
+    "content-hash": "b2dd4b8a1c943c5e407add9f1b9104ea",
     "packages": [
     "packages": [
-        {
-            "name": "container-interop/container-interop",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/container-interop/container-interop.git",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "shasum": ""
-            },
-            "require": {
-                "psr/container": "^1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Interop\\Container\\": "src/Interop/Container/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-            "homepage": "https://github.com/container-interop/container-interop",
-            "abandoned": "psr/container",
-            "time": "2017-02-14T19:40:03+00:00"
-        },
         {
         {
             "name": "erusev/parsedown",
             "name": "erusev/parsedown",
             "version": "1.8.0-beta-7",
             "version": "1.8.0-beta-7",
@@ -90,12 +58,12 @@
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/erusev/parsedown-extra.git",
                 "url": "https://github.com/erusev/parsedown-extra.git",
-                "reference": "f21b40a1973b6674903a6da9857ee215e8839f96"
+                "reference": "32f6e957286bf9ff98d07ca924a18299461acc8f"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/f21b40a1973b6674903a6da9857ee215e8839f96",
-                "reference": "f21b40a1973b6674903a6da9857ee215e8839f96",
+                "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/32f6e957286bf9ff98d07ca924a18299461acc8f",
+                "reference": "32f6e957286bf9ff98d07ca924a18299461acc8f",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
@@ -132,7 +100,7 @@
                 "parsedown",
                 "parsedown",
                 "parser"
                 "parser"
             ],
             ],
-            "time": "2018-05-08T22:06:04+00:00"
+            "time": "2019-12-29T11:14:16+00:00"
         },
         },
         {
         {
             "name": "jbroadway/urlify",
             "name": "jbroadway/urlify",
@@ -531,20 +499,19 @@
         },
         },
         {
         {
             "name": "slim/slim",
             "name": "slim/slim",
-            "version": "3.12.2",
+            "version": "3.12.3",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/slimphp/Slim.git",
                 "url": "https://github.com/slimphp/Slim.git",
-                "reference": "200c6143f15baa477601879b64ab2326847aac0b"
+                "reference": "1c9318a84ffb890900901136d620b4f03a59da38"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Slim/zipball/200c6143f15baa477601879b64ab2326847aac0b",
-                "reference": "200c6143f15baa477601879b64ab2326847aac0b",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/1c9318a84ffb890900901136d620b4f03a59da38",
+                "reference": "1c9318a84ffb890900901136d620b4f03a59da38",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
-                "container-interop/container-interop": "^1.2",
                 "ext-json": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-libxml": "*",
                 "ext-simplexml": "*",
                 "ext-simplexml": "*",
@@ -601,26 +568,26 @@
                 "micro",
                 "micro",
                 "router"
                 "router"
             ],
             ],
-            "time": "2019-08-20T18:46:05+00:00"
+            "time": "2019-11-28T17:40:33+00:00"
         },
         },
         {
         {
             "name": "slim/twig-view",
             "name": "slim/twig-view",
-            "version": "2.5.0",
+            "version": "2.5.1",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/slimphp/Twig-View.git",
                 "url": "https://github.com/slimphp/Twig-View.git",
-                "reference": "06ef39b58d60b11a9546893fd0b7fff2bd901798"
+                "reference": "47bd5cc1cbbdf5196d0873ece0ee97c6c7b352e9"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Twig-View/zipball/06ef39b58d60b11a9546893fd0b7fff2bd901798",
-                "reference": "06ef39b58d60b11a9546893fd0b7fff2bd901798",
+                "url": "https://api.github.com/repos/slimphp/Twig-View/zipball/47bd5cc1cbbdf5196d0873ece0ee97c6c7b352e9",
+                "reference": "47bd5cc1cbbdf5196d0873ece0ee97c6c7b352e9",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
                 "php": ">=5.5.0",
                 "php": ">=5.5.0",
                 "psr/http-message": "^1.0",
                 "psr/http-message": "^1.0",
-                "twig/twig": "^1.38|^2.7"
+                "twig/twig": "^1.38|^2.7|^3.0"
             },
             },
             "require-dev": {
             "require-dev": {
                 "phpunit/phpunit": "^4.8|^5.7",
                 "phpunit/phpunit": "^4.8|^5.7",
@@ -652,11 +619,11 @@
                 "twig",
                 "twig",
                 "view"
                 "view"
             ],
             ],
-            "time": "2019-04-06T16:34:38+00:00"
+            "time": "2019-11-28T18:03:50+00:00"
         },
         },
         {
         {
             "name": "symfony/event-dispatcher",
             "name": "symfony/event-dispatcher",
-            "version": "v3.4.35",
+            "version": "v3.4.36",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
@@ -719,16 +686,16 @@
         },
         },
         {
         {
             "name": "symfony/polyfill-ctype",
             "name": "symfony/polyfill-ctype",
-            "version": "v1.12.0",
+            "version": "v1.13.1",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
+                "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
-                "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
+                "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
@@ -740,7 +707,7 @@
             "type": "library",
             "type": "library",
             "extra": {
             "extra": {
                 "branch-alias": {
                 "branch-alias": {
-                    "dev-master": "1.12-dev"
+                    "dev-master": "1.13-dev"
                 }
                 }
             },
             },
             "autoload": {
             "autoload": {
@@ -773,7 +740,7 @@
                 "polyfill",
                 "polyfill",
                 "portable"
                 "portable"
             ],
             ],
-            "time": "2019-08-06T08:03:45+00:00"
+            "time": "2019-11-27T13:56:44+00:00"
         },
         },
         {
         {
             "name": "symfony/yaml",
             "name": "symfony/yaml",

+ 1 - 1
system/Controllers/ContentController.php

@@ -4,7 +4,7 @@ namespace Typemill\Controllers;
 
 
 use Slim\Http\Request;
 use Slim\Http\Request;
 use Slim\Http\Response;
 use Slim\Http\Response;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Typemill\Models\Validation;
 use Typemill\Models\Validation;
 use Typemill\Models\Folder;
 use Typemill\Models\Folder;
 use Typemill\Models\Write;
 use Typemill\Models\Write;

+ 1 - 1
system/Controllers/Controller.php

@@ -6,7 +6,7 @@ namespace Typemill\Controllers;
 use Slim\Http\Request;
 use Slim\Http\Request;
 use Slim\Http\Response;
 use Slim\Http\Response;
 use Slim\Views\Twig;
 use Slim\Views\Twig;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Typemill\Events\OnPageReady;
 use Typemill\Events\OnPageReady;
 
 
 abstract class Controller
 abstract class Controller

+ 1 - 1
system/Settings.php

@@ -54,7 +54,7 @@ class Settings
 			'contentFolder'							=> 'content',
 			'contentFolder'							=> 'content',
 			'cache'									=> true,
 			'cache'									=> true,
 			'cachePath'								=> $rootPath . 'cache',
 			'cachePath'								=> $rootPath . 'cache',
-			'version'								=> '1.2.19',
+			'version'								=> '1.3.0',
 			'setup'									=> true,
 			'setup'									=> true,
 			'welcome'								=> true,
 			'welcome'								=> true,
 			'images'								=> ['live' => ['width' => 820], 'mlibrary' => ['width' => 50, 'height' => 50]],
 			'images'								=> ['live' => ['width' => 820], 'mlibrary' => ['width' => 50, 'height' => 50]],

+ 3 - 3
system/author/layouts/layout.twig

@@ -17,7 +17,7 @@
 		<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ base_url }}/system/author/img/apple-touch-icon-152x152.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/normalize.css" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20191124" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20191231" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 	</head>
 	</head>
 	<body>
 	<body>
@@ -55,7 +55,7 @@
 			</article>
 			</article>
 			<footer></footer>
 			<footer></footer>
 		</div>
 		</div>
-		<script src="{{ base_url }}/system/author/js/color-picker.min.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/author.js?20191124"></script>
+		<script src="{{ base_url }}/system/author/js/color-picker.min.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/author.js?20191231"></script>
 	</body>
 	</body>
 </html>
 </html>

+ 2 - 2
system/author/layouts/layoutAuth.twig

@@ -18,7 +18,7 @@
 		<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ base_url }}/system/author/img/apple-touch-icon-152x152.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/normalize.css" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20191124" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20191231" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 	</head>
 	</head>
 	<body>
 	<body>
@@ -54,6 +54,6 @@
 			{% block content %}{% endblock %}
 			{% block content %}{% endblock %}
 
 
 		</div>
 		</div>
-		<script src="{{ base_url }}/system/author/js/auth.js?20191124"></script>
+		<script src="{{ base_url }}/system/author/js/auth.js?20191231"></script>
 	</body>
 	</body>
 </html>
 </html>

+ 1 - 1
system/author/layouts/layoutBlank.twig

@@ -17,7 +17,7 @@
 		<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ base_url }}/system/author/img/apple-touch-icon-152x152.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/normalize.css" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20191124" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20191231" />
 	</head>
 	</head>
 	<body>
 	<body>
 		<svg style="position: absolute; width: 0; height: 0; overflow: hidden" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 		<svg style="position: absolute; width: 0; height: 0; overflow: hidden" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">

+ 11 - 11
system/author/layouts/layoutBlox.twig

@@ -17,7 +17,7 @@
 		<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ base_url }}/system/author/img/apple-touch-icon-152x152.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/normalize.css" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20191124" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20191231" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 
 
 		{{ assets.renderCSS() }}
 		{{ assets.renderCSS() }}
@@ -164,23 +164,23 @@
 			const myaxios = axios.create();
 			const myaxios = axios.create();
 			myaxios.defaults.baseURL =  "{{ base_url }}";
 			myaxios.defaults.baseURL =  "{{ base_url }}";
 		</script>
 		</script>
-		<script src="{{ base_url }}/system/author/js/vue.min.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/autosize.min.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/sortable.min.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20191124"></script>
+		<script src="{{ base_url }}/system/author/js/vue.min.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/autosize.min.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/sortable.min.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20191231"></script>
 		<script src="{{ base_url }}/system/author/js/author.js?20191124"></script>
 		<script src="{{ base_url }}/system/author/js/author.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/vue-blox-config.js?20191124"></script>
+		<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/vue-blox-config.js?20191231"></script>
 		<script>
 		<script>
 			let formatConfig = {{ settings.formats|json_encode() }};
 			let formatConfig = {{ settings.formats|json_encode() }};
 		</script>
 		</script>
 
 
 		{{ assets.renderEditorJS() }}
 		{{ assets.renderEditorJS() }}
 
 
-		<script src="{{ base_url }}/system/author/js/vue-blox.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/vue-meta.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/vue-navi.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/lazy-video.js?2019124"></script>
+		<script src="{{ base_url }}/system/author/js/vue-blox.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/vue-meta.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/vue-navi.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/lazy-video.js?20191231"></script>
 
 
 		{{ assets.renderJS() }}
 		{{ assets.renderJS() }}
 
 

+ 9 - 9
system/author/layouts/layoutEditor.twig

@@ -18,7 +18,7 @@
 
 
 		
 		
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20191124" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20191231" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 	</head>
 	</head>
 	<body>
 	<body>
@@ -56,13 +56,13 @@
 			</article>
 			</article>
 			<footer></footer>
 			<footer></footer>
 		</div>
 		</div>
-		<script src="{{ base_url }}/system/author/js/vue.min.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/autosize.min.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/sortable.min.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/author.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20191124"></script>		
-		<script src="{{ base_url }}/system/author/js/vue-editor.js?20191124"></script>
-		<script src="{{ base_url }}/system/author/js/vue-navi.js?20191124"></script>
+		<script src="{{ base_url }}/system/author/js/vue.min.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/autosize.min.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/sortable.min.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/author.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20191231"></script>		
+		<script src="{{ base_url }}/system/author/js/vue-editor.js?20191231"></script>
+		<script src="{{ base_url }}/system/author/js/vue-navi.js?20191231"></script>
 	</body>
 	</body>
 </html>
 </html>

+ 3 - 3
themes/typemill/cover.twig

@@ -1,9 +1,9 @@
 {% extends '/partials/layoutCover.twig' %}
 {% extends '/partials/layoutCover.twig' %}
 
 
-{% block title %}{{ settings.title }}{% endblock %}
-
 {% block content %}
 {% block content %}
-	
+
+	<h1>{{ title }}</h1>
+
 	<div class="lead">
 	<div class="lead">
 
 
 		{{ content }}
 		{{ content }}

+ 0 - 1
themes/typemill/partials/layoutCover.twig

@@ -40,7 +40,6 @@
 	</head>
 	</head>
 	<body>
 	<body>
 		<div class="cover">
 		<div class="cover">
-			<h1>{{ settings.title }}</h1>
 			{% block content %}{% endblock %}
 			{% block content %}{% endblock %}
 			<nav class="toc-nav">
 			<nav class="toc-nav">
 				{% include 'partials/navigationCover.twig' %}
 				{% include 'partials/navigationCover.twig' %}

+ 1 - 1
themes/typemill/typemill.yaml

@@ -1,5 +1,5 @@
 name: Typemill Theme
 name: Typemill Theme
-version: 1.1.9
+version: 1.2.0
 description: The standard theme for Typemill. Responsive, minimal and without any dependencies. It uses the system fonts Calibri and Helvetica. No JavaScript is used. 
 description: The standard theme for Typemill. Responsive, minimal and without any dependencies. It uses the system fonts Calibri and Helvetica. No JavaScript is used. 
 author: Sebastian Schürmanns
 author: Sebastian Schürmanns
 homepage: https://typemill.net
 homepage: https://typemill.net