]> BookStack Code Mirror - bookstack/log
projects / bookstack / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
bookstack
4 years agoMerge branch 'fixes' of git://github.com/imanghafoori1/BookStack into imanghafoori1...
commit | commitdiff | tree
Dan Brown [Sat, 31 Oct 2020 22:11:27 +0000 (22:11 +0000)]
Merge branch 'fixes' of git://github.com/imanghafoori1/BookStack into imanghafoori1-fixes

4 years agoMerge pull request #2298 from timoschwarzer/composer-install-in-entrypoint
commit | commitdiff | tree
Dan Brown [Sat, 31 Oct 2020 21:56:48 +0000 (21:56 +0000)]
Merge pull request #2298 from timoschwarzer/composer-install-in-entrypoint

Install composer dependencies in Docker entrypoint

4 years agoMerge branch 'xss_and_redir_patch' of git://github.com/PercussiveElbow/BookStack...
commit | commitdiff | tree
Dan Brown [Sat, 31 Oct 2020 15:19:33 +0000 (15:19 +0000)]
Merge branch 'xss_and_redir_patch' of git://github.com/PercussiveElbow/BookStack into xss_and_redirect

4 years agoPrevented possible XSS via link attachments
commit | commitdiff | tree
Dan Brown [Sat, 31 Oct 2020 15:01:52 +0000 (15:01 +0000)]
Prevented possible XSS via link attachments

This filters out potentially malicious javascript: or data: uri's coming
through to be attached to attachments.
Added tests to cover.

Thanks to Yassine ABOUKIR (@yassineaboukir on twitter) for reporting this
vulnerability.

4 years agoXSS and redirect fixes with test cases
commit | commitdiff | tree
PercussiveElbow [Tue, 27 Oct 2020 01:34:51 +0000 (01:34 +0000)]
XSS and redirect fixes with test cases

4 years agoAdds laravel-microscope package 2328/head
commit | commitdiff | tree
imanghafoori [Fri, 16 Oct 2020 15:10:44 +0000 (18:40 +0330)]
Adds laravel-microscope package

4 years agofixes from laravel-microscope
commit | commitdiff | tree
imanghafoori [Thu, 15 Oct 2020 23:27:36 +0000 (02:57 +0330)]
fixes from laravel-microscope

4 years agoMerge pull request #2296 from timoschwarzer/esbuild-watch-first-time-fix
commit | commitdiff | tree
Dan Brown [Tue, 13 Oct 2020 22:17:23 +0000 (23:17 +0100)]
Merge pull request #2296 from timoschwarzer/esbuild-watch-first-time-fix

Fix build:js:watch not building at first launch in Docker

4 years agoUpdated translator attribution before release v0.30.3
commit | commitdiff | tree
Dan Brown [Tue, 13 Oct 2020 21:49:55 +0000 (22:49 +0100)]
Updated translator attribution before release v0.30.3

4 years agoAdded alias for vbscript
commit | commitdiff | tree
Dan Brown [Tue, 13 Oct 2020 21:44:33 +0000 (22:44 +0100)]
Added alias for vbscript

4 years agoMerge pull request #2302 from nutsflag/master
commit | commitdiff | tree
Dan Brown [Tue, 13 Oct 2020 21:41:09 +0000 (22:41 +0100)]
Merge pull request #2302 from nutsflag/master

Add VBScript Codemirror

4 years agoMerge pull request #2303 from BookStackApp/l10n_master
commit | commitdiff | tree
Dan Brown [Tue, 13 Oct 2020 21:39:52 +0000 (22:39 +0100)]
Merge pull request #2303 from BookStackApp/l10n_master

New Crowdin updates

4 years agoFixed error on drawing edit on markdown editor
commit | commitdiff | tree
Dan Brown [Tue, 13 Oct 2020 21:36:07 +0000 (22:36 +0100)]
Fixed error on drawing edit on markdown editor

Was preventing save of drawings.
For #2313

4 years agoNew translations settings.php (Chinese Simplified) 2303/head
commit | commitdiff | tree
Dan Brown [Mon, 5 Oct 2020 05:26:38 +0000 (06:26 +0100)]
New translations settings.php (Chinese Simplified)

4 years agoNew translations settings.php (Spanish)
commit | commitdiff | tree
Dan Brown [Fri, 2 Oct 2020 16:18:27 +0000 (17:18 +0100)]
New translations settings.php (Spanish)

4 years agoNew translations settings.php (Chinese Simplified)
commit | commitdiff | tree
Dan Brown [Fri, 2 Oct 2020 14:55:46 +0000 (15:55 +0100)]
New translations settings.php (Chinese Simplified)

4 years agoUpdate code.js 2302/head
commit | commitdiff | tree
nutsflag [Fri, 2 Oct 2020 13:14:29 +0000 (15:14 +0200)]
Update code.js

4 years agoUpdate code-editor.blade.php
commit | commitdiff | tree
nutsflag [Fri, 2 Oct 2020 13:13:31 +0000 (15:13 +0200)]
Update code-editor.blade.php

4 years agoInstall composer dependencies in Docker entrypoint 2298/head
commit | commitdiff | tree
Timo Schwarzer [Thu, 1 Oct 2020 09:34:56 +0000 (11:34 +0200)]
Install composer dependencies in Docker entrypoint

4 years agoFix build:js:watch not building at first launch in Docker 2296/head
commit | commitdiff | tree
Timo Schwarzer [Thu, 1 Oct 2020 09:25:22 +0000 (11:25 +0200)]
Fix build:js:watch not building at first launch in Docker

4 years agoUpdated http service to not read 204 response data
commit | commitdiff | tree
Dan Brown [Wed, 30 Sep 2020 21:32:03 +0000 (22:32 +0100)]
Updated http service to not read 204 response data

4 years agoUpdated esbuild options and version & updated npm deps
commit | commitdiff | tree
Dan Brown [Wed, 30 Sep 2020 21:28:53 +0000 (22:28 +0100)]
Updated esbuild options and version & updated npm deps

Had to change way sortable is imported due to changes, Still
seemed to have functioning multi-select.

4 years agoUpdated page content related links on content id changes
commit | commitdiff | tree
Dan Brown [Mon, 28 Sep 2020 21:26:50 +0000 (22:26 +0100)]
Updated page content related links on content id changes

For #2278

4 years agoFixed duplicate requests in attachment manager issue
commit | commitdiff | tree
Dan Brown [Mon, 28 Sep 2020 20:55:24 +0000 (21:55 +0100)]
Fixed duplicate requests in attachment manager issue

Closes #2286

4 years agoMerge pull request #2272 from jakubboucek/feature/fix-invalid-canonical-redirect
commit | commitdiff | tree
Dan Brown [Mon, 28 Sep 2020 20:15:23 +0000 (21:15 +0100)]
Merge pull request #2272 from jakubboucek/feature/fix-invalid-canonical-redirect

Fixed canonical redirects on non-root url app instances

4 years agoUpdated draw.io references to diagrams.net
commit | commitdiff | tree
Dan Brown [Mon, 28 Sep 2020 19:45:38 +0000 (20:45 +0100)]
Updated draw.io references to diagrams.net

Related to #2044

4 years agoFixed canonical redirects on non-root url app instances 2272/head
commit | commitdiff | tree
Jakub Bouček [Tue, 22 Sep 2020 23:22:03 +0000 (01:22 +0200)]
Fixed canonical redirects on non-root url app instances

If BookStack instance is deployed to any non-root path, e.g. http://example.com/wiki/,
requests for http://example.com/wiki/shelves/
was redirected to http://example.com/shelves
instead of http://example.com/wiki/shelves

Synced with: https://github.com/laravel/laravel/blob/master/public/.htaccess

4 years agoRemoved redundant test
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 17:24:05 +0000 (18:24 +0100)]
Removed redundant test

Now replaced in recent commit by one that checks actual message gets
displayed on the redirect page.
Redirect page changed to login page.

4 years agoUpdated translators fiel with latest
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 16:48:02 +0000 (17:48 +0100)]
Updated translators fiel with latest

4 years agoNew Crowdin updates (#2262)
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 16:46:32 +0000 (17:46 +0100)]
New Crowdin updates (#2262)

* New translations entities.php (Russian)

* New translations settings.php (Russian)

* New translations entities.php (Chinese Simplified)

* New translations settings.php (Chinese Simplified)

* New translations settings.php (Chinese Simplified)

* New translations entities.php (Czech)

* New translations common.php (Czech)

* New translations components.php (Czech)

* New translations settings.php (Czech)

* New translations errors.php (Czech)

* New translations settings.php (Czech)

* New translations settings.php (Czech)

* New translations settings.php (Czech)

* New translations settings.php (German)

* New translations settings.php (German)

* New translations entities.php (German)

* New translations validation.php (Czech)

* New translations entities.php (Spanish, Argentina)

* New translations entities.php (German Informal)

* New translations settings.php (German Informal)

* New translations auth.php (Czech)

4 years agoUpdated codemirror and updated codemirror base styles
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 16:33:43 +0000 (17:33 +0100)]
Updated codemirror and updated codemirror base styles

Aligns styles with current release, since was causing overflow
with scrollbars.

Fixes #2267

4 years agoUpdated PR code to use isA and updated that function definition
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 16:00:17 +0000 (17:00 +0100)]
Updated PR code to use isA and updated that function definition

Related to #2227

4 years agoMerge branch 'renderpages' of git://github.com/mr-vinn/BookStack into mr-vinn-renderpages
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 15:55:05 +0000 (16:55 +0100)]
Merge branch 'renderpages' of git://github.com/mr-vinn/BookStack into mr-vinn-renderpages

4 years agoAdded test for includes on book export
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 15:54:24 +0000 (16:54 +0100)]
Added test for includes on book export

Related to #2227

4 years agoFixed issue where SAML login not notifiy on existing user
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 15:43:06 +0000 (16:43 +0100)]
Fixed issue where SAML login not notifiy on existing user

Added testing to cover

Fixes #2263

4 years agoUpdated settings nav to be more flexible
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 15:26:30 +0000 (16:26 +0100)]
Updated settings nav to be more flexible

Uses flexbox layout, flexed to content instead of rigid thirds like
before. Also extracted row into own file

4 years agoUpdated callout links to be correct colors
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 14:40:51 +0000 (15:40 +0100)]
Updated callout links to be correct colors

- Also updated to be underlined instead of bold

4 years agoMerge branch 'master' of git://github.com/alexmannuk/BookStack into alexmannuk-master
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 14:35:13 +0000 (15:35 +0100)]
Merge branch 'master' of git://github.com/alexmannuk/BookStack into alexmannuk-master

4 years agoMerge pull request #2270 from gertjankrol/feature/test-migrations-workflow
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 14:25:17 +0000 (15:25 +0100)]
Merge pull request #2270 from gertjankrol/feature/test-migrations-workflow

Add `test-migrations` workflow

4 years agoMerge pull request #2268 from gertjankrol/master
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 14:21:21 +0000 (15:21 +0100)]
Merge pull request #2268 from gertjankrol/master

Fix the `AddActivityIndexes` migration's `down()` method

4 years agoMerge pull request #2274 from abulgatz/patch-1
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 11:11:53 +0000 (12:11 +0100)]
Merge pull request #2274 from abulgatz/patch-1

Fixed "Ubunto Mono" $mono type misspelling

4 years agoFixed markdown iframe loading and content alignment
commit | commitdiff | tree
Dan Brown [Sat, 26 Sep 2020 11:01:01 +0000 (12:01 +0100)]
Fixed markdown iframe loading and content alignment

Fixes #2280

4 years agoFix "Ubunto Mono" $mono type misspelling 2274/head
commit | commitdiff | tree
Adam [Wed, 23 Sep 2020 21:19:30 +0000 (16:19 -0500)]
Fix "Ubunto Mono" $mono type misspelling

4 years agoAdded the `test-migrations` workflow 2270/head
commit | commitdiff | tree
Gertjan Krol [Tue, 22 Sep 2020 17:53:45 +0000 (19:53 +0200)]
Added the `test-migrations` workflow

4 years agoFixed the `AddActivityIndexes` migration's `down()` method 2268/head
commit | commitdiff | tree
Gertjan Krol [Tue, 22 Sep 2020 17:22:27 +0000 (19:22 +0200)]
Fixed the `AddActivityIndexes` migration's `down()` method

4 years agoMerged latest translation changes
commit | commitdiff | tree
Dan Brown [Sun, 20 Sep 2020 09:28:01 +0000 (10:28 +0100)]
Merged latest translation changes

4 years agoUpdated translation contributors
commit | commitdiff | tree
Dan Brown [Sun, 20 Sep 2020 08:15:02 +0000 (09:15 +0100)]
Updated translation contributors

4 years agoFixed some wording in example env
commit | commitdiff | tree
Dan Brown [Sat, 19 Sep 2020 22:09:08 +0000 (23:09 +0100)]
Fixed some wording in example env

4 years agoUpdated example env with helpful info
commit | commitdiff | tree
Dan Brown [Sat, 19 Sep 2020 15:09:43 +0000 (16:09 +0100)]
Updated example env with helpful info

- Added comments to explain the use of the file.
- Added comments to advise that space/hash containing values would need
to be quoted.

Related to #2258

4 years agoMerge branch 'jb-l10n-fix-czech' of git://github.com/jakubboucek/BookStack into jakub...
commit | commitdiff | tree
Dan Brown [Sat, 19 Sep 2020 14:44:18 +0000 (15:44 +0100)]
Merge branch 'jb-l10n-fix-czech' of git://github.com/jakubboucek/BookStack into jakubboucek-jb-l10n-fix-czech

4 years agoUpdated locale lists for Bulgarian
commit | commitdiff | tree
Dan Brown [Sat, 19 Sep 2020 14:36:17 +0000 (15:36 +0100)]
Updated locale lists for Bulgarian

4 years agoNew Crowdin translations (#2077)
commit | commitdiff | tree
Dan Brown [Sat, 19 Sep 2020 14:22:32 +0000 (15:22 +0100)]
New Crowdin translations (#2077)

* New translations entities.php (Portuguese, Brazilian)

* New translations entities.php (Persian)

* New translations entities.php (Spanish, Argentina)

* New translations entities.php (Thai)

* New translations errors.php (German Informal)

* New translations entities.php (Spanish)

* New translations entities.php (French)

* New translations entities.php (Arabic)

* New translations entities.php (Arabic)

* New translations components.php (Portuguese, Brazilian)

* New translations entities.php (Portuguese, Brazilian)

* New translations auth.php (Italian)

* New translations common.php (Italian)

* New translations components.php (Italian)

* New translations entities.php (Italian)

* New translations settings.php (Italian)

* New translations components.php (Chinese Simplified)

* New translations entities.php (Chinese Simplified)

* New translations settings.php (Spanish)

* New translations components.php (German)

* New translations components.php (Japanese)

* New translations components.php (Dutch)

* New translations components.php (German Informal)

* New translations components.php (Portuguese, Brazilian)

* New translations common.php (Ukrainian)

* New translations components.php (Portuguese)

* New translations common.php (Russian)

* New translations components.php (Russian)

* New translations common.php (Slovak)

* New translations components.php (Slovak)

* New translations common.php (Slovenian)

* New translations components.php (Slovenian)

* New translations common.php (Swedish)

* New translations components.php (Swedish)

* New translations common.php (Turkish)

* New translations components.php (Turkish)

* New translations components.php (Ukrainian)

* New translations components.php (Polish)

* New translations common.php (Chinese Simplified)

* New translations common.php (Chinese Traditional)

* New translations components.php (Chinese Traditional)

* New translations common.php (Vietnamese)

* New translations components.php (Vietnamese)

* New translations common.php (Portuguese, Brazilian)

* New translations common.php (Persian)

* New translations components.php (Persian)

* New translations common.php (Spanish, Argentina)

* New translations components.php (Spanish, Argentina)

* New translations common.php (Thai)

* New translations components.php (Thai)

* New translations common.php (Portuguese)

* New translations common.php (Polish)

* New translations common.php (Italian)

* New translations common.php (Bulgarian)

* New translations components.php (Italian)

* New translations components.php (Chinese Simplified)

* New translations components.php (German)

* New translations components.php (Japanese)

* New translations components.php (Dutch)

* New translations components.php (German Informal)

* New translations common.php (French)

* New translations components.php (French)

* New translations common.php (Spanish)

* New translations components.php (Spanish)

* New translations common.php (Arabic)

* New translations components.php (Arabic)

* New translations components.php (Bulgarian)

* New translations common.php (Dutch)

* New translations common.php (Czech)

* New translations components.php (Czech)

* New translations common.php (Danish)

* New translations components.php (Danish)

* New translations common.php (German)

* New translations common.php (Hebrew)

* New translations components.php (Hebrew)

* New translations common.php (Hungarian)

* New translations components.php (Hungarian)

* New translations common.php (Japanese)

* New translations common.php (Korean)

* New translations components.php (Korean)

* New translations common.php (German Informal)

* New translations components.php (German)

* New translations common.php (German)

* New translations entities.php (German)

* New translations common.php (French)

* New translations components.php (French)

* New translations common.php (Spanish)

* New translations components.php (Spanish)

* New translations components.php (Chinese Simplified)

* New translations common.php (Chinese Simplified)

* New translations common.php (Polish)

* New translations components.php (Polish)

* New translations auth.php (Polish)

* New translations entities.php (Polish)

* New translations errors.php (Polish)

* New translations passwords.php (Polish)

* New translations settings.php (Polish)

* New translations settings.php (Polish)

* New translations common.php (Spanish, Argentina)

* New translations components.php (Spanish, Argentina)

* New translations auth.php (Spanish, Argentina)

* New translations entities.php (Spanish, Argentina)

* New translations passwords.php (Spanish, Argentina)

* New translations settings.php (Spanish, Argentina)

* New translations entities.php (German)

* New translations components.php (German Informal)

* New translations common.php (German Informal)

* New translations entities.php (German Informal)

* New translations settings.php (Italian)

* New translations settings.php (Dutch)

* New translations settings.php (Thai)

* New translations settings.php (Persian)

* New translations settings.php (Portuguese, Brazilian)

* New translations settings.php (Vietnamese)

* New translations settings.php (Chinese Traditional)

* New translations settings.php (Ukrainian)

* New translations settings.php (Turkish)

* New translations settings.php (Swedish)

* New translations settings.php (Slovenian)

* New translations settings.php (Slovak)

* New translations settings.php (Russian)

* New translations settings.php (Portuguese)

* New translations settings.php (Korean)

* New translations settings.php (Chinese Simplified)

* New translations settings.php (Japanese)

* New translations settings.php (Hungarian)

* New translations settings.php (Hebrew)

* New translations settings.php (German)

* New translations settings.php (Danish)

* New translations settings.php (Czech)

* New translations settings.php (Bulgarian)

* New translations settings.php (Arabic)

* New translations settings.php (French)

* New translations settings.php (Spanish, Argentina)

* New translations settings.php (Polish)

* New translations settings.php (Spanish)

* New translations settings.php (German Informal)

* New translations settings.php (Spanish)

* New translations settings.php (French)

* New translations components.php (Turkish)

* New translations settings.php (Turkish)

* New translations entities.php (Turkish)

* New translations common.php (Turkish)

* New translations components.php (Portuguese, Brazilian)

* New translations common.php (Portuguese, Brazilian)

* New translations settings.php (Portuguese, Brazilian)

* New translations settings.php (Chinese Simplified)

* New translations activities.php (Chinese Traditional)

* New translations settings.php (Chinese Traditional)

* New translations activities.php (Chinese Traditional)

* New translations auth.php (Chinese Traditional)

* New translations common.php (Chinese Traditional)

* New translations components.php (Chinese Traditional)

* New translations errors.php (Chinese Traditional)

* New translations passwords.php (Chinese Traditional)

* New translations settings.php (German)

* New translations settings.php (German Informal)

* New translations activities.php (Slovak)

* New translations auth.php (Slovak)

* New translations auth.php (Slovak)

* New translations common.php (Slovak)

* New translations components.php (Slovak)

* New translations components.php (Slovak)

* New translations entities.php (Slovak)

* New translations common.php (Slovak)

* New translations entities.php (Slovak)

* New translations passwords.php (Slovak)

* New translations settings.php (Dutch)

* New translations components.php (Dutch)

* New translations entities.php (Dutch)

* New translations passwords.php (Dutch)

* New translations activities.php (Arabic)

* New translations entities.php (French)

* New translations settings.php (Chinese Traditional)

* New translations settings.php (Chinese Traditional)

* New translations auth.php (Chinese Traditional)

* New translations errors.php (Chinese Traditional)

* New translations activities.php (Japanese)

* New translations auth.php (Japanese)

* New translations entities.php (Chinese Traditional)

* New translations validation.php (Chinese Traditional)

* New translations common.php (Russian)

* New translations components.php (Russian)

* New translations entities.php (Russian)

* New translations settings.php (Russian)

* New translations settings.php (Spanish, Argentina)

* New translations settings.php (Polish)

* New translations settings.php (Polish)

* New translations settings.php (Polish)

* New translations entities.php (Russian)

* New translations entities.php (Portuguese)

* New translations entities.php (Thai)

* New translations entities.php (Spanish, Argentina)

* New translations entities.php (Persian)

* New translations entities.php (Portuguese, Brazilian)

* New translations entities.php (Vietnamese)

* New translations entities.php (Chinese Traditional)

* New translations entities.php (Chinese Simplified)

* New translations entities.php (Ukrainian)

* New translations entities.php (Turkish)

* New translations entities.php (Swedish)

* New translations entities.php (Slovenian)

* New translations entities.php (Slovak)

* New translations entities.php (Polish)

* New translations entities.php (French)

* New translations entities.php (Dutch)

* New translations entities.php (Korean)

* New translations entities.php (Japanese)

* New translations entities.php (Italian)

* New translations entities.php (Hungarian)

* New translations entities.php (Hebrew)

* New translations entities.php (German)

* New translations entities.php (Danish)

* New translations entities.php (Czech)

* New translations entities.php (Bulgarian)

* New translations entities.php (Arabic)

* New translations entities.php (Spanish)

* New translations entities.php (German Informal)

* New translations entities.php (French)

* New translations settings.php (Russian)

* New translations settings.php (Portuguese)

* New translations settings.php (Thai)

* New translations settings.php (Spanish, Argentina)

* New translations settings.php (Persian)

* New translations settings.php (Portuguese, Brazilian)

* New translations settings.php (Vietnamese)

* New translations settings.php (Chinese Traditional)

* New translations settings.php (Chinese Simplified)

* New translations settings.php (Ukrainian)

* New translations settings.php (Turkish)

* New translations settings.php (Swedish)

* New translations settings.php (Slovenian)

* New translations settings.php (Slovak)

* New translations settings.php (Polish)

* New translations settings.php (French)

* New translations settings.php (Dutch)

* New translations settings.php (Korean)

* New translations settings.php (Japanese)

* New translations settings.php (Italian)

* New translations settings.php (Hungarian)

* New translations settings.php (Hebrew)

* New translations settings.php (German)

* New translations settings.php (Danish)

* New translations settings.php (Czech)

* New translations settings.php (Bulgarian)

* New translations settings.php (Arabic)

* New translations settings.php (Spanish)

* New translations settings.php (German Informal)

* New translations entities.php (Spanish)

* New translations settings.php (Spanish)

4 years agoMoved decode and updated page plaintext decode test
commit | commitdiff | tree
Dan Brown [Sat, 19 Sep 2020 14:13:18 +0000 (15:13 +0100)]
Moved decode and updated page plaintext decode test

4 years agoMerge branch 'preview-entities' of git://github.com/mr-vinn/BookStack into mr-vinn...
commit | commitdiff | tree
Dan Brown [Sat, 19 Sep 2020 13:58:56 +0000 (14:58 +0100)]
Merge branch 'preview-entities' of git://github.com/mr-vinn/BookStack into mr-vinn-preview-entities

4 years agoAdded test to check text gen decodes HTML entities
commit | commitdiff | tree
Dan Brown [Sat, 19 Sep 2020 13:58:18 +0000 (14:58 +0100)]
Added test to check text gen decodes HTML entities

4 years agoUpdated composer deps
commit | commitdiff | tree
Dan Brown [Sat, 19 Sep 2020 11:12:48 +0000 (12:12 +0100)]
Updated composer deps

4 years agoAdded audit log interface
commit | commitdiff | tree
Dan Brown [Sat, 19 Sep 2020 11:06:45 +0000 (12:06 +0100)]
Added audit log interface

- Displays the currently tracked activities in the system.

Related to #2173 and #1167

4 years agoSplit out Maintenance to separate controller
commit | commitdiff | tree
Dan Brown [Sat, 19 Sep 2020 08:24:58 +0000 (09:24 +0100)]
Split out Maintenance to separate controller

4 years agoDecode HTML entities 2257/head
commit | commitdiff | tree
Vinnie Okada [Fri, 18 Sep 2020 12:54:30 +0000 (06:54 -0600)]
Decode HTML entities

Decode HTML entities in page text before saving it to the database.

4 years agoAdded some robustness to page draft saving
commit | commitdiff | tree
Dan Brown [Sun, 13 Sep 2020 18:32:45 +0000 (19:32 +0100)]
Added some robustness to page draft saving

- Updated so that a warning is always shown on error, Not just on first
in chain.
- Added last-resort localStorage content saving.

4 years agoFixed visible revision delete menu
commit | commitdiff | tree
Dan Brown [Sun, 13 Sep 2020 18:12:15 +0000 (19:12 +0100)]
Fixed visible revision delete menu

4 years agoAdded button for inserting attachment link to a page
commit | commitdiff | tree
Dan Brown [Sun, 13 Sep 2020 17:58:05 +0000 (18:58 +0100)]
Added button for inserting attachment link to a page

For #1460

4 years agoContinued implementation of attachment drag+drop
commit | commitdiff | tree
Dan Brown [Sun, 13 Sep 2020 17:29:48 +0000 (18:29 +0100)]
Continued implementation of attachment drag+drop

Cannot get working in chrome reliably due to conflicting handling of
events and drag+drop API. Getting attachment drop working breaks other
parts of TinyMCE.
Implementing current work as should still work for MD editor and within
FireFox.

Related to #1460

4 years agoMerge branch 'master' into attachment_drag_drop
commit | commitdiff | tree
Dan Brown [Sun, 13 Sep 2020 15:33:31 +0000 (16:33 +0100)]
Merge branch 'master' into attachment_drag_drop

4 years agoImplement the renderPages parameter 2227/head
commit | commitdiff | tree
Vinnie Okada [Fri, 14 Aug 2020 21:13:52 +0000 (15:13 -0600)]
Implement the renderPages parameter

Render page content when getTree() is called with a true $renderPages
argument.

4 years agoAdded punnycode since its reuquired by markdownit
commit | commitdiff | tree
Dan Brown [Sat, 5 Sep 2020 19:37:23 +0000 (20:37 +0100)]
Added punnycode since its reuquired by markdownit

Is a native, although depricated, nodejs module. Have installed manually
since esbuild could not resolve the nodejs module

4 years agoUpdated saml2 slo config so url is used if no repsonse url
commit | commitdiff | tree
Dan Brown [Sat, 5 Sep 2020 18:26:47 +0000 (19:26 +0100)]
Updated saml2 slo config so url is used if no repsonse url

Updated config to change empty string to null since the empty string was
hitting an isset check which caused an empty string to be used instead
of the slo url as a backup option.

Closes #2002

4 years agoUpdated flow to ensure /register/confirm route is used where needed
commit | commitdiff | tree
Dan Brown [Sat, 5 Sep 2020 16:26:48 +0000 (17:26 +0100)]
Updated flow to ensure /register/confirm route is used where needed

Was accidentally skipped during previous updates. Will now be used on
saml, ldap & standard registration where required.
Uses session to know if the email was just sent and, if so, show the
confirmation route.

4 years agoUpdated npm deps
commit | commitdiff | tree
Dan Brown [Sat, 5 Sep 2020 15:54:25 +0000 (16:54 +0100)]
Updated npm deps

4 years agoMigrated from webpack to esbuild
commit | commitdiff | tree
Dan Brown [Sat, 5 Sep 2020 15:50:20 +0000 (16:50 +0100)]
Migrated from webpack to esbuild

4 years agoFix English translations 2238/head
commit | commitdiff | tree
Jakub Bouček [Mon, 31 Aug 2020 18:21:50 +0000 (20:21 +0200)]
Fix English translations

- Fix obvious bug
- Reunite capitalisation

4 years agoCzech translations: Fix broken labels
commit | commitdiff | tree
Jakub Bouček [Mon, 31 Aug 2020 18:20:42 +0000 (20:20 +0200)]
Czech translations: Fix broken labels

4 years agoCzech translations: Add new translations to cs, improve existing
commit | commitdiff | tree
Jakub Bouček [Mon, 31 Aug 2020 18:20:28 +0000 (20:20 +0200)]
Czech translations: Add new translations to cs, improve existing

4 years agoFix Czech translations (email -> e-mail)
commit | commitdiff | tree
Jakub Bouček [Mon, 31 Aug 2020 15:34:46 +0000 (17:34 +0200)]
Fix Czech translations (email -> e-mail)

In Czech language "email" does not means "email" but "enamel paint", correct is "e-mail".
See in Wikipedia:
- https://cs.wikipedia.org/wiki/E-mail
- https://cs.wikipedia.org/wiki/Email_(barva)

4 years agoUpdated callout link formatting 2233/head
commit | commitdiff | tree
alexmannuk [Mon, 24 Aug 2020 19:03:08 +0000 (20:03 +0100)]
Updated callout link formatting

Updated callout links to use font colouring based on type, with bold text to denote link, instead of using the theme link colour per issue #303.

4 years agoPrevented email confirmation exception throw on registration
commit | commitdiff | tree
Dan Brown [Tue, 4 Aug 2020 16:54:50 +0000 (17:54 +0100)]
Prevented email confirmation exception throw on registration

Was preventing any other registration actions from taking place such as
LDAP/SAML group sync. Email confirmation should be actioned by
middleware on post-registration redirect.

Added testing to cover.
Tested for LDAP, SAML and normal registration with email confirmation
required to ensure flows work as expected.

Fixes #2082

4 years agoFixed non-visible horizontal rules in dark mode
commit | commitdiff | tree
Dan Brown [Tue, 4 Aug 2020 14:39:07 +0000 (15:39 +0100)]
Fixed non-visible horizontal rules in dark mode

Fixes #2209

4 years agoAdded warning to role screen for important permissions
commit | commitdiff | tree
Dan Brown [Tue, 4 Aug 2020 14:26:13 +0000 (15:26 +0100)]
Added warning to role screen for important permissions

Warning related to permissions that could allow a person to promote
their own permissions to gain more privileges than expected.

For #2105.

4 years agoRemoved role 'name' field from database
commit | commitdiff | tree
Dan Brown [Tue, 4 Aug 2020 13:55:01 +0000 (14:55 +0100)]
Removed role 'name' field from database

The 'name' field was really redundant and caused confusion in the
codebase, since the 'Display' name is often used and we have a
'system_name' for the admin and public role.

This fixes #2032, Where external auth group matching has confusing
behaviour as matching was done against the display_name, if no
external_auth field is set, but only roles with a match 'name' field
would be considered.

This also fixes and error where the role users migration, on role
delete, would not actually fire due to mis-matching http body keys.
Looks like this has been an issue from the start. Added some testing to
cover. Fixes #2211.

Also converted phpdoc to typehints in many areas of the reviewed code
during the above.

4 years agoRemoved joint_permissions auto_increment id
commit | commitdiff | tree
Dan Brown [Tue, 4 Aug 2020 12:02:31 +0000 (13:02 +0100)]
Removed joint_permissions auto_increment id

Removed auto_incrementing id and set a primary key of the [role_id,
entity_type, entity_id, action] instead since this table could recieve a
lot of activity, especially when permission regeneration was automated,
leading to very high auto_increment counts which could max out the
integer limit.

Also updated some RolesTest comment endpoints to align with
recent route changes.

Should fix #2091

4 years agoUpdated some comment elements and standardised more JS
commit | commitdiff | tree
Dan Brown [Tue, 28 Jul 2020 17:19:18 +0000 (18:19 +0100)]
Updated some comment elements and standardised more JS

- Updated comment routes to be simpler.
- Updated comments JS to align better with updated component system.
- Documented available global JS functions/services.
- Removed redundant controller method.
- Added window.$events helpers for validation messages and
success/error.
- Updated JS events system to not be class based for simplicity.
- Added window.trans_plural method to handle pluralisation/replacements
where you already have the translation string itself.

Fixes #1836

4 years agoUpdated public-login redirect to check url
commit | commitdiff | tree
Dan Brown [Tue, 28 Jul 2020 15:27:16 +0000 (16:27 +0100)]
Updated public-login redirect to check url

Direct links to the login pages for public instances could lead to a
redirect back to an external page upon login.
This adds a check to ensure the URL is a URL expected from the current
bookstack instance, or at least under the same domain.

Fixes #2073

4 years agoUpdated functionality for logging failed access
commit | commitdiff | tree
Dan Brown [Tue, 28 Jul 2020 11:59:43 +0000 (12:59 +0100)]
Updated functionality for logging failed access

- Added testing to cover.
- Linked logging into Laravel's monolog logging system and made log
channel configurable.
- Updated env var names to be specific to login access.
- Added extra locations as to where failed logins would be captured.

Related to #1881 and #728

4 years agoMerge branch 'auth' of git://github.com/benrubson/BookStack into benrubson-auth
commit | commitdiff | tree
Dan Brown [Tue, 28 Jul 2020 09:46:40 +0000 (10:46 +0100)]
Merge branch 'auth' of git://github.com/benrubson/BookStack into benrubson-auth

4 years agoStarted attachment drag/drop
commit | commitdiff | tree
Dan Brown [Tue, 28 Jul 2020 09:45:28 +0000 (10:45 +0100)]
Started attachment drag/drop

Currently fighting between sortable and tinymce mechanisms which prevent
this working due to the different events stopping the drop event while
needing the dragover for cursor placement.

4 years agoRemoved default anchor CSS filtering in dark mode
commit | commitdiff | tree
Dan Brown [Sun, 26 Jul 2020 15:36:15 +0000 (16:36 +0100)]
Removed default anchor CSS filtering in dark mode

Due to causing content images to be rendered in unexpected ways.

- Also removed CSS filters from other image usage.
- Tweaked header CSS filtering to not be so aggressive.
- Forced WYSIWYG editor to be on its own layer since that would allow
massive larger performance increases in Safari, especially when using
dark mode.

Closes #2045.
Closes #2154.

4 years agoUpdated pagination colors for visibility
commit | commitdiff | tree
Dan Brown [Sun, 26 Jul 2020 14:07:47 +0000 (15:07 +0100)]
Updated pagination colors for visibility

Fixes #1839

4 years agoRemoved a few remaining vue references
commit | commitdiff | tree
Dan Brown [Sun, 26 Jul 2020 13:49:05 +0000 (14:49 +0100)]
Removed a few remaining vue references

4 years agoFixed some image manager behaviour
commit | commitdiff | tree
Dan Brown [Sat, 25 Jul 2020 10:47:12 +0000 (11:47 +0100)]
Fixed some image manager behaviour

fixed:
- Double click not working after tab usage.
- Synced edit form with select button.

4 years agoFixed issue where URL params in image names would cause loading failure
commit | commitdiff | tree
Dan Brown [Sat, 25 Jul 2020 10:18:40 +0000 (11:18 +0100)]
Fixed issue where URL params in image names would cause loading failure

Updated file name handling to route through str:slug to be cleaned up
a little.
Added testing to cover.

Fixes #2161

4 years agoRemoved unused tinymce imagetools plugin
commit | commitdiff | tree
Dan Brown [Sat, 25 Jul 2020 00:09:35 +0000 (01:09 +0100)]
Removed unused tinymce imagetools plugin

4 years agoRemoved vuejs from the project
commit | commitdiff | tree
Dan Brown [Fri, 24 Jul 2020 23:25:30 +0000 (00:25 +0100)]
Removed vuejs from the project

4 years agoConverted image-manager to be component/HTML based
commit | commitdiff | tree
Dan Brown [Fri, 24 Jul 2020 23:20:58 +0000 (00:20 +0100)]
Converted image-manager to be component/HTML based

Instead of vue based.

4 years agoFixed issue where more images than expected could be deleted
commit | commitdiff | tree
Dan Brown [Fri, 24 Jul 2020 22:41:59 +0000 (23:41 +0100)]
Fixed issue where more images than expected could be deleted

When deleting images, images within the same directory, that have
a suffix of the delete image name, would also be deleted.

Added test to cover.

4 years agoTweaked dropdown shadows a tad
commit | commitdiff | tree
Dan Brown [Sun, 5 Jul 2020 20:23:57 +0000 (21:23 +0100)]
Tweaked dropdown shadows a tad

4 years agoConverted the page editor from vue to component
commit | commitdiff | tree
Dan Brown [Sun, 5 Jul 2020 20:18:17 +0000 (21:18 +0100)]
Converted the page editor from vue to component

4 years agoUpdated attachment tests to align with front-end changes
commit | commitdiff | tree
Dan Brown [Sat, 4 Jul 2020 16:04:26 +0000 (17:04 +0100)]
Updated attachment tests to align with front-end changes

4 years agoFinished breakdown of attachment vue into components
commit | commitdiff | tree
Dan Brown [Sat, 4 Jul 2020 15:53:02 +0000 (16:53 +0100)]
Finished breakdown of attachment vue into components

4 years agoStarted migration of attachment manager from vue
commit | commitdiff | tree
Dan Brown [Tue, 30 Jun 2020 21:12:45 +0000 (22:12 +0100)]
Started migration of attachment manager from vue

- Created new dropzone component.
- Added standard component event system using custom DOM events.
- Added tabs component.
- Added ajax-delete-row component.

4 years agoRemoved tests for removed ajax tag route
commit | commitdiff | tree
Dan Brown [Mon, 29 Jun 2020 22:46:08 +0000 (23:46 +0100)]
Removed tests for removed ajax tag route

next
The core source code for the BookStack project.
Morty Proxy This is a proxified and sanitized view of the page, visit original site.