-
-
Notifications
You must be signed in to change notification settings - Fork 168
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #577 from bolt/release/bolt4.0.0-beta2
Preparing release 4.0.0 beta 2.
- Loading branch information
Showing
5 changed files
with
149 additions
and
187 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "bolt", | ||
| "version": "4.0.0-beta.1", | ||
| "version": "4.0.0-beta.2", | ||
| "homepage": "https://boltcms.io", | ||
| "author": "Bob den Otter <[email protected]> (https://boltcms.io)", | ||
| "license": "MIT", | ||
|
|
@@ -80,7 +80,7 @@ | |
| "postcss-preset-env": "^6.7.0", | ||
| "prettier": "^1.18.2", | ||
| "regenerator-runtime": "^0.13.3", | ||
| "sass-loader": "^7.1.0", | ||
| "sass-loader": "^7.2.0", | ||
| "source-sans-pro": "^2.45.0", | ||
| "stylelint": "^10.1.0", | ||
| "stylelint-config-standard": "^18.3.0", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1,72 @@ | ||
| {% extends '@bolt/_base/layout.html.twig' %} | ||
|
|
||
| {% block title %} | ||
| <span class="admin__header--title__prefix"> | ||
| {{ 'caption.about_bolt'|trans }} » | ||
| </span> | ||
| {{ 'caption.bolt_payoff'|trans }} | ||
| {% endblock title %} | ||
|
|
||
| {% block main %} | ||
|
|
||
| <h2>Bolt {{ constant('Bolt\\Version::VERSION') }}</h2> | ||
|
|
||
| <h3>{{ constant('Bolt\\Version::CODENAME') }} <small><em>({{ installType }})</em></small></h3> | ||
|
|
||
| <p> | ||
| Bolt is a CMS that strives to be simple, fast, straightforward and enjoyable to use. Both for | ||
| developers and content-editors. Bolt is Open Source, and as such it uses other Open Source | ||
| components. If you are a developer you're very welcome to help in the further development of Bolt. | ||
| </p> | ||
| <p>The ongoing Bolt development takes place under the care of:</p> | ||
| <ul> | ||
| <li><a href="https://twokings.nl/" target="_blank">Two Kings</a> – Artisinal Web Development.</li> | ||
| <li><a href="https://tsh.io/" target="_blank">The Software House</a> – Web and Mobile Development.</li> | ||
| </ul> | ||
| <p> | ||
| All parts of Bolt are free to use under the open-source MIT license. The full licensing text can be | ||
| found here, in the included <a href="https://docs.bolt.cm/other/license">LICENSE.md</a>. | ||
| </p> | ||
|
|
||
| <p> | ||
| <a href="https://bolt.cm" class="btn btn-primary" target="_blank"> | ||
| <i class="fa fa-external-link-square-alt"></i> {{ 'about.visit_bolt'|trans }} | ||
| </a> | ||
| <a href="https://docs.bolt.cm" class="btn btn-secondary" target="_blank"> | ||
| <i class="fa fa-book"></i> {{ 'about.bolt_documentation'|trans }} | ||
| </a> | ||
| <a href="https://github.com/bolt" class="btn btn-secondary" target="_blank"> | ||
| <i class="fab fa-github-alt"></i> {{ 'about.bolt_on_github'|trans }} | ||
| </a> | ||
| </p> | ||
|
|
||
| <h3>{{ 'about.used_libraries'|trans }}{# #}</h3> | ||
|
|
||
| <p>{{ 'about.list_of_used_libraries'|trans }}{# #}</p> | ||
|
|
||
| <ul> | ||
| <li>The awesome <a href="https://symfony.com/" target="_blank">Symfony 4, PHP framework</a> and a lot of the | ||
| <a href="https://symfony.com/components" target="_blank">Symfony components</a>.</li> | ||
| <li>The <a href="https://www.doctrine-project.org" target="_blank">Doctrine</a> for database access, abstraction and object mapping.</li> | ||
| <li><a href="https://twig.sensiolabs.org/" target="_blank">Twig</a> - flexible, fast, and secure template engine</a>.</li> | ||
| <li><a href="https://getbootstrap.com/" target="_blank">Bootstrap 4</a> and | ||
| <a href="https://fontawesome.com/" target="_blank">Font Awesome</a>.</li> | ||
| <li><a href="https://vuejs.org/" target="_blank">Vue</a> and VueX.</li> | ||
| <li><a href="https://codemirror.net/" target="_blank">CodeMirror</a>.</li> | ||
| <li><a href="https://webpack.js.org/" target="_blank">Webpack</a> and | ||
| <a href="https://symfony.com/doc/current/frontend/encore/installation.html" target="_blank">Symfony Encore</a>.</li> | ||
| <li><a href="https://api-platform.com/" target="_blank">API Platform</a>.</li> | ||
| <li><a href="https://phpunit.de/" target="_blank">PHPUnit</a>.</li> | ||
| <li><a href="http://www.phpspec.net/en/stable/" target="_blank">phpspec</a>.</li> | ||
| <li><a href="http://behat.org/en/latest/" target="_blank">Behat</a>.</li> | ||
| <li><a href="https://github.com/coduo/php-matcher" target="_blank">PHP Matcher</a>.</li> | ||
| <li><a href="https://kakunin.io" target="_blank">Kakunin</a>.</li> | ||
| <li><a href="https://github.com/phpstan/phpstan" target="_blank">PHP Stan</a>.</li> | ||
| <li><a href="https://github.com/Symplify/EasyCodingStandard" target="_blank">Easy Coding Standard</a>.</li> | ||
| <li><a href="https://blackfire.io/" target="_blank">Blackfire</a>.</li> | ||
| {# @todo: Once we settle on a Wysiwyg component (like CKeditor), add it here. #} | ||
| {# @todo: Once we settle on a Markdown component (like MDE or ToastUI), add it here. #} | ||
| </ul> | ||
|
|
||
| {% endblock main %} | ||
| {% extends '@bolt/_base/layout.html.twig' %} | ||
|
|
||
| {% block title %} | ||
| <span class="admin__header--title__prefix"> | ||
| {{ 'caption.about_bolt'|trans }} » | ||
| </span> | ||
| <i class='fas fa-award'></i> | ||
| {{ 'caption.bolt_payoff'|trans }} | ||
| {% endblock title %} | ||
|
|
||
| {% block main %} | ||
|
|
||
| <h2>Bolt {{ constant('Bolt\\Version::VERSION') }}</h2> | ||
|
|
||
| <h3>{{ constant('Bolt\\Version::CODENAME') }} <small><em>({{ installType }})</em></small></h3> | ||
|
|
||
| <p> | ||
| Bolt is a CMS that strives to be simple, fast, straightforward and enjoyable to use. Both for | ||
| developers and content-editors. Bolt is Open Source, and as such it uses other Open Source | ||
| components. If you are a developer you're very welcome to help in the further development of Bolt. | ||
| </p> | ||
| <p>The ongoing Bolt development takes place under the care of:</p> | ||
| <ul> | ||
| <li><a href="https://twokings.nl/" target="_blank">Two Kings</a> – Artisinal Web Development.</li> | ||
| <li><a href="https://tsh.io/" target="_blank">The Software House</a> – Web and Mobile Development.</li> | ||
| </ul> | ||
| <p> | ||
| All parts of Bolt are free to use under the open-source MIT license. The full licensing text can be | ||
| found here, in the included <a href="https://docs.bolt.cm/other/license">LICENSE.md</a>. | ||
| </p> | ||
|
|
||
| <p> | ||
| <a href="https://bolt.cm" class="btn btn-primary" target="_blank"> | ||
| <i class="fa fa-external-link-square-alt"></i> {{ 'about.visit_bolt'|trans }} | ||
| </a> | ||
| <a href="https://docs.bolt.cm" class="btn btn-secondary" target="_blank"> | ||
| <i class="fa fa-book"></i> {{ 'about.bolt_documentation'|trans }} | ||
| </a> | ||
| <a href="https://github.com/bolt" class="btn btn-secondary" target="_blank"> | ||
| <i class="fa fa-external-link-square-alt"></i> {{ 'about.bolt_on_github'|trans }} | ||
| </a> | ||
| </p> | ||
|
|
||
| <h3>{{ 'about.used_libraries'|trans }}{# #}</h3> | ||
|
|
||
| <p>{{ 'about.list_of_used_libraries'|trans }}{# #}</p> | ||
|
|
||
| <ul> | ||
| <li>The awesome <a href="https://symfony.com/" target="_blank">Symfony 4, PHP framework</a> and a lot of the | ||
| <a href="https://symfony.com/components" target="_blank">Symfony components</a>.</li> | ||
| <li>The <a href="https://www.doctrine-project.org" target="_blank">Doctrine</a> library for database access, abstraction and object mapping.</li> | ||
| <li><a href="https://twig.sensiolabs.org/" target="_blank">Twig</a> - flexible, fast, and secure template engine</a>.</li> | ||
| <li><a href="https://getbootstrap.com/" target="_blank">Bootstrap 4</a> and | ||
| <a href="https://fontawesome.com/" target="_blank">Font Awesome</a>.</li> | ||
| <li><a href="https://vuejs.org/" target="_blank">Vue</a> and VueX.</li> | ||
| <li><a href="https://codemirror.net/" target="_blank">CodeMirror</a>.</li> | ||
| <li><a href="https://webpack.js.org/" target="_blank">Webpack</a> and | ||
| <a href="https://symfony.com/doc/current/frontend/encore/installation.html" target="_blank">Symfony Encore</a>.</li> | ||
| <li><a href="https://api-platform.com/" target="_blank">API Platform</a>.</li> | ||
| <li><a href="https://phpunit.de/" target="_blank">PHPUnit</a>.</li> | ||
| <li><a href="http://www.phpspec.net/en/stable/" target="_blank">phpspec</a>.</li> | ||
| <li><a href="http://behat.org/en/latest/" target="_blank">Behat</a>.</li> | ||
| <li><a href="https://github.com/coduo/php-matcher" target="_blank">PHP Matcher</a>.</li> | ||
| <li><a href="https://kakunin.io" target="_blank">Kakunin</a>.</li> | ||
| <li><a href="https://github.com/phpstan/phpstan" target="_blank">PHP Stan</a>.</li> | ||
| <li><a href="https://github.com/Symplify/EasyCodingStandard" target="_blank">Easy Coding Standard</a>.</li> | ||
| <li><a href="https://blackfire.io/" target="_blank">Blackfire</a>.</li> | ||
| {# @todo: Once we settle on a Wysiwyg component (like CKeditor), add it here. #} | ||
| {# @todo: Once we settle on a Markdown component (like MDE or ToastUI), add it here. #} | ||
| </ul> | ||
|
|
||
| {% endblock main %} |
Oops, something went wrong.