Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,699 Commits 18 Branches 197 Tags 95 MiB
73ebe571a1
Commit Graph

2699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Brown
9e033709a7
Added per-item recycle-bin delete and restore 2020-11-02 22:47:48 +00:00
Dan Brown
82e671a06d
Re-aligned init files with Laravel default 
Removed the custom init elements that we added in 2017 to
custom load the helpers file and instead load via composer.

Also removed laravel-microscope package due to not running due to
helpers file.
 2020-10-31 23:05:48 +00:00
Dan Brown
474770af51
Merge branch 'fixes' of git://github.com/imanghafoori1/BookStack into imanghafoori1-fixes 2020-10-31 22:11:27 +00:00
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
Ole Aldric
36daa09441 Update Localization.php in Middleware with "no" tag for estimate. 2020-10-19 12:43:41 +02:00
Ole Aldric
4c5566755f updated config to also include Norwegian 2020-10-19 12:35:05 +02:00
Ole Aldric
461977cf9a added missing comma that caused the testprocess to fail. 2020-10-19 12:26:18 +02:00
Ole Aldric
837cccd4d4 Added translation for Norwegian (Bokmål) 
This will add translations for Norwegian to BookStack. It is identified by the langID no_NB
 2020-10-19 11:43:43 +02:00
imanghafoori
7a5442e81b Adds laravel-microscope package 2020-10-16 18:40:44 +03:30
imanghafoori
704b808e9e fixes from laravel-microscope 2020-10-16 18:40:10 +03:30
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
Jason Houle
a192b600fc Missed a variable when updating LdapService. 2020-10-12 12:47:36 -04:00
Jason Houle
b714652e10 Import thumbnail photos when LDAP users are created. 2020-10-12 12:33:55 -04:00
Dan Brown
d688e43197 New translations settings.php (Chinese Simplified) 2020-10-05 06:26:38 +01:00
Dan Brown
ff7cbd14fc
Added recycle bin empty notification response with count 2020-10-03 18:53:09 +01:00
Dan Brown
04197e393a
Started work on the recycle bin interface 2020-10-03 18:44:12 +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
Dan Brown
691027a522
Started implementation of recycle bin functionality 2020-09-27 23:24:33 +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