Skip to content

Commit 3f061af

Browse files
author
Fabian Wunsch
committed
Merge tag 'v1.15.1' into order-details
# Conflicts: # templates/parts/info/_main_infos.html.twig
2 parents 756a201 + 0f42382 commit 3f061af

File tree

164 files changed

+24329
-9857
lines changed

Some content is hidden

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

164 files changed

+24329
-9857
lines changed

.docker/symfony.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
PassEnv PROVIDER_OCTOPART_CLIENT_ID PROVIDER_OCTOPART_SECRET PROVIDER_OCTOPART_CURRENCY PROVIDER_OCTOPART_COUNTRY PROVIDER_OCTOPART_SEARCH_LIMIT PROVIDER_OCTOPART_ONLY_AUTHORIZED_SELLERS
4444
PassEnv PROVIDER_MOUSER_KEY PROVIDER_MOUSER_SEARCH_OPTION PROVIDER_MOUSER_SEARCH_LIMIT PROVIDER_MOUSER_SEARCH_WITH_SIGNUP_LANGUAGE
4545
PassEnv PROVIDER_LCSC_ENABLED PROVIDER_LCSC_CURRENCY
46+
PassEnv PROVIDER_OEMSECRETS_KEY PROVIDER_OEMSECRETS_COUNTRY_CODE PROVIDER_OEMSECRETS_CURRENCY PROVIDER_OEMSECRETS_ZERO_PRICE PROVIDER_OEMSECRETS_SET_PARAM PROVIDER_OEMSECRETS_SORT_CRITERIA
4647
PassEnv EDA_KICAD_CATEGORY_DEPTH
4748

4849
# For most configuration files from conf-available/, which are

.env.dev

Whitespace-only changes.

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
php-versions: [ '8.1', '8.2', '8.3' ]
21+
php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
2222
db-type: [ 'mysql', 'sqlite', 'postgres' ]
2323

2424
env:
@@ -126,7 +126,7 @@ jobs:
126126
run: ./bin/phpunit --coverage-clover=coverage.xml
127127

128128
- name: Upload coverage
129-
uses: codecov/codecov-action@v4
129+
uses: codecov/codecov-action@v5
130130
with:
131131
env_vars: PHP_VERSION,DB_TYPE
132132
token: ${{ secrets.CODECOV_TOKEN }}

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BASE_IMAGE=debian:bookworm-slim
2-
ARG PHP_VERSION=8.2
2+
ARG PHP_VERSION=8.3
33

44
FROM ${BASE_IMAGE} AS base
55
ARG PHP_VERSION
@@ -125,6 +125,7 @@ upload_max_filesize=256M
125125
post_max_size=300M
126126
opcache.preload_user=www-data
127127
opcache.preload=/var/www/html/config/preload.php
128+
log_limit=8096
128129
EOF
129130

130131
COPY ./.docker/symfony.conf /etc/apache2/sites-available/symfony.conf

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.14.0
1+
1.15.1

assets/controllers/elements/ckeditor_controller.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ export default class extends Controller {
5353

5454
const config = {
5555
language: language,
56+
licenseKey: "GPL",
5657
}
5758

5859
const watchdog = new EditorWatchdog();

assets/controllers/elements/part_search_controller.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,5 +186,15 @@ export default class extends Controller {
186186
];
187187
},
188188
});
189+
190+
//Try to find the input field and register a defocus handler. This is necessarry, as by default the autocomplete
191+
//lib has problems when multiple inputs are present on the page. (see https://github.com/algolia/autocomplete/issues/1216)
192+
const inputs = this.element.getElementsByClassName('aa-Input');
193+
for (const input of inputs) {
194+
input.addEventListener('blur', () => {
195+
this._autocomplete.setIsOpen(false);
196+
});
197+
}
198+
189199
}
190200
}

assets/controllers/pages/barcode_scan_controller.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import {Controller} from "@hotwired/stimulus";
2121
//import * as ZXing from "@zxing/library";
2222

23-
import {Html5QrcodeScanner, Html5Qrcode} from "html5-qrcode";
23+
import {Html5QrcodeScanner, Html5Qrcode} from "@part-db/html5-qrcode";
2424

2525
/* stimulusFetch: 'lazy' */
2626
export default class extends Controller {
@@ -50,7 +50,7 @@ export default class extends Controller {
5050
});
5151

5252
this._scanner = new Html5QrcodeScanner(this.element.id, {
53-
fps: 2,
53+
fps: 10,
5454
qrbox: qrboxFunction,
5555
experimentalFeatures: {
5656
//This option improves reading quality on android chrome
@@ -61,6 +61,11 @@ export default class extends Controller {
6161
this._scanner.render(this.onScanSuccess.bind(this));
6262
}
6363

64+
disconnect() {
65+
this._scanner.pause();
66+
this._scanner.clear();
67+
}
68+
6469
onScanSuccess(decodedText, decodedResult) {
6570
//Put our decoded Text into the input box
6671
document.getElementById('scan_dialog_input').value = decodedText;

assets/css/app/layout.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ body {
108108
.back-to-top {
109109
cursor: pointer;
110110
position: fixed;
111-
bottom: 20px;
112-
right: 20px;
111+
bottom: 60px;
112+
right: 40px;
113113
display:none;
114114
z-index: 1030;
115115
}

assets/css/components/ckeditor.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
/** Should be the same settings, as in label_style.css */
2525
.ck-html-label .ck-content {
2626
font-family: "DejaVu Sans Mono", monospace;
27-
font-size: 12px;
27+
font-size: 12pt;
2828
line-height: 1.0;
29-
font-size-adjust: 1.5;
3029
}
3130

3231
.ck-html-label .ck-content p {

0 commit comments

Comments
 (0)