Skip to content

Commit f7c1a19

Browse files
committed
Merge branch 'development' into feature/upload-schematic-boms
2 parents 9cb9260 + 23b4299 commit f7c1a19

File tree

49 files changed

+5727
-308
lines changed

Some content is hidden

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

49 files changed

+5727
-308
lines changed

assets/css/app/tables.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ th.select-checkbox {
8484
display: inline-flex;
8585
}
8686

87+
/** Add spacing between column visibility button and length menu */
88+
.buttons-colvis {
89+
margin-right: 0.2em !important;
90+
}
91+
8792
/** Fix datatables select-checkbox position */
8893
table.dataTable tr.selected td.select-checkbox:after
8994
{

composer.json

Lines changed: 165 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -1,170 +1,171 @@
11
{
2-
"name": "part-db/part-db-server",
3-
"type": "project",
4-
"license": "AGPL-3.0-or-later",
5-
"require": {
6-
"php": "^8.1",
7-
"ext-ctype": "*",
8-
"ext-dom": "*",
9-
"ext-gd": "*",
10-
"ext-iconv": "*",
11-
"ext-intl": "*",
12-
"ext-json": "*",
13-
"ext-mbstring": "*",
14-
"amphp/http-client": "^5.1",
15-
"api-platform/core": "^3.1",
16-
"beberlei/doctrineextensions": "^1.2",
17-
"brick/math": "0.12.1 as 0.11.0",
18-
"composer/ca-bundle": "^1.5",
19-
"composer/package-versions-deprecated": "^1.11.99.5",
20-
"doctrine/data-fixtures": "^2.0.0",
21-
"doctrine/dbal": "^4.0.0",
22-
"doctrine/doctrine-bundle": "^2.0",
23-
"doctrine/doctrine-migrations-bundle": "^3.0",
24-
"doctrine/orm": "^3.2.0",
25-
"dompdf/dompdf": "^v3.0.0",
26-
"erusev/parsedown": "^1.7",
27-
"florianv/swap": "^4.0",
28-
"florianv/swap-bundle": "dev-master",
29-
"gregwar/captcha-bundle": "^2.1.0",
30-
"hshn/base64-encoded-file": "^5.0",
31-
"jbtronics/2fa-webauthn": "^v2.2.0",
32-
"jbtronics/dompdf-font-loader-bundle": "^1.0.0",
33-
"jfcherng/php-diff": "^6.14",
34-
"knpuniversity/oauth2-client-bundle": "^2.15",
35-
"league/csv": "^9.8.0",
36-
"league/html-to-markdown": "^5.0.1",
37-
"liip/imagine-bundle": "^2.2",
38-
"nbgrp/onelogin-saml-bundle": "^1.3",
39-
"nelexa/zip": "^4.0",
40-
"nelmio/cors-bundle": "^2.3",
41-
"nelmio/security-bundle": "^3.0",
42-
"nyholm/psr7": "^1.1",
43-
"omines/datatables-bundle": "^0.9.1",
44-
"paragonie/sodium_compat": "^1.21",
45-
"part-db/label-fonts": "^1.0",
46-
"rhukster/dom-sanitizer": "^1.0",
47-
"runtime/frankenphp-symfony": "^0.2.0",
48-
"s9e/text-formatter": "^2.1",
49-
"scheb/2fa-backup-code": "^6.8.0",
50-
"scheb/2fa-bundle": "^6.8.0",
51-
"scheb/2fa-google-authenticator": "^6.8.0",
52-
"scheb/2fa-trusted-device": "^6.8.0",
53-
"shivas/versioning-bundle": "^4.0",
54-
"spatie/db-dumper": "^3.3.1",
55-
"symfony/apache-pack": "^1.0",
56-
"symfony/asset": "6.4.*",
57-
"symfony/console": "6.4.*",
58-
"symfony/css-selector": "6.4.*",
59-
"symfony/dom-crawler": "6.4.*",
60-
"symfony/dotenv": "6.4.*",
61-
"symfony/expression-language": "6.4.*",
62-
"symfony/flex": "^v2.3.1",
63-
"symfony/form": "6.4.*",
64-
"symfony/framework-bundle": "6.4.*",
65-
"symfony/http-client": "6.4.*",
66-
"symfony/http-kernel": "6.4.*",
67-
"symfony/mailer": "6.4.*",
68-
"symfony/monolog-bundle": "^3.1",
69-
"symfony/polyfill-php82": "^1.28",
70-
"symfony/process": "6.4.*",
71-
"symfony/property-access": "6.4.*",
72-
"symfony/property-info": "6.4.*",
73-
"symfony/rate-limiter": "6.4.*",
74-
"symfony/runtime": "6.4.*",
75-
"symfony/security-bundle": "6.4.*",
76-
"symfony/serializer": "6.4.*",
77-
"symfony/string": "6.4.*",
78-
"symfony/translation": "6.4.*",
79-
"symfony/twig-bundle": "6.4.*",
80-
"symfony/ux-translator": "^2.10",
81-
"symfony/ux-turbo": "^2.0",
82-
"symfony/validator": "6.4.*",
83-
"symfony/web-link": "6.4.*",
84-
"symfony/webpack-encore-bundle": "^v2.0.1",
85-
"symfony/yaml": "6.4.*",
86-
"tecnickcom/tc-lib-barcode": "^2.1.4",
87-
"twig/cssinliner-extra": "^3.0",
88-
"twig/extra-bundle": "^3.8",
89-
"twig/html-extra": "^3.8",
90-
"twig/inky-extra": "^3.0",
91-
"twig/intl-extra": "^3.8",
92-
"twig/markdown-extra": "^3.8",
93-
"twig/string-extra": "^3.8",
94-
"web-auth/webauthn-symfony-bundle": "^4.0.0"
2+
"name": "part-db/part-db-server",
3+
"type": "project",
4+
"license": "AGPL-3.0-or-later",
5+
"require": {
6+
"php": "^8.1",
7+
"ext-ctype": "*",
8+
"ext-dom": "*",
9+
"ext-gd": "*",
10+
"ext-iconv": "*",
11+
"ext-intl": "*",
12+
"ext-json": "*",
13+
"ext-mbstring": "*",
14+
"amphp/http-client": "^5.1",
15+
"api-platform/core": "^3.1",
16+
"beberlei/doctrineextensions": "^1.2",
17+
"brick/math": "0.12.1 as 0.11.0",
18+
"composer/ca-bundle": "^1.5",
19+
"composer/package-versions-deprecated": "^1.11.99.5",
20+
"doctrine/data-fixtures": "^2.0.0",
21+
"doctrine/dbal": "^4.0.0",
22+
"doctrine/doctrine-bundle": "^2.0",
23+
"doctrine/doctrine-migrations-bundle": "^3.0",
24+
"doctrine/orm": "^3.2.0",
25+
"dompdf/dompdf": "^v3.0.0",
26+
"erusev/parsedown": "^1.7",
27+
"florianv/swap": "^4.0",
28+
"florianv/swap-bundle": "dev-master",
29+
"gregwar/captcha-bundle": "^2.1.0",
30+
"hshn/base64-encoded-file": "^5.0",
31+
"jbtronics/2fa-webauthn": "^v2.2.0",
32+
"jbtronics/dompdf-font-loader-bundle": "^1.0.0",
33+
"jfcherng/php-diff": "^6.14",
34+
"knpuniversity/oauth2-client-bundle": "^2.15",
35+
"league/csv": "^9.8.0",
36+
"league/html-to-markdown": "^5.0.1",
37+
"liip/imagine-bundle": "^2.2",
38+
"nbgrp/onelogin-saml-bundle": "^1.3",
39+
"nelexa/zip": "^4.0",
40+
"nelmio/cors-bundle": "^2.3",
41+
"nelmio/security-bundle": "^3.0",
42+
"nyholm/psr7": "^1.1",
43+
"omines/datatables-bundle": "^0.9.1",
44+
"paragonie/sodium_compat": "^1.21",
45+
"part-db/label-fonts": "^1.0",
46+
"phpoffice/phpspreadsheet": "*",
47+
"rhukster/dom-sanitizer": "^1.0",
48+
"runtime/frankenphp-symfony": "^0.2.0",
49+
"s9e/text-formatter": "^2.1",
50+
"scheb/2fa-backup-code": "^6.8.0",
51+
"scheb/2fa-bundle": "^6.8.0",
52+
"scheb/2fa-google-authenticator": "^6.8.0",
53+
"scheb/2fa-trusted-device": "^6.8.0",
54+
"shivas/versioning-bundle": "^4.0",
55+
"spatie/db-dumper": "^3.3.1",
56+
"symfony/apache-pack": "^1.0",
57+
"symfony/asset": "6.4.*",
58+
"symfony/console": "6.4.*",
59+
"symfony/css-selector": "6.4.*",
60+
"symfony/dom-crawler": "6.4.*",
61+
"symfony/dotenv": "6.4.*",
62+
"symfony/expression-language": "6.4.*",
63+
"symfony/flex": "^v2.3.1",
64+
"symfony/form": "6.4.*",
65+
"symfony/framework-bundle": "6.4.*",
66+
"symfony/http-client": "6.4.*",
67+
"symfony/http-kernel": "6.4.*",
68+
"symfony/mailer": "6.4.*",
69+
"symfony/monolog-bundle": "^3.1",
70+
"symfony/polyfill-php82": "^1.28",
71+
"symfony/process": "6.4.*",
72+
"symfony/property-access": "6.4.*",
73+
"symfony/property-info": "6.4.*",
74+
"symfony/rate-limiter": "6.4.*",
75+
"symfony/runtime": "6.4.*",
76+
"symfony/security-bundle": "6.4.*",
77+
"symfony/serializer": "6.4.*",
78+
"symfony/string": "6.4.*",
79+
"symfony/translation": "6.4.*",
80+
"symfony/twig-bundle": "6.4.*",
81+
"symfony/ux-translator": "^2.10",
82+
"symfony/ux-turbo": "^2.0",
83+
"symfony/validator": "6.4.*",
84+
"symfony/web-link": "6.4.*",
85+
"symfony/webpack-encore-bundle": "^v2.0.1",
86+
"symfony/yaml": "6.4.*",
87+
"tecnickcom/tc-lib-barcode": "^2.1.4",
88+
"twig/cssinliner-extra": "^3.0",
89+
"twig/extra-bundle": "^3.8",
90+
"twig/html-extra": "^3.8",
91+
"twig/inky-extra": "^3.0",
92+
"twig/intl-extra": "^3.8",
93+
"twig/markdown-extra": "^3.8",
94+
"twig/string-extra": "^3.8",
95+
"web-auth/webauthn-symfony-bundle": "^4.0.0"
96+
},
97+
"require-dev": {
98+
"dama/doctrine-test-bundle": "^v8.0.0",
99+
"doctrine/doctrine-fixtures-bundle": "^4.0.0",
100+
"ekino/phpstan-banned-code": "^v3.0.0",
101+
"jbtronics/translation-editor-bundle": "^1.0",
102+
"phpstan/extension-installer": "^1.0",
103+
"phpstan/phpstan": "^2.0.4",
104+
"phpstan/phpstan-doctrine": "^2.0.1",
105+
"phpstan/phpstan-strict-rules": "^2.0.1",
106+
"phpstan/phpstan-symfony": "^2.0.0",
107+
"phpunit/phpunit": "^9.5",
108+
"rector/rector": "^2.0.4",
109+
"roave/security-advisories": "dev-latest",
110+
"symfony/browser-kit": "6.4.*",
111+
"symfony/debug-bundle": "6.4.*",
112+
"symfony/maker-bundle": "^1.13",
113+
"symfony/phpunit-bridge": "6.4.*",
114+
"symfony/stopwatch": "6.4.*",
115+
"symfony/web-profiler-bundle": "6.4.*",
116+
"symplify/easy-coding-standard": "^12.0"
117+
},
118+
"suggest": {
119+
"ext-bcmath": "Used to improve price calculation performance",
120+
"ext-gmp": "Used to improve price calculation performanice"
121+
},
122+
"config": {
123+
"preferred-install": {
124+
"*": "dist"
95125
},
96-
"require-dev": {
97-
"dama/doctrine-test-bundle": "^v8.0.0",
98-
"doctrine/doctrine-fixtures-bundle": "^4.0.0",
99-
"ekino/phpstan-banned-code": "^v3.0.0",
100-
"jbtronics/translation-editor-bundle": "^1.0",
101-
"phpstan/extension-installer": "^1.0",
102-
"phpstan/phpstan": "^2.0.4",
103-
"phpstan/phpstan-doctrine": "^2.0.1",
104-
"phpstan/phpstan-strict-rules": "^2.0.1",
105-
"phpstan/phpstan-symfony": "^2.0.0",
106-
"phpunit/phpunit": "^9.5",
107-
"rector/rector": "^2.0.4",
108-
"roave/security-advisories": "dev-latest",
109-
"symfony/browser-kit": "6.4.*",
110-
"symfony/debug-bundle": "6.4.*",
111-
"symfony/maker-bundle": "^1.13",
112-
"symfony/phpunit-bridge": "6.4.*",
113-
"symfony/stopwatch": "6.4.*",
114-
"symfony/web-profiler-bundle": "6.4.*",
115-
"symplify/easy-coding-standard": "^12.0"
126+
"platform": {
127+
"php": "8.1.0"
116128
},
117-
"suggest": {
118-
"ext-bcmath": "Used to improve price calculation performance",
119-
"ext-gmp": "Used to improve price calculation performanice"
120-
},
121-
"config": {
122-
"preferred-install": {
123-
"*": "dist"
124-
},
125-
"platform": {
126-
"php": "8.1.0"
127-
},
128-
"sort-packages": true,
129-
"allow-plugins": {
130-
"composer/package-versions-deprecated": true,
131-
"symfony/flex": true,
132-
"phpstan/extension-installer": true,
133-
"symfony/runtime": true,
134-
"php-http/discovery": true
135-
}
136-
},
137-
"autoload": {
138-
"psr-4": {
139-
"App\\": "src/"
140-
}
141-
},
142-
"autoload-dev": {
143-
"psr-4": {
144-
"App\\Tests\\": "tests/"
145-
}
146-
},
147-
"scripts": {
148-
"auto-scripts": {
149-
"cache:clear": "symfony-cmd",
150-
"assets:install %PUBLIC_DIR%": "symfony-cmd"
151-
},
152-
"post-install-cmd": [
153-
"@auto-scripts"
154-
],
155-
"post-update-cmd": [
156-
"@auto-scripts"
157-
],
158-
"phpstan": "vendor/bin/phpstan analyse src --level 5 --memory-limit 1G"
159-
},
160-
"conflict": {
161-
"symfony/symfony": "*"
129+
"sort-packages": true,
130+
"allow-plugins": {
131+
"composer/package-versions-deprecated": true,
132+
"symfony/flex": true,
133+
"phpstan/extension-installer": true,
134+
"symfony/runtime": true,
135+
"php-http/discovery": true
136+
}
137+
},
138+
"autoload": {
139+
"psr-4": {
140+
"App\\": "src/"
141+
}
142+
},
143+
"autoload-dev": {
144+
"psr-4": {
145+
"App\\Tests\\": "tests/"
146+
}
147+
},
148+
"scripts": {
149+
"auto-scripts": {
150+
"cache:clear": "symfony-cmd",
151+
"assets:install %PUBLIC_DIR%": "symfony-cmd"
162152
},
163-
"extra": {
164-
"symfony": {
165-
"allow-contrib": false,
166-
"require": "6.4.*",
167-
"docker": true
168-
}
153+
"post-install-cmd": [
154+
"@auto-scripts"
155+
],
156+
"post-update-cmd": [
157+
"@auto-scripts"
158+
],
159+
"phpstan": "vendor/bin/phpstan analyse src --level 5 --memory-limit 1G"
160+
},
161+
"conflict": {
162+
"symfony/symfony": "*"
163+
},
164+
"extra": {
165+
"symfony": {
166+
"allow-contrib": false,
167+
"require": "6.4.*",
168+
"docker": true
169169
}
170+
}
170171
}

0 commit comments

Comments
 (0)