mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-04 21:27:41 +02:00
Code Issues Releases Wiki Activity

Version 1.5.0: Finishing

Browse Source
This commit is contained in:
trendschau
2021-10-10 12:19:13 +02:00
parent 5c4a7c9f6a
commit bc04fa7544
13 changed files with 82 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
composer.lock generated
View File

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

11
cypress/test02-initial-frontend.spec.js
View File

@@ -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')

25
cypress/test05-blox-editor.spec.js
View File

@@ -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')

21
cypress/test99-login.spec.js
View File

@@ -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', '')
})
})

BIN
media/live/multilanguage.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
media/original/multilanguage.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
media/thumbs/multilanguage.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 21 KiB

2
system/Settings.php
View File

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

16
system/author/layouts/layout.twig
View File

@@ -16,8 +16,8 @@
<link rel="apple-touch-icon" sizes="144x144" href="{{ base_url }}/system/author/img/favicon-144.png" />
<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/tachyons.min.css?20210901" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20210901" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/tachyons.min.css?20211010" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20211010" />
{{ assets.renderCSS() }}
@@ -39,16 +39,16 @@
</article>
<footer></footer>
</div>
<script src="{{ base_url }}/system/author/js/axios.min.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/axios.min.js?20211010"></script>
<script>
const myaxios = axios.create();
myaxios.defaults.baseURL = "{{ base_url }}";
</script>
<script src="{{ base_url }}/system/author/js/autosize.min.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue.min.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-shared.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/author.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/typemillutils.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/autosize.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-shared.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/author.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/typemillutils.js?20211010"></script>
<script>
typemillUtilities.start()
</script>

2
system/author/layouts/layoutAuth.twig
View File

@@ -17,7 +17,7 @@
<link rel="apple-touch-icon" sizes="144x144" href="{{ base_url }}/system/author/img/favicon-144.png" />
<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20210901" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20211010" />
{{ assets.renderCSS() }}

2
system/author/layouts/layoutBlank.twig
View File

@@ -16,7 +16,7 @@
<link rel="apple-touch-icon" sizes="144x144" href="{{ base_url }}/system/author/img/favicon-144.png" />
<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20210901" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20211010" />
</head>
<body>

32
system/author/layouts/layoutBlox.twig
View File

@@ -16,8 +16,8 @@
<link rel="apple-touch-icon" sizes="144x144" href="{{ base_url }}/system/author/img/favicon-144.png" />
<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/tachyons.min.css?20210901" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20210901" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/tachyons.min.css?20211010" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20211010" />
{{ assets.renderCSS() }}
@@ -41,17 +41,17 @@
</article>
<footer></footer>
</div>
<script src="{{ base_url }}/system/author/js/axios.min.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/axios.min.js?20211010"></script>
<script>
const myaxios = axios.create();
myaxios.defaults.baseURL = "{{ base_url }}";
</script>
<script src="{{ base_url }}/system/author/js/typemillutils.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue.min.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/autosize.min.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/author.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-blox-config.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/typemillutils.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/autosize.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/author.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-blox-config.js?20211010"></script>
<script>
let formatConfig = {{ settings.formats|json_encode() }};
let language = {{ settings.language|json_encode() }};
@@ -61,13 +61,13 @@
{{ assets.renderEditorJS() }}
<script src="{{ base_url }}/system/author/js/vue-blox.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-posts.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/sortable.min.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-navi.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-shared.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-meta.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-blox.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-posts.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/sortable.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-navi.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-shared.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-meta.js?20211010"></script>
{{ assets.renderJS() }}

28
system/author/layouts/layoutEditor.twig
View File

@@ -16,8 +16,8 @@
<link rel="apple-touch-icon" sizes="144x144" href="{{ base_url }}/system/author/img/favicon-144.png" />
<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/tachyons.min.css?20210901" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20210901" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/tachyons.min.css?20211010" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20211010" />
{{ assets.renderCSS() }}
@@ -41,15 +41,15 @@
</article>
<footer></footer>
</div>
<script src="{{ base_url }}/system/author/js/axios.min.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/axios.min.js?20211010"></script>
<script>
const myaxios = axios.create();
myaxios.defaults.baseURL = "{{ base_url }}";
</script>
<script src="{{ base_url }}/system/author/js/vue.min.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/autosize.min.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/author.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/autosize.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/author.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20211010"></script>
<script>
let language = {{ settings.language|json_encode() }};
let labels = {{ translations|json_encode() }};
@@ -58,13 +58,13 @@
{{ assets.renderEditorJS() }}
<script src="{{ base_url }}/system/author/js/vue-editor.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-posts.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/sortable.min.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-navi.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-shared.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-meta.js?20210901"></script>
<script src="{{ base_url }}/system/author/js/vue-editor.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-posts.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/sortable.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-navi.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-shared.js?20211010"></script>
<script src="{{ base_url }}/system/author/js/vue-meta.js?20211010"></script>
{{ assets.renderJS() }}