1
0
mirror of https://github.com/typemill/typemill.git synced 2025-08-02 20:27:25 +02:00

Version 1.2.6: Visual Editor

This commit is contained in:
Sebastian
2018-10-30 21:02:46 +01:00
parent 8179baf8f1
commit cf737368c0
14 changed files with 39 additions and 37 deletions

2
cache/lastCache.txt vendored
View File

@@ -1 +1 @@
1540917193
1540919595

8
composer.lock generated
View File

@@ -890,12 +890,12 @@
"source": {
"type": "git",
"url": "https://github.com/vlucas/valitron.git",
"reference": "e3b3eb31a2fc41827ac8d5646e406dde4584f3c2"
"reference": "661365f3173433fd0deee625f1835377ce0947e5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/vlucas/valitron/zipball/e3b3eb31a2fc41827ac8d5646e406dde4584f3c2",
"reference": "e3b3eb31a2fc41827ac8d5646e406dde4584f3c2",
"url": "https://api.github.com/repos/vlucas/valitron/zipball/661365f3173433fd0deee625f1835377ce0947e5",
"reference": "661365f3173433fd0deee625f1835377ce0947e5",
"shasum": ""
},
"require": {
@@ -931,7 +931,7 @@
"validation",
"validator"
],
"time": "2018-09-23T19:46:36+00:00"
"time": "2018-10-14T12:01:40+00:00"
}
],
"packages-dev": [],

View File

@@ -1,4 +1,4 @@
Get Help
# Get Help
If you need any help, then please read the [documentation on typemill.net](https://typemill.net/typemill) first. Some short video-tutorials are in work right now.

View File

@@ -0,0 +1,6 @@
# Welcome to Typemill
Great that you give Typemill a try!! Typemill is a small open source cms and a project in work. You will probably miss some important features, but I am working hard to add everything that is needed for a really productive little writing-system.
Before you start, please read the short introduction about "writing content". Or simply play around, I hope that Typemill is already quite intuitive to use...

View File

@@ -1 +0,0 @@
["# Welcome to Typemill","Great that you give Typemill a try!! Typemill is a small open source cms and a project in work. You will probably miss some important features, but I am working hard to add everything that is needed for a really productive little writing-system.","Before you start, please read the short introduction about \"writing content\". Or simply play around, I hope that Typemill is already quite intuitive to use..."]

View File

@@ -2,5 +2,4 @@
**MODERN WEB PUBLISHING FOR WRITERS**
*Typemill is a user-friendly and lightweight open source CMS for publishing text-works like prosa, lyrics, manuals, documentations, studies and more. Just download and start.*
*Typemill is a user-friendly and lightweight open source CMS for publishing text-works like prosa, lyrics, manuals, documentations, studies and more. Just download and start.*

View File

@@ -1 +0,0 @@
["# Typemill","**MODERN WEB PUBLISHING FOR WRITERS**","*Typemill is a user-friendly and lightweight open source CMS for publishing text-works like prosa, lyrics, manuals, documentations, studies and more. Just download and start.*"]

View File

@@ -44,7 +44,7 @@ class Settings
'contentFolder' => 'content',
'cache' => true,
'cachePath' => $rootPath . 'cache',
'version' => '1.2.5',
'version' => '1.2.6',
'setup' => true,
'welcome' => true
];

View File

@@ -1417,9 +1417,6 @@ label .help, .label .help{
color: #444;
border: 1px solid #eee;
}
.blox:hover{
// background: #f9f8f6;
}
.visible{
display: block;
}
@@ -1559,7 +1556,9 @@ label .help, .label .help{
.blox blockquote p{
margin-left: 50px;
}
img{}
.blox img{
width: 100%;
}
sup{}
cite{}
abbr{}

View File

@@ -254,11 +254,11 @@ let editor = new Vue({
blockMarkdown: '',
freeze: false,
newBlocks: [],
draftDisabled: true,
},
mounted: function(){
publishController.visual = true;
editor.draftDisabled = true;
var url = this.root + '/api/v1/article/markdown';

View File

@@ -33,7 +33,7 @@
</article>
<footer></footer>
</div>
<script src="{{ base_url }}/system/author/js/color-picker.min.js"></script>
<script src="{{ base_url }}/system/author/js/author.js?20181007"></script>
<script src="{{ base_url }}/system/author/js/color-picker.min.js?20181030"></script>
<script src="{{ base_url }}/system/author/js/author.js?20181030"></script>
</body>
</html>

View File

@@ -27,6 +27,6 @@
{% block content %}{% endblock %}
</div>
<script src="{{ base_url }}/system/author/js/auth.js?20180922"></script>
<script src="{{ base_url }}/system/author/js/auth.js?20181030"></script>
</body>
</html>

View File

@@ -17,7 +17,7 @@
<link rel="stylesheet" href="{{ base_url }}/system/author/css/fontello/css/fontello.css" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20181007" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20181030" />
<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
</head>
<body>
@@ -34,13 +34,13 @@
</article>
<footer></footer>
</div>
<script src="{{ base_url }}/system/author/js/vue.min.js?20181007"></script>
<script src="{{ base_url }}/system/author/js/autosize.min.js?20181007"></script>
<script src="{{ base_url }}/system/author/js/sortable.min.js?20181007"></script>
<script src="{{ base_url }}/system/author/js/vuedraggable.min.js?20181007"></script>
<script src="{{ base_url }}/system/author/js/author.js?20181007"></script>
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20181007"></script>
<script src="{{ base_url }}/system/author/js/vue-blox.js?20181007"></script>
<script src="{{ base_url }}/system/author/js/vue-navi.js?20181007"></script>
<script src="{{ base_url }}/system/author/js/vue.min.js?20181030"></script>
<script src="{{ base_url }}/system/author/js/autosize.min.js?20181030"></script>
<script src="{{ base_url }}/system/author/js/sortable.min.js?20181030"></script>
<script src="{{ base_url }}/system/author/js/vuedraggable.min.js?20181030"></script>
<script src="{{ base_url }}/system/author/js/author.js?20181030"></script>
<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20181030"></script>
<script src="{{ base_url }}/system/author/js/vue-blox.js?20181030"></script>
<script src="{{ base_url }}/system/author/js/vue-navi.js?20181030"></script>
</body>
</html>

View File

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