diff --git a/composer.lock b/composer.lock index 814eb72..31e2b7e 100644 --- a/composer.lock +++ b/composer.lock @@ -1335,16 +1335,16 @@ }, { "name": "slim/slim", - "version": "4.12.0", + "version": "4.13.0", "source": { "type": "git", "url": "https://github.com/slimphp/Slim.git", - "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18" + "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/e9e99c2b24398b967841c6c4c3048622cc7e2b18", - "reference": "e9e99c2b24398b967841c6c4c3048622cc7e2b18", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/038fd5713d5a41636fdff0e8dcceedecdd17fc17", + "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17", "shasum": "" }, "require": { @@ -1353,7 +1353,7 @@ "php": "^7.4 || ^8.0", "psr/container": "^1.0 || ^2.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.1", + "psr/http-message": "^1.1 || ^2.0", "psr/http-server-handler": "^1.0", "psr/http-server-middleware": "^1.0", "psr/log": "^1.1 || ^2.0 || ^3.0" @@ -1361,19 +1361,19 @@ "require-dev": { "adriansuter/php-autoload-override": "^1.4", "ext-simplexml": "*", - "guzzlehttp/psr7": "^2.5", + "guzzlehttp/psr7": "^2.6", "httpsoft/http-message": "^1.1", "httpsoft/http-server-request": "^1.1", - "laminas/laminas-diactoros": "^2.17", + "laminas/laminas-diactoros": "^2.17 || ^3", "nyholm/psr7": "^1.8", - "nyholm/psr7-server": "^1.0", - "phpspec/prophecy": "^1.17", - "phpspec/prophecy-phpunit": "^2.0", + "nyholm/psr7-server": "^1.1", + "phpspec/prophecy": "^1.19", + "phpspec/prophecy-phpunit": "^2.1", "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.6", "slim/http": "^1.3", "slim/psr7": "^1.6", - "squizlabs/php_codesniffer": "^3.7" + "squizlabs/php_codesniffer": "^3.9" }, "suggest": { "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware", @@ -1446,7 +1446,7 @@ "type": "tidelift" } ], - "time": "2023-07-23T04:54:29+00:00" + "time": "2024-03-03T21:25:30+00:00" }, { "name": "slim/twig-view", diff --git a/media/tmp/LIVE+screenshot-2024-03-03-at-16-28-19-berlin-luftbilder-map.png b/media/tmp/LIVE+screenshot-2024-03-03-at-16-28-19-berlin-luftbilder-map.png new file mode 100644 index 0000000..9b9c244 Binary files /dev/null and b/media/tmp/LIVE+screenshot-2024-03-03-at-16-28-19-berlin-luftbilder-map.png differ diff --git a/media/tmp/LIVE+screenshot-2024-03-03-at-16-35-13-berlin-luftbilder-map.png b/media/tmp/LIVE+screenshot-2024-03-03-at-16-35-13-berlin-luftbilder-map.png new file mode 100644 index 0000000..d79568c Binary files /dev/null and b/media/tmp/LIVE+screenshot-2024-03-03-at-16-35-13-berlin-luftbilder-map.png differ diff --git a/media/tmp/ORIGINAL+screenshot-2024-03-03-at-16-28-19-berlin-luftbilder-map.png b/media/tmp/ORIGINAL+screenshot-2024-03-03-at-16-28-19-berlin-luftbilder-map.png new file mode 100644 index 0000000..1401033 Binary files /dev/null and b/media/tmp/ORIGINAL+screenshot-2024-03-03-at-16-28-19-berlin-luftbilder-map.png differ diff --git a/media/tmp/ORIGINAL+screenshot-2024-03-03-at-16-35-13-berlin-luftbilder-map.png b/media/tmp/ORIGINAL+screenshot-2024-03-03-at-16-35-13-berlin-luftbilder-map.png new file mode 100644 index 0000000..7e45468 Binary files /dev/null and b/media/tmp/ORIGINAL+screenshot-2024-03-03-at-16-35-13-berlin-luftbilder-map.png differ diff --git a/media/tmp/THUMBS+screenshot-2024-03-03-at-16-28-19-berlin-luftbilder-map.png b/media/tmp/THUMBS+screenshot-2024-03-03-at-16-28-19-berlin-luftbilder-map.png new file mode 100644 index 0000000..b9fe4c9 Binary files /dev/null and b/media/tmp/THUMBS+screenshot-2024-03-03-at-16-28-19-berlin-luftbilder-map.png differ diff --git a/media/tmp/THUMBS+screenshot-2024-03-03-at-16-35-13-berlin-luftbilder-map.png b/media/tmp/THUMBS+screenshot-2024-03-03-at-16-35-13-berlin-luftbilder-map.png new file mode 100644 index 0000000..c95bce3 Binary files /dev/null and b/media/tmp/THUMBS+screenshot-2024-03-03-at-16-35-13-berlin-luftbilder-map.png differ diff --git a/system/typemill/author/auth/login.twig b/system/typemill/author/auth/login.twig index b566980..24c1a52 100644 --- a/system/typemill/author/auth/login.twig +++ b/system/typemill/author/auth/login.twig @@ -80,7 +80,7 @@
-

{{ translate('Welcome back') }}!

+

{{ translate('Welcome back') }}

{{ translate('Login to the author area or go to the') }} {{ translate('homepage') }}

diff --git a/system/typemill/author/js/vue-blox-components.js b/system/typemill/author/js/vue-blox-components.js index ed93213..722a8da 100644 --- a/system/typemill/author/js/vue-blox-components.js +++ b/system/typemill/author/js/vue-blox-components.js @@ -1045,7 +1045,7 @@ bloxeditor.component('definition-component', {
- - Add description + {{ $filters.translate('Add description') }}
@@ -1458,9 +1458,9 @@ bloxeditor.component('image-component', {
-

drag a picture or click to select

+

{{ $filters.translate('drag a picture or click to select') }}

- +
@@ -1768,8 +1768,7 @@ bloxeditor.component('image-component', { if(imgattr != '') { imgmarkdown = imgmarkdown + '{' + imgattr.trim() + '}'; - } - + } if(this.imglink != '') { if(this.imglink.length < 101) @@ -1781,7 +1780,6 @@ bloxeditor.component('image-component', { errors = this.$filters.translate('Maximum size of image link is 100 characters'); } } - if(this.imgcaption != '') { if(this.imgcaption.length < 140) @@ -1793,7 +1791,6 @@ bloxeditor.component('image-component', { errors = this.$filters.translate('Maximum size of image caption is 140 characters'); } } - if(errors) { eventBus.$emit('publishermessage', errors); @@ -1883,7 +1880,7 @@ bloxeditor.component('image-component', { eventBus.$emit('publishermessage', message); } else - { + { self = this; self.load = true; @@ -1897,7 +1894,7 @@ bloxeditor.component('image-component', { reader.onload = function(e) { self.imgpreview = e.target.result; - + self.createmarkdown(); tmaxios.post('/api/v1/image',{ @@ -1912,6 +1909,12 @@ bloxeditor.component('image-component', { self.imgmeta = true; self.imgfile = response.data.name; + + if(self.imgwidth > 820) + { + self.imgwidth = 820; + self.calculateheight(); + } }) .catch(function (error) { @@ -2115,7 +2118,7 @@ bloxeditor.component('file-component', { } else { - errors = 'Maximum size of file-text is 100 characters'; + errors = this.$filters.translate('Maximum size of file-text is 100 characters'); filemarkdown = '[]'; } if(this.fileurl != '') @@ -2126,7 +2129,7 @@ bloxeditor.component('file-component', { } else { - errors = 'Maximum size of file link is 100 characters'; + errors = this.$filters.translate('Maximum size of file link is 100 characters'); } } if(this.fileextension != '') diff --git a/system/typemill/author/js/vue-medialib.js b/system/typemill/author/js/vue-medialib.js index 8c4fab4..29504b3 100644 --- a/system/typemill/author/js/vue-medialib.js +++ b/system/typemill/author/js/vue-medialib.js @@ -30,7 +30,7 @@ const medialib = {

Pagination

-