Skip to content

Commit b2941d7

Browse files
ssddanbrownssddanbrown
committed
Merge branch 'development' into release
2 parents cfeb035 + d421a19 commit b2941d7

483 files changed

Lines changed: 7130 additions & 2231 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.env.example.complete‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,19 @@ ALLOWED_IFRAME_HOSTS=null
395395
# Current host and source for the "DRAWIO" setting will be auto-appended to the sources configured.
396396
ALLOWED_IFRAME_SOURCES="https://*.draw.io https://*.youtube.com https://*.youtube-nocookie.com https://*.vimeo.com"
397397

398+
# A list of sources/hostnames that can be loaded as CSS styles within BookStack.
399+
# Space separated if multiple. BookStack host domain is auto-inferred.
400+
# Defaults to a permissive set if not provided.
401+
# Example: ALLOWED_STYLE_SOURCES="https://fonts.googleapis.com"
402+
ALLOWED_STYLE_SOURCES=null
403+
404+
# A list of sources/hostnames that can be loaded as image content within BookStack.
405+
# Space separated if multiple. BookStack host domain is auto-inferred, in addition to
406+
# data and blob images, due to their use for various functionality.
407+
# Defaults to a permissive set if not provided.
408+
# Example: ALLOWED_IMAGE_SOURCES="https://images.example.com"
409+
ALLOWED_IMAGE_SOURCES=null
410+
398411
# A list of the sources/hostnames that can be reached by application SSR calls.
399412
# This is used wherever users can provide URLs/hosts in-platform, like for webhooks.
400413
# Host-specific functionality (usually controlled via other options) like auth

‎.forgejo/CODE_OF_CONDUCT.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Please find our community rules on our website here:
2+
https://www.bookstackapp.com/about/community-rules/

‎.forgejo/FUNDING.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# These are supported funding model platforms
2+
3+
github: [ssddanbrown]
4+
ko_fi: ssddanbrown

.github/ISSUE_TEMPLATE/api_request.yml renamed to .forgejo/ISSUE_TEMPLATE/api_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: New API Endpoint or API Ability
22
description: Request a new endpoint or API feature be added
3-
labels: [":nut_and_bolt: API Request"]
3+
labels: ["Type/API Request"]
44
body:
55
- type: textarea
66
id: feature

.github/ISSUE_TEMPLATE/bug_report.yml renamed to .forgejo/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Bug Report
22
description: Create a report to help us fix bugs & issues in existing supported functionality
3-
labels: [":bug: Bug"]
3+
labels: ["Type/Bug Report"]
44
body:
55
- type: markdown
66
attributes:

‎.forgejo/ISSUE_TEMPLATE/config.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Community Forum Support
4+
url: https://community.bookstackapp.com
5+
about: Get support by talking with the BookStack team & community.
6+
7+
- name: Debugging & Common Issues
8+
url: https://www.bookstackapp.com/docs/admin/debugging/
9+
about: Find details on how to debug issues and view common issues with their resolutions.
10+
11+
- name: Official Support Plans
12+
url: https://www.bookstackapp.com/support/
13+
about: View our official support plans that offer assured support for business.

.github/ISSUE_TEMPLATE/feature_request.yml renamed to .forgejo/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Feature Request
22
description: Request a new feature or idea to be added to BookStack
3-
labels: [":hammer: Feature Request"]
3+
labels: ["Type/Feature Request"]
44
body:
55
- type: textarea
66
id: description
@@ -33,7 +33,7 @@ body:
3333
attributes:
3434
label: Have you searched for an existing open/closed issue?
3535
description: |
36-
To help us keep these issues under control, please ensure you have first [searched our issue list](https://github.com/BookStackApp/BookStack/issues?q=is%3Aissue) for any existing issues that cover the fundamental benefit/goal of your request.
36+
To help us keep these issues under control, please ensure you have first [searched our issue list](https://codeberg.org/bookstack/bookstack/issues) for any existing issues that cover the fundamental benefit/goal of your request.
3737
options:
3838
- label: I have searched for existing issues and none cover my fundamental request
3939
required: true
@@ -56,3 +56,13 @@ body:
5656
description: Add any other context or screenshots about the feature request here.
5757
validations:
5858
required: false
59+
- type: checkboxes
60+
id: ai-thoughts
61+
attributes:
62+
label: Have you used generative AI/LLMs to create any thoughts in this request?
63+
description: |
64+
We ask that no machine generated thoughts or ideas are provided, to avoid us spending time considering the ideas
65+
of a machine instead of a human. Further guidance on this can be found [in the BookStack community rules](https://www.bookstackapp.com/about/community-rules/#use-of-llmsai).
66+
options:
67+
- label: This request only contains the thoughts & ideas of a human
68+
required: true

.github/ISSUE_TEMPLATE/language_request.yml renamed to .forgejo/ISSUE_TEMPLATE/language_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Language Request
22
description: Request a new language to be added to Crowdin for you to translate
3-
labels: [":earth_africa: Translations"]
3+
labels: ["Focus: Translations"]
44
assignees:
55
- ssddanbrown
66
body:

.github/ISSUE_TEMPLATE/support_request.yml renamed to .forgejo/ISSUE_TEMPLATE/support_request.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Support Request
22
description: Request support for a specific problem you have not been able to solve yourself
3-
labels: [":dog2: Support"]
3+
labels: ["Type/Support"]
44
body:
55
- type: checkboxes
66
id: useddocs
@@ -15,11 +15,11 @@ body:
1515
- type: checkboxes
1616
id: searchissue
1717
attributes:
18-
label: Searched GitHub Issues
18+
label: Searched Existing Issues
1919
description: |
20-
I have searched for the issue and potential resolutions within the [project's GitHub issue list](https://github.com/BookStackApp/BookStack/issues)
20+
I have searched for the issue and potential resolutions within the [project's issue list](https://codeberg.org/bookstack/bookstack/issues)
2121
options:
22-
- label: I have searched GitHub for the issue.
22+
- label: I have searched for the issue.
2323
required: true
2424
- type: textarea
2525
id: scenario

.github/ISSUE_TEMPLATE/z_blank_request.yml renamed to .forgejo/ISSUE_TEMPLATE/z_blank_request.yml

File renamed without changes.

0 commit comments

Comments
 (0)