diff --git a/composer.lock b/composer.lock
index 964698d..b27916b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -39,16 +39,16 @@
},
{
"name": "erusev/parsedown",
- "version": "1.8.0-beta-5",
+ "version": "1.8.0-beta-7",
"source": {
"type": "git",
"url": "https://github.com/erusev/parsedown.git",
- "reference": "c26a2ee4bf8ba0270daab7da0353f2525ca6564a"
+ "reference": "fe7a50eceb4a3c867cc9fa9c0aa906b1067d1955"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/erusev/parsedown/zipball/c26a2ee4bf8ba0270daab7da0353f2525ca6564a",
- "reference": "c26a2ee4bf8ba0270daab7da0353f2525ca6564a",
+ "url": "https://api.github.com/repos/erusev/parsedown/zipball/fe7a50eceb4a3c867cc9fa9c0aa906b1067d1955",
+ "reference": "fe7a50eceb4a3c867cc9fa9c0aa906b1067d1955",
"shasum": ""
},
"require": {
@@ -81,7 +81,7 @@
"markdown",
"parser"
],
- "time": "2018-06-11T18:15:32+00:00"
+ "time": "2019-03-17T18:47:21+00:00"
},
{
"name": "erusev/parsedown-extra",
@@ -601,22 +601,22 @@
},
{
"name": "slim/twig-view",
- "version": "2.4.0",
+ "version": "2.5.0",
"source": {
"type": "git",
"url": "https://github.com/slimphp/Twig-View.git",
- "reference": "78386c01a97f7870462b38fff759dad649da9efc"
+ "reference": "06ef39b58d60b11a9546893fd0b7fff2bd901798"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/slimphp/Twig-View/zipball/78386c01a97f7870462b38fff759dad649da9efc",
- "reference": "78386c01a97f7870462b38fff759dad649da9efc",
+ "url": "https://api.github.com/repos/slimphp/Twig-View/zipball/06ef39b58d60b11a9546893fd0b7fff2bd901798",
+ "reference": "06ef39b58d60b11a9546893fd0b7fff2bd901798",
"shasum": ""
},
"require": {
"php": ">=5.5.0",
"psr/http-message": "^1.0",
- "twig/twig": "^1.18|^2.0"
+ "twig/twig": "^1.38|^2.7"
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.7",
@@ -648,20 +648,20 @@
"twig",
"view"
],
- "time": "2018-05-07T10:54:29+00:00"
+ "time": "2019-04-06T16:34:38+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.4.22",
+ "version": "v3.4.24",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "ed5be1663fa66623b3a7004d5d51a14c4045399b"
+ "reference": "a088aafcefb4eef2520a290ed82e4374092a6dff"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ed5be1663fa66623b3a7004d5d51a14c4045399b",
- "reference": "ed5be1663fa66623b3a7004d5d51a14c4045399b",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a088aafcefb4eef2520a290ed82e4374092a6dff",
+ "reference": "a088aafcefb4eef2520a290ed82e4374092a6dff",
"shasum": ""
},
"require": {
@@ -711,20 +711,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2019-01-16T13:27:11+00:00"
+ "time": "2019-04-02T08:51:52+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.10.0",
+ "version": "v1.11.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+ "reference": "82ebae02209c21113908c229e9883c419720738a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
- "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
+ "reference": "82ebae02209c21113908c229e9883c419720738a",
"shasum": ""
},
"require": {
@@ -736,7 +736,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.9-dev"
+ "dev-master": "1.11-dev"
}
},
"autoload": {
@@ -758,7 +758,7 @@
},
{
"name": "Gert de Pagter",
- "email": "BackEndTea@gmail.com"
+ "email": "backendtea@gmail.com"
}
],
"description": "Symfony polyfill for ctype functions",
@@ -769,7 +769,7 @@
"polyfill",
"portable"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2019-02-06T07:57:58+00:00"
},
{
"name": "symfony/yaml",
@@ -823,16 +823,16 @@
},
{
"name": "twig/twig",
- "version": "v1.37.1",
+ "version": "v1.38.4",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "66be9366c76cbf23e82e7171d47cbfa54a057a62"
+ "reference": "7732e9e7017d751313811bd118de61302e9c8b35"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/66be9366c76cbf23e82e7171d47cbfa54a057a62",
- "reference": "66be9366c76cbf23e82e7171d47cbfa54a057a62",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/7732e9e7017d751313811bd118de61302e9c8b35",
+ "reference": "7732e9e7017d751313811bd118de61302e9c8b35",
"shasum": ""
},
"require": {
@@ -847,7 +847,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.37-dev"
+ "dev-master": "1.38-dev"
}
},
"autoload": {
@@ -885,7 +885,7 @@
"keywords": [
"templating"
],
- "time": "2019-01-14T14:59:29+00:00"
+ "time": "2019-03-23T14:27:19+00:00"
},
{
"name": "vlucas/valitron",
@@ -893,12 +893,12 @@
"source": {
"type": "git",
"url": "https://github.com/vlucas/valitron.git",
- "reference": "c6893fc67ef1228f7692a86ca13c34e5e9ecc9a8"
+ "reference": "c3b4dac8586291990e6398961852e972600ac7b5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/valitron/zipball/c6893fc67ef1228f7692a86ca13c34e5e9ecc9a8",
- "reference": "c6893fc67ef1228f7692a86ca13c34e5e9ecc9a8",
+ "url": "https://api.github.com/repos/vlucas/valitron/zipball/c3b4dac8586291990e6398961852e972600ac7b5",
+ "reference": "c3b4dac8586291990e6398961852e972600ac7b5",
"shasum": ""
},
"require": {
@@ -934,7 +934,7 @@
"validation",
"validator"
],
- "time": "2018-12-14T21:15:14+00:00"
+ "time": "2019-03-21T20:12:22+00:00"
}
],
"packages-dev": [],
diff --git a/system/Settings.php b/system/Settings.php
index 1f6ff43..d649cb8 100644
--- a/system/Settings.php
+++ b/system/Settings.php
@@ -47,7 +47,7 @@ class Settings
'contentFolder' => 'content',
'cache' => true,
'cachePath' => $rootPath . 'cache',
- 'version' => '1.2.11',
+ 'version' => '1.2.12',
'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 5b1df93..f47e616 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: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 :)
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/editor/editor-blox.twig b/system/author/editor/editor-blox.twig
index de6b7be..ad04e30 100644
--- a/system/author/editor/editor-blox.twig
+++ b/system/author/editor/editor-blox.twig
@@ -20,7 +20,7 @@
{% for block in content %}
{{block}}
{% endfor %}
-
+
diff --git a/system/author/js/vue-blox.js b/system/author/js/vue-blox.js
index 2d39418..4fa0dc4 100644
--- a/system/author/js/vue-blox.js
+++ b/system/author/js/vue-blox.js
@@ -68,7 +68,7 @@ const contentComponent = Vue.component('content-block', {
this.$root.$data.bloxOverlay = false;
this.$root.$data.newblock = false;
this.newblock = false;
- self.$root.sortable.option("disabled", false);
+ self.$root.sortable.option("disabled", false);
this.$root.$data.html.splice(bloxid,1);
this.$root.$data.markdown.splice(bloxid,1);
diff --git a/system/author/layouts/layout.twig b/system/author/layouts/layout.twig
index fcbb746..58fcd66 100644
--- a/system/author/layouts/layout.twig
+++ b/system/author/layouts/layout.twig
@@ -35,7 +35,7 @@
-
-
+
+