diff --git a/composer.lock b/composer.lock index 0b41d0f..aee5bb2 100644 --- a/composer.lock +++ b/composer.lock @@ -1255,16 +1255,16 @@ }, { "name": "twig/twig", - "version": "v1.44.4", + "version": "v1.44.5", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "4d400421528e9fa40caaffcf7824c172526dd99d" + "reference": "dd4353357c5a116322e92a00d16043a31881a81e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/4d400421528e9fa40caaffcf7824c172526dd99d", - "reference": "4d400421528e9fa40caaffcf7824c172526dd99d", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/dd4353357c5a116322e92a00d16043a31881a81e", + "reference": "dd4353357c5a116322e92a00d16043a31881a81e", "shasum": "" }, "require": { @@ -1317,7 +1317,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v1.44.4" + "source": "https://github.com/twigphp/Twig/tree/v1.44.5" }, "funding": [ { @@ -1329,7 +1329,7 @@ "type": "tidelift" } ], - "time": "2021-05-16T12:11:20+00:00" + "time": "2021-09-17T08:35:19+00:00" }, { "name": "vlucas/valitron", diff --git a/cypress/test02-initial-frontend.spec.js b/cypress/test02-initial-frontend.spec.js index 3e8e9f8..220f534 100644 --- a/cypress/test02-initial-frontend.spec.js +++ b/cypress/test02-initial-frontend.spec.js @@ -54,17 +54,6 @@ describe('Typemill Initial Frontend', function() }) }) - it('has sitemap xml', function () - { - cy.request({ - url: '/cache/sitemap.xml', - }) - .then((resp) => { - /* should return xml-format */ - expect(resp.headers).to.have.property('content-type','application/xml') - }) - }) - it('has no access to dashboard', function () { cy.visit('/tm/settings') diff --git a/cypress/test05-blox-editor.spec.js b/cypress/test05-blox-editor.spec.js index f9d0a65..f7dcc30 100644 --- a/cypress/test05-blox-editor.spec.js +++ b/cypress/test05-blox-editor.spec.js @@ -262,6 +262,31 @@ describe('Blox Editor', function() }) }) + it('Publishes new page', function() + { + cy.visit('/tm/content/visual/welcome/testpage') + cy.url().should('include','/tm\/content\/visual\/welcome\/testpage') + + cy.get('#publish').click().wait(500) + + cy.visit('/welcome/testpage') + cy.url().should('include','/welcome/testpage') + + cy.get('.cy-nav') + .should('contain', 'Testpage') + }) + + it('has sitemap xml', function () + { + cy.request({ + url: '/cache/sitemap.xml', + }) + .then((resp) => { + /* should return xml-format */ + expect(resp.headers).to.have.property('content-type','application/xml') + }) + }) + it('Deletes new page', function() { cy.visit('/tm/content/visual/welcome/testpage') diff --git a/cypress/test99-login.spec.js b/cypress/test99-login.spec.js index f2dca14..2956676 100644 --- a/cypress/test99-login.spec.js +++ b/cypress/test99-login.spec.js @@ -44,7 +44,7 @@ describe('Typemill Login', function() cy.url().should('include', '/tm/login') }) - it('blocks after 3 fails', function () + it('captcha after 1 fail', function () { cy.visit('/tm/login') @@ -55,17 +55,16 @@ describe('Typemill Login', function() cy.get('#flash-message').should('contain', 'wrong password or username') cy.get('input[name="username"]').should('have.value', 'wrong') cy.get('input[name="password"]').should('have.value', '') + cy.get('input[name="captcha"]').should('have.value', '') - // validation fails second - cy.get('input[name="password"]').clear().type('pass') + // captcha fails first + cy.get('input[name="username"]').clear().type('trendschau') + cy.get('input[name="password"]').clear().type('password') + cy.get('input[name="captcha"]').clear().type('wrong') cy.get('form').submit() - cy.get('#flash-message').should('contain', 'wrong password or username') - - // validation fails third and login is blocked - cy.get('input[name="password"]').clear().type('pass') - cy.get('form').submit() - cy.get('#flash-message').should('contain', 'Too many bad logins') - cy.contains('wait') - cy.contains('forgot password') + cy.get('#flash-message').should('contain', 'Captcha is wrong') + cy.get('input[name="username"]').should('have.value', 'trendschau') + cy.get('input[name="password"]').should('have.value', '') + cy.get('input[name="captcha"]').should('have.value', '') }) }) \ No newline at end of file diff --git a/media/live/multilanguage.png b/media/live/multilanguage.png deleted file mode 100644 index 1f70690..0000000 Binary files a/media/live/multilanguage.png and /dev/null differ diff --git a/media/original/multilanguage.png b/media/original/multilanguage.png deleted file mode 100644 index 482a448..0000000 Binary files a/media/original/multilanguage.png and /dev/null differ diff --git a/media/thumbs/multilanguage.png b/media/thumbs/multilanguage.png deleted file mode 100644 index d9adbbe..0000000 Binary files a/media/thumbs/multilanguage.png and /dev/null differ diff --git a/system/Settings.php b/system/Settings.php index 5e222ad..e3ed32e 100644 --- a/system/Settings.php +++ b/system/Settings.php @@ -84,7 +84,7 @@ class Settings 'editor' => 'visual', 'formats' => ['markdown', 'headline', 'ulist', 'olist', 'table', 'quote', 'notice', 'image', 'video', 'file', 'toc', 'hr', 'definition', 'code'], 'contentFolder' => 'content', - 'version' => '1.4.8.2', + 'version' => '1.5.0', 'setup' => true, 'welcome' => true, 'images' => ['live' => ['width' => 820], 'thumbs' => ['width' => 250, 'height' => 150]], diff --git a/system/author/layouts/layout.twig b/system/author/layouts/layout.twig index dc79cec..8358dda 100644 --- a/system/author/layouts/layout.twig +++ b/system/author/layouts/layout.twig @@ -16,8 +16,8 @@ - - + + {{ assets.renderCSS() }} @@ -39,16 +39,16 @@ - + - - - - - + + + + + diff --git a/system/author/layouts/layoutAuth.twig b/system/author/layouts/layoutAuth.twig index 4c6f495..55cafe4 100644 --- a/system/author/layouts/layoutAuth.twig +++ b/system/author/layouts/layoutAuth.twig @@ -17,7 +17,7 @@ - + {{ assets.renderCSS() }} diff --git a/system/author/layouts/layoutBlank.twig b/system/author/layouts/layoutBlank.twig index 5f2c7d1..5837b92 100644 --- a/system/author/layouts/layoutBlank.twig +++ b/system/author/layouts/layoutBlank.twig @@ -16,7 +16,7 @@ - + diff --git a/system/author/layouts/layoutBlox.twig b/system/author/layouts/layoutBlox.twig index 4799e89..8df1857 100644 --- a/system/author/layouts/layoutBlox.twig +++ b/system/author/layouts/layoutBlox.twig @@ -16,8 +16,8 @@ - - + + {{ assets.renderCSS() }} @@ -41,17 +41,17 @@ - + - - - - - - + + + + + + - - - - - - + + + + + + + {{ assets.renderJS() }} diff --git a/system/author/layouts/layoutEditor.twig b/system/author/layouts/layoutEditor.twig index 92b7322..430c434 100644 --- a/system/author/layouts/layoutEditor.twig +++ b/system/author/layouts/layoutEditor.twig @@ -16,8 +16,8 @@ - - + + {{ assets.renderCSS() }} @@ -41,15 +41,15 @@ - + - - - - + + + + - - - - - - + + + + + + + {{ assets.renderJS() }}