From e88dbe4db3c9e6bfb511283a329a3b9c7ae67e95 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 8 Feb 2022 00:18:29 +0000 Subject: [PATCH] Added license references to readme attribution --- readme.md | 51 ++++++++++++++++++++---------------- resources/lang/en/editor.php | 2 +- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/readme.md b/readme.md index a1a4501ef..7829026ad 100644 --- a/readme.md +++ b/readme.md @@ -200,7 +200,10 @@ The website which contains the project docs & Blog can be found in the [BookStac ## ⚖️ License -The BookStack source is provided under the MIT License. The libraries used by, and included with, BookStack are provided under their own licenses. +The BookStack source is provided under the MIT License. + +The libraries used by, and included with, BookStack are provided under their own licenses and copyright. +The licenses for many of our core dependencies can be found in the attribution list below but this is not an exhaustive list of all projects used within BookStack. ## 👪 Attribution @@ -208,26 +211,28 @@ The great people that have worked to build and improve BookStack can [be seen he The wonderful people that have provided translations, either through GitHub or via Crowdin [can be seen here](https://github.com/BookStackApp/BookStack/blob/development/.github/translators.txt). -These are the great open-source projects used to help build BookStack: +Below are the great open-source projects used to help build BookStack. +Note: This is not an exhaustive list of all libraries and projects that would be used in an active BookStack instance. -* [Laravel](http://laravel.com/) -* [TinyMCE](https://www.tinymce.com/) -* [CodeMirror](https://codemirror.net) -* [Sortable](https://github.com/SortableJS/Sortable) -* [Google Material Icons](https://material.io/icons/) -* [Dropzone.js](http://www.dropzonejs.com/) -* [clipboard.js](https://clipboardjs.com/) -* [markdown-it](https://github.com/markdown-it/markdown-it) and [markdown-it-task-lists](https://github.com/revin/markdown-it-task-lists) -* [BarryVD/Dompdf](https://github.com/barryvdh/laravel-dompdf) -* [BarryVD/Snappy (WKHTML2PDF)](https://github.com/barryvdh/laravel-snappy) -* [WKHTMLtoPDF](http://wkhtmltopdf.org/index.html) -* [diagrams.net](https://github.com/jgraph/drawio) -* [OneLogin's SAML PHP Toolkit](https://github.com/onelogin/php-saml) -* [League/CommonMark](https://commonmark.thephpleague.com/) -* [League/Flysystem](https://flysystem.thephpleague.com) -* [StyleCI](https://styleci.io/) -* [pragmarx/google2fa](https://github.com/antonioribeiro/google2fa) -* [Bacon/BaconQrCode](https://github.com/Bacon/BaconQrCode) -* [phpseclib](https://github.com/phpseclib/phpseclib) -* [Clockwork](https://github.com/itsgoingd/clockwork) -* [PHPStan](https://phpstan.org/) & [Larastan](https://github.com/nunomaduro/larastan) \ No newline at end of file +* [Laravel](http://laravel.com/) - _[MIT](https://github.com/laravel/framework/blob/v8.82.0/LICENSE.md)_ +* [TinyMCE](https://www.tinymce.com/) - _[LGPL v2.1](https://github.com/tinymce/tinymce/blob/develop/LICENSE.TXT)_ +* [CodeMirror](https://codemirror.net) - _[MIT](https://github.com/codemirror/CodeMirror/blob/master/LICENSE)_ +* [Sortable](https://github.com/SortableJS/Sortable) - _[MIT](https://github.com/SortableJS/Sortable/blob/master/LICENSE)_ +* [Google Material Icons](https://github.com/google/material-design-icons) - _[Apache-2.0](https://github.com/google/material-design-icons/blob/master/LICENSE)_ +* [Dropzone.js](http://www.dropzonejs.com/) - _[MIT](https://github.com/dropzone/dropzone/blob/main/LICENSE)_ +* [clipboard.js](https://clipboardjs.com/) - _[MIT](https://github.com/zenorocha/clipboard.js/blob/master/LICENSE)_ +* [markdown-it](https://github.com/markdown-it/markdown-it) and [markdown-it-task-lists](https://github.com/revin/markdown-it-task-lists) - _[MIT](https://github.com/markdown-it/markdown-it/blob/master/LICENSE) and [ISC](https://github.com/revin/markdown-it-task-lists/blob/master/LICENSE)_ +* [Dompdf](https://github.com/dompdf/dompdf) - _[LGPL v2.1](https://github.com/dompdf/dompdf/blob/master/LICENSE.LGPL)_ +* [BarryVD/Dompdf](https://github.com/barryvdh/laravel-dompdf) - _[MIT](https://github.com/barryvdh/laravel-dompdf/blob/master/LICENSE)_ +* [BarryVD/Snappy (WKHTML2PDF)](https://github.com/barryvdh/laravel-snappy) - _[MIT](https://github.com/barryvdh/laravel-snappy/blob/master/LICENSE)_ +* [WKHTMLtoPDF](http://wkhtmltopdf.org/index.html) - _[LGPL v3.0](https://github.com/wkhtmltopdf/wkhtmltopdf/blob/master/LICENSE)_ +* [diagrams.net](https://github.com/jgraph/drawio) - _[Embedded Version Terms](https://www.diagrams.net/trust/) / [Source Project - Apache-2.0](https://github.com/jgraph/drawio/blob/dev/LICENSE)_ +* [OneLogin's SAML PHP Toolkit](https://github.com/onelogin/php-saml) - _[MIT](https://github.com/onelogin/php-saml/blob/master/LICENSE)_ +* [League/CommonMark](https://commonmark.thephpleague.com/) - _[BSD-3-Clause](https://github.com/thephpleague/commonmark/blob/2.2/LICENSE)_ +* [League/Flysystem](https://flysystem.thephpleague.com) - _[MIT](https://github.com/thephpleague/flysystem/blob/3.x/LICENSE)_ +* [StyleCI](https://styleci.io/) - _Hosted Service_ +* [pragmarx/google2fa](https://github.com/antonioribeiro/google2fa) - _[MIT](https://github.com/antonioribeiro/google2fa/blob/8.x/LICENSE.md)_ +* [Bacon/BaconQrCode](https://github.com/Bacon/BaconQrCode) - _[BSD-2-Clause](https://github.com/Bacon/BaconQrCode/blob/master/LICENSE)_ +* [phpseclib](https://github.com/phpseclib/phpseclib) - _[MIT](https://github.com/phpseclib/phpseclib/blob/master/LICENSE)_ +* [Clockwork](https://github.com/itsgoingd/clockwork) - _[MIT](https://github.com/itsgoingd/clockwork/blob/master/LICENSE)_ +* [PHPStan](https://phpstan.org/) & [Larastan](https://github.com/nunomaduro/larastan) - _[MIT](https://github.com/phpstan/phpstan/blob/master/LICENSE) and [MIT](https://github.com/nunomaduro/larastan/blob/master/LICENSE.md)_ \ No newline at end of file diff --git a/resources/lang/en/editor.php b/resources/lang/en/editor.php index 4a21f17f6..e84d60a7d 100644 --- a/resources/lang/en/editor.php +++ b/resources/lang/en/editor.php @@ -135,7 +135,7 @@ return [ // About view 'about_title' => 'About the WYSIWYG Editor', 'editor_license' => 'Editor License & Copyright', - 'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under an LGPLv2.1 license.', + 'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under an LGPL v2.1 license.', 'editor_tiny_license_link' => 'The copyright and license details of TinyMCE can be found here.', 'save_continue' => 'Save Page & Continue', 'callouts_cycle' => '(Keep pressing to toggle through types)',