Squashed commit of the following: commit 23861a31bb2398ca61655c584bd8c75ee9bccdad Merge:d44acf4b
1c6287f2
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 22:18:50 2020 +0000 Merge branch 'master' into l10n_master commitd44acf4b64
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 19:39:46 2020 +0000 New translations errors.php (Portuguese, Brazilian) commitc1a4cc5d12
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 19:14:49 2020 +0000 New translations errors.php (Spanish, Argentina) commitfb3c5dcffc
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 19:14:48 2020 +0000 New translations errors.php (Spanish) commitf65c84635d
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:42:05 2020 +0000 New translations errors.php (German Informal) commit99fba6932a
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:57 2020 +0000 New translations errors.php (French) commitbc4c9684b5
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:55 2020 +0000 New translations errors.php (Portuguese, Brazilian) commit0afce79807
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:43 2020 +0000 New translations errors.php (Russian) commitf3daf77b95
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:41 2020 +0000 New translations errors.php (Hungarian) commit63848278a5
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:40 2020 +0000 New translations errors.php (Italian) commit53b5fce93c
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:38 2020 +0000 New translations errors.php (Japanese) commit2638f7a663
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:37 2020 +0000 New translations errors.php (Korean) commitf19ffa468c
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:36 2020 +0000 New translations errors.php (Persian) commit477ae0b845
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:34 2020 +0000 New translations errors.php (Polish) commit56beebe12c
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:33 2020 +0000 New translations errors.php (German) commit2b6540654a
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:32 2020 +0000 New translations errors.php (Portuguese) commit80f7275011
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:30 2020 +0000 New translations errors.php (Spanish) commit74c65f90ab
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:28 2020 +0000 New translations errors.php (Spanish, Argentina) commit3bd9e4fb86
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:27 2020 +0000 New translations errors.php (Swedish) commita698db00e3
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:26 2020 +0000 New translations errors.php (Turkish) commitf3cfc63b5c
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:25 2020 +0000 New translations errors.php (Ukrainian) commit61eb76ac89
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:23 2020 +0000 New translations errors.php (Vietnamese) commitcfda94e2a8
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:22 2020 +0000 New translations errors.php (Slovak) commitf0659025a9
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:20 2020 +0000 New translations errors.php (Dutch) commit27ac377ed6
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:19 2020 +0000 New translations errors.php (Chinese Traditional) commit04bf21a325
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:18 2020 +0000 New translations errors.php (Chinese Simplified) commit4dd5802979
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:16 2020 +0000 New translations errors.php (Arabic) commit368cf2d248
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:11 2020 +0000 New translations errors.php (Slovenian) commit52381df7be
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:08 2020 +0000 New translations errors.php (Czech) commit7e8330510f
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 14 18:41:07 2020 +0000 New translations errors.php (Danish) commit1bf07c6acf
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 22:57:41 2020 +0000 New translations entities.php (Slovenian) commit4d2d120b57
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 22:27:35 2020 +0000 New translations entities.php (Slovenian) commitedfc88eb8e
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 21:55:51 2020 +0000 New translations entities.php (Slovenian) commit840ed35d34
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 21:22:08 2020 +0000 New translations entities.php (Slovenian) commitaa130af285
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 14:02:50 2020 +0000 New translations common.php (Czech) commit5007fee528
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 14:02:25 2020 +0000 New translations entities.php (Slovenian) commit1ad8874e6b
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 13:30:21 2020 +0000 New translations auth.php (Czech) commit56f17ff7d4
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 13:29:57 2020 +0000 New translations entities.php (Slovenian) commit33789962cc
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 11:09:18 2020 +0000 New translations components.php (Slovenian) commit1002cf9e3b
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 10:08:48 2020 +0000 New translations components.php (Slovenian) commitd5a6083ae8
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 09:37:23 2020 +0000 New translations components.php (Slovenian) commit0d8df3a72e
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 09:07:01 2020 +0000 New translations components.php (Slovenian) commit22337688f9
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 09:07:00 2020 +0000 New translations common.php (Slovenian) commitff812694e2
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 08:20:44 2020 +0000 New translations common.php (Slovenian) commit57b9e04927
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 06:17:11 2020 +0000 New translations auth.php (Spanish) commit25343baac1
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 06:16:52 2020 +0000 New translations activities.php (Spanish) commita5c72ee5f1
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Wed Mar 11 05:37:55 2020 +0000 New translations activities.php (Spanish) commit6a6f28d095
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Tue Mar 10 15:49:14 2020 +0000 New translations auth.php (Slovenian) commit33f30876e1
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Tue Mar 10 15:18:30 2020 +0000 New translations auth.php (Slovenian) commit8bf8bc0fe5
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Tue Mar 10 14:48:46 2020 +0000 New translations auth.php (Slovenian) commit303dc07704
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Tue Mar 10 14:48:44 2020 +0000 New translations activities.php (Slovenian) commitc219fb67aa
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Tue Mar 10 09:59:45 2020 +0000 New translations activities.php (Slovenian) commitf45b6c6c82
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Tue Mar 10 08:34:32 2020 +0000 New translations activities.php (Slovenian) commit7d690eb13f
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Tue Mar 10 02:56:48 2020 +0000 New translations entities.php (Russian) commit86aab0529e
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Tue Mar 10 02:56:43 2020 +0000 New translations common.php (Russian) commit4fc1945543
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Mon Mar 9 20:37:26 2020 +0000 New translations errors.php (Russian) commit09791b736d
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Mon Mar 9 20:07:52 2020 +0000 New translations settings.php (Russian) commit9cb04bea4c
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Mon Mar 9 18:49:50 2020 +0000 New translations validation.php (Slovenian) commit7964a5a2a0
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Mon Mar 9 18:49:34 2020 +0000 New translations settings.php (Slovenian) commit361be13ff7
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Mon Mar 9 18:49:32 2020 +0000 New translations passwords.php (Slovenian) commit9b6a7f0f64
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Mon Mar 9 18:49:31 2020 +0000 New translations pagination.php (Slovenian) commita815adc24f
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Mon Mar 9 18:49:30 2020 +0000 New translations errors.php (Slovenian) commitae6040af3a
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Mon Mar 9 18:49:28 2020 +0000 New translations entities.php (Slovenian) commitf1d0177dce
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Mon Mar 9 18:49:26 2020 +0000 New translations components.php (Slovenian) commit16ba9f1fe1
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Mon Mar 9 18:49:24 2020 +0000 New translations common.php (Slovenian) commitcaa47464ba
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Mon Mar 9 18:49:23 2020 +0000 New translations auth.php (Slovenian) commit4b9a78aef8
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Mon Mar 9 18:49:21 2020 +0000 New translations activities.php (Slovenian) commit6a55161fe9
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sun Mar 8 01:36:31 2020 +0000 New translations common.php (French) commit94235393fa
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 7 18:49:01 2020 +0000 New translations errors.php (Portuguese, Brazilian) commita0f75e7724
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 7 10:24:26 2020 +0000 New translations settings.php (Russian) commit65437712a2
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 7 09:37:34 2020 +0000 New translations auth.php (Russian) commitf7f6a92dcf
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 7 00:01:07 2020 +0000 New translations entities.php (Russian) commitac8819edd3
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Sat Mar 7 00:00:57 2020 +0000 New translations settings.php (Russian) commitf1290f2b87
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Fri Mar 6 23:23:44 2020 +0000 New translations entities.php (Russian) commit8efb9bd571
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Fri Mar 6 22:45:53 2020 +0000 New translations entities.php (Russian) commit4fd31df14e
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Fri Mar 6 22:45:44 2020 +0000 New translations settings.php (Russian) commit262a2b3e4e
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Fri Mar 6 22:11:41 2020 +0000 New translations entities.php (Russian) commit15c98a64b8
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Fri Mar 6 15:10:54 2020 +0000 New translations errors.php (French) commit7a274db381
Author: Dan Brown <ssddanbrown@googlemail.com> Date: Fri Mar 6 15:10:43 2020 +0000 New translations settings.php (French)
BookStack
A platform for storing and organising information and documentation. Details for BookStack can be found on the official website at https://www.bookstackapp.com/.
📚 Project Definition
BookStack is an opinionated wiki system that provides a pleasant and simple out of the box experience. New users to an instance should find the experience intuitive and only basic word-processing skills should be required to get involved in creating content on BookStack. The platform should provide advanced power features to those that desire it but they should not interfere with the core simple user experience.
BookStack is not designed as an extensible platform to be used for purposes that differ to the statement above.
In regards to development philosophy, BookStack has a relaxed, open & positive approach. At the end of the day this is free software developed and maintained by people donating their own free time.
🛣️ Road Map
Below is a high-level road map view for BookStack to provide a sense of direction of where the project is going. This can change at any point and does not reflect many features and improvements that will also be included as part of the journey along this road map. For more granular detail of what will be included in upcoming releases you can review the project milestones as defined in the "Release Process" section below.
- Platform REST API (Base Implemented, In review and roll-out)
- A REST API covering, at minimum, control of core content models (Books, Chapters, Pages) for automation and platform extension.
- Editor Alignment & Review
- Review the page editors with goal of achieving increased interoperability & feature parity while also considering collaborative editing potential.
- Permission System Review
- Improvement in how permissions are applied and a review of the efficiency of the permission & roles system.
- Installation & Deployment Process Revamp
- Creation of a streamlined & secure process for users to deploy & update BookStack with reduced development requirements (No git or composer requirement).
🚀 Release Versioning & Process
BookStack releases are each assigned a version number, such as "v0.25.2", in the format v<phase>.<feature>.<patch>
. A change only in the patch
number indicates a fairly minor release that mainly contains fixes and therefore is very unlikely to cause breakages upon update. A change in the feature
number indicates a release which will generally bring new features in addition to fixes and enhancements. These releases have a small chance of introducing breaking changes upon update so it's worth checking for any notes in the update guide. A change in the phase
indicates a much large change in BookStack that will likely incur breakages requiring manual intervention.
Each BookStack release will have a milestone created with issues & pull requests assigned to it to define what will be in that release. Milestones are built up then worked through until complete at which point, after some testing and documentation updates, the release will be deployed.
For feature releases, and some patch releases, the release will be accompanied by a post on the BookStack blog which will provide additional detail on features, changes & updates otherwise the GitHub release page will show a list of changes. You can sign up to be alerted to new BookStack blogs posts (once per week maximum) at this link.
🛠️ Development & Testing
All development on BookStack is currently done on the master branch. When it's time for a release the master branch is merged into release with built & minified CSS & JS then tagged at its version. Here are the current development requirements:
- Node.js v10.0+
This project uses SASS for CSS development and this is built, along with the JavaScript, using webpack. The below npm commands can be used to install the dependencies & run the build tasks:
# Install NPM Dependencies
npm install
# Build assets for development
npm run build
# Build and minify assets for production
npm run production
# Build for dev (With sourcemaps) and watch for changes
npm run dev
BookStack has many integration tests that use Laravel's built-in testing capabilities which makes use of PHPUnit. There is a mysql_testing
database defined within the app config which is what is used by PHPUnit. This database is set with the database name, user name and password all defined as bookstack-test
. You will have to create that database and that set of credentials before testing.
The testing database will also need migrating and seeding beforehand. This can be done with the following commands:
php artisan migrate --database=mysql_testing
php artisan db:seed --class=DummyContentSeeder --database=mysql_testing
Once done you can run php vendor/bin/phpunit
in the application root directory to run all tests.
📜 Code Standards
PHP code within BookStack is generally to PSR-2 standards. From the BookStack root folder you can run ./vendor/bin/phpcs
to check code is formatted correctly and ./vendor/bin/phpcbf
to auto-fix non-PSR-2 code. Please don't auto-fix code unless it's related to changes you've made otherwise you'll likely cause git conflicts.
🐋 Development using Docker
This repository ships with a Docker Compose configuration intended for development purposes. It'll build a PHP image with all needed extensions installed and start up a MySQL server and a Node image watching the UI assets.
To get started, make sure you meet the following requirements:
- Docker and Docker Compose are installed
- Your user is part of the
docker
group
If all the conditions are met, you can proceed with the following steps:
- Install PHP/Composer dependencies with
docker-compose run app composer install
(first time can take a while because the image has to be built). - Copy
.env.example
to.env
and changeAPP_KEY
to a random 32 char string. - Make sure port 8080 is unused or else change
DEV_PORT
to a free port on your host. - Run
chgrp -R docker storage
. The development container will chown thestorage
directory to thewww-data
user inside the container so BookStack can write to it. You need to change the group to your host'sdocker
group here to not lose access to thestorage
directory. - Run
docker-compose up
and wait until all database migrations have been done. - You can now login with
admin@admin.com
andpassword
as password onlocalhost:8080
(or another port if specified).
If needed, You'll be able to run any artisan commands via docker-compose like so:
docker-compose run app php artisan list
The docker-compose setup runs an instance of MailHog and sets environment variables to redirect any BookStack-sent emails to MailHog. You can view this mail via the MailHog web interface on localhost:8025
. You can change the port MailHog is accessible on by setting a DEV_MAIL_PORT
environment variable.
🌎 Translations
Translations for text within BookStack is managed through the BookStack project on Crowdin. Some strings have colon-prefixed variables in such as :userName
. Leave these values as they are as they will be replaced at run-time. Crowdin is the preferred way to provide translations, otherwise the raw translations files can be found within the resources/lang
path.
If you'd like a new language to be added to Crowdin, for you to be able to provide translations for, please open a new issue here.
Please note, translations in BookStack are provided to the "Crowdin Global Translation Memory" which helps BookStack and other projects with finding translations. If you are not happy with contributing to this then providing translations to BookStack, even manually via GitHub, is not advised.
🎁 Contributing, Issues & Pull Requests
Feel free to create issues to request new features or to report bugs & problems. Just please follow the template given when creating the issue.
Pull requests are welcome. Unless a small tweak or language update, It may be best to open the pull request early or create an issue for your intended change to discuss how it will fit in to the project and plan out the merge. Just because a feature request exists, or is tagged, does not mean that feature would be accepted into the core project.
Pull requests should be created from the master
branch since they will be merged back into master
once done. Please do not build from or request a merge into the release
branch as this is only for publishing releases. If you are looking to alter CSS or JavaScript content please edit the source files found in resources/assets
. Any CSS or JS files within public
are built from these source files and therefore should not be edited directly.
The project's code of conduct can be found here.
🔒 Security
Security information for administering a BookStack instance can be found on the documentation site here.
If you'd like to be notified of new potential security concerns you can sign-up to the BookStack security mailing list.
If you would like to report a security concern in a more confidential manner than via a GitHub issue, You can directly email the lead maintainer ssddanbrown. You will need to login to be able to see the email address on the GitHub profile page. Alternatively you can send a DM via twitter to @ssddanbrown.
♿ Accessibility
We want BookStack to remain accessible to as many people as possible. We aim for at least WCAG 2.1 Level A standards where possible although we do not strictly test this upon each release. If you come across any accessibility issues please feel free to open an issue.
🖥️ Website, Docs & Blog
The website which contains the project docs & Blog can be found in the BookStackApp/website repo.
⚖️ License
The BookStack source is provided under the MIT License. The libraries used by, and included with, BookStack are provided under their own licenses.
👪 Attribution
The great people that have worked to build and improve BookStack can be seen here.
The wonderful people that have provided translations, either through GitHub or via Crowdin can be seen here.
These are the great open-source projects used to help build BookStack: