Skip to content

Merge upstream and update test expectations #2

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.

Sign up for GitHub

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

Merged
merged 26 commits into from
Dec 12, 2024
Merged

Merge upstream and update test expectations #2

Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
62c94f3
Bump elliptic from 6.5.7 to 6.6.0 in /frontend
dependabot[bot] Oct 31, 2024
d6791f4
docs(setup): Remove deprecated version from docker-compose.yml
jonasrdl Oct 31, 2024
a0b26b9
Add woff2 format to assets.conf for Cache Assets
irexyc Nov 4, 2024
87998a0
Fix bootloop if stream is used for http/https port
Jasparigus Nov 14, 2024
20646e7
Bump @eslint/plugin-kit from 0.2.0 to 0.2.3 in /test
dependabot[bot] Nov 15, 2024
640a1ee
Return generic auth error to prevent user enumeration attacks
tametsi Nov 22, 2024
07a4e57
Merge pull request #4179 from tametsi/develop
jc21 Nov 23, 2024
2075f98
Bump cross-spawn from 7.0.3 to 7.0.6 in /backend
dependabot[bot] Nov 24, 2024
93ea17a
Fix entries of a deleted user break the UI
kerstenremco Nov 25, 2024
586afc0
Merge pull request #4187 from kerstenremco/avatar
jc21 Nov 25, 2024
b20dc5e
Merge pull request #4167 from NginxProxyManager/dependabot/npm_and_ya…
jc21 Nov 25, 2024
cb3e4ed
Merge pull request #4137 from irexyc/add-woff2-asset
jc21 Nov 25, 2024
53ed12b
Merge pull request #4163 from Jasparigus/stream_error_correction
jc21 Nov 25, 2024
4ea50ca
Merge pull request #4126 from jonasrdl/remove-deprecated-version-line
jc21 Nov 25, 2024
81c9038
Refactor user form structure
badkeyy Nov 27, 2024
61e2bde
Merge pull request #4184 from NginxProxyManager/dependabot/npm_and_ya…
jc21 Dec 1, 2024
fe068a8
Bump cross-spawn from 7.0.3 to 7.0.6 in /test
dependabot[bot] Dec 1, 2024
97212f2
Merge pull request #4123 from NginxProxyManager/dependabot/npm_and_ya…
jc21 Dec 2, 2024
8351dd4
Merge pull request #4199 from NginxProxyManager/dependabot/npm_and_ya…
jc21 Dec 2, 2024
03018d2
Merge branch 'NginxProxyManager:develop' into bugfix/fix-user-edit-em…
badkeyy Dec 4, 2024
19ed4c1
Change click to submit
badkeyy Dec 4, 2024
d26e8c1
Change onRender function to always update the dashboard stats
badkeyy Dec 4, 2024
fcf4117
Merge pull request #4206 from badkeyy/bugfix/update-dashboard-stats-o…
jc21 Dec 4, 2024
b3de76c
Merge pull request #4192 from badkeyy/bugfix/fix-user-edit-email-form…
jc21 Dec 4, 2024
d714fee
Merge remote-tracking branch 'upstream/develop' into FEAT/open-id-con…
chutch1122 Dec 11, 2024
46f0b52
Update error messages for login tests
chutch1122 Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/rootfs/etc/nginx/conf.d/include/assets.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
location ~* ^.*\.(css|js|jpe?g|gif|png|webp|woff|eot|ttf|svg|ico|css\.map|js\.map)$ {
location ~* ^.*\.(css|js|jpe?g|gif|png|webp|woff|woff2|eot|ttf|svg|ico|css\.map|js\.map)$ {
if_modified_since off;

# use the public cache
Expand Down