Dan Brown
78be644332
Merge pull request #2298 from timoschwarzer/composer-install-in-entrypoint
...
Install composer dependencies in Docker entrypoint
2020-10-31 21:56:48 +00:00
Dan Brown
6d8b0605a0
Merge branch 'xss_and_redir_patch' of git://github.com/PercussiveElbow/BookStack into xss_and_redirect
2020-10-31 15:19:33 +00:00
Dan Brown
349162ea13
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.
2020-10-31 15:01:52 +00:00
PercussiveElbow
bbd1384acb
XSS and redirect fixes with test cases
2020-10-27 01:34:51 +00:00
Dan Brown
6aa2bf9e27
Merge pull request #2296 from timoschwarzer/esbuild-watch-first-time-fix
...
Fix build:js:watch not building at first launch in Docker
2020-10-13 23:17:23 +01:00
Dan Brown
18bcafaee4
Updated translator attribution before release v0.30.3
2020-10-13 22:49:55 +01:00
Dan Brown
8d07b7cf1c
Added alias for vbscript
2020-10-13 22:44:33 +01:00
Dan Brown
080f9c3025
Merge pull request #2302 from nutsflag/master
...
Add VBScript Codemirror
2020-10-13 22:41:09 +01:00
Dan Brown
617fe6bc8c
Merge pull request #2303 from BookStackApp/l10n_master
...
New Crowdin updates
2020-10-13 22:39:52 +01:00
Dan Brown
bb1f1a9ecd
Fixed error on drawing edit on markdown editor
...
Was preventing save of drawings.
For #2313
2020-10-13 22:36:07 +01:00
Dan Brown
d688e43197
New translations settings.php (Chinese Simplified)
2020-10-05 06:26:38 +01:00
Dan Brown
c82c3023c5
New translations settings.php (Spanish)
2020-10-02 17:18:27 +01:00
Dan Brown
d0d75afc66
New translations settings.php (Chinese Simplified)
2020-10-02 15:55:46 +01:00
nutsflag
467176ee78
Update code.js
2020-10-02 15:14:29 +02:00
nutsflag
521a002001
Update code-editor.blade.php
2020-10-02 15:13:31 +02:00
Timo Schwarzer
a74d551bd6
Install composer dependencies in Docker entrypoint
2020-10-01 11:34:56 +02:00
Timo Schwarzer
aca37b8784
Fix build:js:watch not building at first launch in Docker
2020-10-01 11:25:22 +02:00
Dan Brown
f3ee8f2d4c
Updated http service to not read 204 response data
2020-09-30 22:32:03 +01:00
Dan Brown
ea406690f5
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.
2020-09-30 22:28:53 +01:00
Dan Brown
465d405926
Updated page content related links on content id changes
...
For #2278
2020-09-28 22:26:50 +01:00
Dan Brown
1097c61d6d
Fixed duplicate requests in attachment manager issue
...
Closes #2286
2020-09-28 21:55:24 +01:00
Dan Brown
def2d61ad8
Merge pull request #2272 from jakubboucek/feature/fix-invalid-canonical-redirect
...
Fixed canonical redirects on non-root url app instances
2020-09-28 21:15:23 +01:00
Dan Brown
8b0f5e7000
Updated draw.io references to diagrams.net
...
Related to #2044
2020-09-28 20:45:38 +01:00
Jakub Bouček
1e88e8086f
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
2020-09-27 02:50:37 +02:00
Dan Brown
d48ac0a37d
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.
2020-09-26 18:24:05 +01:00
Dan Brown
3eeb1e7d08
Updated translators fiel with latest
2020-09-26 17:48:02 +01:00
Dan Brown
0d43b50f9d
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)
2020-09-26 17:46:32 +01:00
Dan Brown
6bcfac6751
Updated codemirror and updated codemirror base styles
...
Aligns styles with current release, since was causing overflow
with scrollbars.
Fixes #2267
2020-09-26 17:33:43 +01:00
Dan Brown
68489e5b44
Updated PR code to use isA and updated that function definition
...
Related to #2227
2020-09-26 17:00:17 +01:00
Dan Brown
fe0e307313
Merge branch 'renderpages' of git://github.com/mr-vinn/BookStack into mr-vinn-renderpages
2020-09-26 16:55:05 +01:00
Dan Brown
9985046685
Added test for includes on book export
...
Related to #2227
2020-09-26 16:54:24 +01:00
Dan Brown
53ec794e53
Fixed issue where SAML login not notifiy on existing user
...
Added testing to cover
Fixes #2263
2020-09-26 16:43:06 +01:00
Dan Brown
328d2514c4
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
2020-09-26 16:26:30 +01:00
Dan Brown
de2756dd95
Updated callout links to be correct colors
...
- Also updated to be underlined instead of bold
2020-09-26 15:40:51 +01:00
Dan Brown
1f97047799
Merge branch 'master' of git://github.com/alexmannuk/BookStack into alexmannuk-master
2020-09-26 15:35:13 +01:00
Dan Brown
c870c10e38
Merge pull request #2270 from gertjankrol/feature/test-migrations-workflow
...
Add `test-migrations` workflow
2020-09-26 15:25:17 +01:00
Dan Brown
49fa21c1e2
Merge pull request #2268 from gertjankrol/master
...
Fix the `AddActivityIndexes` migration's `down()` method
2020-09-26 15:21:21 +01:00
Dan Brown
9f87423584
Merge pull request #2274 from abulgatz/patch-1
...
Fixed "Ubunto Mono" $mono type misspelling
2020-09-26 12:11:53 +01:00
Dan Brown
08fbd39fcb
Fixed markdown iframe loading and content alignment
...
Fixes #2280
2020-09-26 12:01:01 +01:00
Adam
5f75a9f32c
Fix "Ubunto Mono" $mono type misspelling
2020-09-23 16:19:30 -05:00
Gertjan Krol
3750922c3e
Added the test-migrations workflow
2020-09-22 19:53:45 +02:00
Gertjan Krol
4b0d1ddf39
Fixed the AddActivityIndexes migration's down() method
2020-09-22 19:22:27 +02:00
Dan Brown
a6c20c321f
Merged latest translation changes
2020-09-20 10:28:01 +01:00
Dan Brown
e12012a6fc
Updated translation contributors
2020-09-20 09:15:02 +01:00
Dan Brown
73b4c6d947
Fixed some wording in example env
2020-09-19 23:09:08 +01:00
Dan Brown
9e11fc33fa
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
2020-09-19 16:09:43 +01:00
Dan Brown
ff46d81681
Merge branch 'jb-l10n-fix-czech' of git://github.com/jakubboucek/BookStack into jakubboucek-jb-l10n-fix-czech
2020-09-19 15:44:18 +01:00
Dan Brown
1f202f6dbc
Updated locale lists for Bulgarian
2020-09-19 15:36:17 +01:00
Dan Brown
bccf4653cb
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)
2020-09-19 15:22:32 +01:00
Dan Brown
31eec34b5d
Moved decode and updated page plaintext decode test
2020-09-19 15:13:18 +01:00
