Skip to content

Commit 833af55

Browse files
committed
Merge branch 'develop' into barcode_settings_hide
2 parents de77eda + 331fbb6 commit 833af55

File tree

1,213 files changed

+15970
-273577
lines changed

Some content is hidden

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

1,213 files changed

+15970
-273577
lines changed

.all-contributorsrc

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3217,6 +3217,33 @@
32173217
"contributions": [
32183218
"bug"
32193219
]
3220+
},
3221+
{
3222+
"login": "DarrenRainey",
3223+
"name": "Darren Rainey",
3224+
"avatar_url": "https://avatars.githubusercontent.com/u/6136439?v=4",
3225+
"profile": "https://darrenraineys.co.uk",
3226+
"contributions": [
3227+
"code"
3228+
]
3229+
},
3230+
{
3231+
"login": "maciej-poleszczyk",
3232+
"name": "maciej-poleszczyk",
3233+
"avatar_url": "https://avatars.githubusercontent.com/u/133033121?v=4",
3234+
"profile": "https://github.com/maciej-poleszczyk",
3235+
"contributions": [
3236+
"code"
3237+
]
3238+
},
3239+
{
3240+
"login": "sgross-emlix",
3241+
"name": "Sebastian Groß",
3242+
"avatar_url": "https://avatars.githubusercontent.com/u/143394709?v=4",
3243+
"profile": "https://github.com/sgross-emlix",
3244+
"contributions": [
3245+
"code"
3246+
]
32203247
}
32213248
]
32223249
}

.env.docker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ API_TOKEN_EXPIRATION_YEARS=40
9797
# --------------------------------------------
9898
# OPTIONAL: SECURITY HEADER SETTINGS
9999
# --------------------------------------------
100-
APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1,172.0.0.0/8
100+
APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1,172.16.0.0/12
101101
ALLOW_IFRAMING=false
102102
REFERRER_POLICY=same-origin
103103
ENABLE_CSP=false

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 38 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 0 additions & 129 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 0 additions & 40 deletions
This file was deleted.

.github/travis-memory.ini

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/weekly-digest.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.github/workflows/stale.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
- uses: actions/stale@v9
1515
with:
1616
debug-only: true
17-
operations-per-run: 100 # just while we're debugging
17+
ascending: true
18+
operations-per-run: 1000 # just while we're debugging
1819
repo-token: ${{ secrets.GITHUB_TOKEN }}
1920
days-before-stale: 60
2021
days-before-close: 7

0 commit comments

Comments
 (0)