forked from BookStackApp/BookStack
-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Pull down upstream changes #9
Open
njam3
wants to merge
910
commits into
Experience-Monks:master
Choose a base branch
from
BookStackApp:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added custom whoops-based debug view
- Occured during enforced MFA setup upon login. - Added test to cover. Fixes #2971
* New translations entities.php (Spanish, Argentina) * New translations activities.php (Spanish, Argentina) * New translations auth.php (Spanish, Argentina) * New translations settings.php (Spanish, Argentina) * New translations validation.php (Spanish, Argentina) * New translations auth.php (Spanish, Argentina)
Also updated version file to be current
- Included tests to cover. - Manually tested via API update and interface page update. Closes #2898
Added support request template
Attachments API
Session was being lost due to the callback POST request cookies not being provided due to samesite=lax. This instead adds an additional hop in the flow to route the request via a GET request so the session is retained. SAML POST data is stored encrypted in cache via a unique ID then pulled out straight afterwards, and restored into POST for the SAML toolkit to validate. Updated testing to cover.
Updated SAML ACS post to retain user session
…into theodor-franke-master
- Migrated env usages to config. - Removed potentially unneeded config options or auto-set signed options based upon provision of certificate. - Aligned SP certificate env option naming with similar IDP option. Tested via AFDS on windows server 2019. To test on other providers.
…tack into ffranchina-fix_sidebar_css
- Scoped padding change to just entity-list-items within the sidebar side reduction of right-hand-padding to zero was causing other entity-list-items, such as those in the homepage listing, would then have no padding. - Updated styles to use css logical properties to retain support for RTL languages such as Arabic, where the whole interface flips around. Related: https://css-tricks.com/css-logical-properties-and-values/
Custom homepage usage will now be checked before any actioning of deletion rather than potentially causing an exception acting during the deletion. Previously a deletion could still be created, within the recycle bin, for the parent which may lead to the page being deleted anyway. For #3150
Updated the getUrl method on deletions to not require any passed params to align with usage in webhooks. Probably better to have a proper interface but would require a wider change. Fixes #3154
- A placeholder is now shown in the gallery. - The page editors will use the original image url if the display thumbnail is missing. For #3142
* New translations common.php (Czech) * New translations common.php (Chinese Simplified) * New translations settings.php (Chinese Simplified) * New translations errors.php (Japanese) * New translations entities.php (Japanese) * New translations common.php (Japanese) * New translations settings.php (Japanese) * New translations entities.php (Japanese) * New translations settings.php (Japanese) * New translations auth.php (Japanese) * New translations common.php (Portuguese, Brazilian) * New translations activities.php (Portuguese, Brazilian) * New translations activities.php (Portuguese, Brazilian)
- Wrap the user creation process in a transaction - Add test
chore(dev): add xdebug support for docker setup
Further fixes for #3120, Adds DOMPDF specific adjustments to prevent full width linked images being cut-off as per last tweak. This does not fix usage in smaller cases (tables) but tested on master DOMPDF branch shows that will likely be fixed in next DOMPDF upstream release. DOMPDF fixes would break WKHTMLTOPDF presentation so system updated to conditionally apply styles.
When creating a user, do not persist the user on invitation sending failure
Addresses potential issue when using multibyte characters. Couple of other packages seemed to have updates also since earlier. For #3170
* New translations activities.php (Slovak) * New translations activities.php (Slovak) * New translations common.php (Russian) * New translations settings.php (Russian) * New translations common.php (Japanese) * New translations settings.php (Japanese) * New translations activities.php (Persian) * New translations auth.php (Persian) * New translations auth.php (Persian) * New translations entities.php (Persian) * New translations common.php (Persian) * New translations auth.php (Persian) * New translations entities.php (Persian) * New translations settings.php (Persian) * New translations entities.php (Persian) * New translations validation.php (Persian) * New translations settings.php (Persian) * New translations settings.php (Spanish, Argentina) * New translations common.php (Spanish, Argentina) * New translations settings.php (Spanish, Argentina) * New translations activities.php (Spanish, Argentina) * New translations entities.php (Spanish, Argentina) * New translations entities.php (Persian) * New translations settings.php (Persian) * New translations entities.php (Persian) * New translations errors.php (Persian) * New translations settings.php (French) * New translations common.php (French) * New translations settings.php (French) * New translations entities.php (Persian) * New translations settings.php (Persian) * New translations entities.php (Persian) * New translations errors.php (Persian)
- Includes tests to cover For #3183
Quick patch to clear the gallery display when getting the first page. Duplication of the galler was occuring due to the mulitple upload events loading the gallery mulitple times while only clearing the existing gallery at the start of all refreshes. A bit flashy in terms of user experience, as there will still be mulitple load/clear events but fixes the duplication. Could be done more elegently in future by communicating up image upload counts. For #3160
Intended to fix positioning quirks caused by changing codemirror instance size when you have lines that wrap and cause line height changes. Often caused by editor toolbox expand/collapse. This adds a debounced resize observer to refresh editor layout on size change. Also tweaks toolbox expand/collapse to more consistently set aria attribute. For #3186
Made existence of 'alg' optional when JWK array set so we instead infer it as RSA256 if not existing. Fixes #3206
This view was relying on too much app logic, which could lead to errors when rendering it.
Massively simplify the 503 error view
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.