aiden
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7349 from pixelfed/staging

Browse Source 
Staging
pull/7362/head^2
dansup 6 days ago committed by GitHub
parent 516782e8de c47a88342a
commit 830d3b0900
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 14 additions and 65 deletions
Show Stats Download Patch File Download Diff File

2
app/Util/ActivityPub/Helpers.php
Unescape Escape View File

@ -260,7 +260,7 @@ class Helpers
return false;
}
if (strtolower($uri->getScheme()) !== 'https') {
if (strtolower((string) $uri->getScheme()) !== 'https') {
return false;
}

2
lang/en-US/web.php
Unescape Escape View File

@ -319,7 +319,7 @@ return [
'partial_word' => 'Partial word',
'duplicate_not_allowed' => 'Duplicate keywords are not allowed',
'filter_action' => 'Filter Action',
'hide_media_blur' => 'Hide media behind a blurbash',
'hide_media_blur' => 'Hide media behind a blurhash',
'show_warning' => 'Show warning before displaying content',
'hide_content_completely' => 'Hide content completely',
'apply_filters_to' => 'Apply filters to',

51
package-lock.json generated
Unescape Escape View File

@ -5801,57 +5801,6 @@
"postcss": "^8.0.9"
}
},
"node_modules/css-loader": {
"version": "7.1.4",
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.4.tgz",
"integrity": "sha512-vv3J9tlOl04WjiMvHQI/9tmIrCxVrj6PFbHemBB1iihpeRbi/I4h033eoFIhwxBBqLhI0KYFS7yvynBFhIZfTw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"icss-utils": "^5.1.0",
"postcss": "^8.4.40",
"postcss-modules-extract-imports": "^3.1.0",
"postcss-modules-local-by-default": "^4.0.5",
"postcss-modules-scope": "^3.2.0",
"postcss-modules-values": "^4.0.0",
"postcss-value-parser": "^4.2.0",
"semver": "^7.6.3"
},
"engines": {
"node": ">= 18.12.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/webpack"
},
"peerDependencies": {
"@rspack/core": "0.x || ^1.0.0 || ^2.0.0-0",
"webpack": "^5.27.0"
},
"peerDependenciesMeta": {
"@rspack/core": {
"optional": true
},
"webpack": {
"optional": true
}
}
},
"node_modules/css-loader/node_modules/semver": {
"version": "7.8.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz",
"integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==",
"dev": true,
"license": "ISC",
"peer": true,
"bin": {
"semver": "bin/semver.js"
},
"engines": {
"node": ">=10"
}
},
"node_modules/css-select": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",

2
public/_lang/en-US.json
Unescape Escape View File

@ -277,7 +277,7 @@
"partial_word": "Partial word",
"duplicate_not_allowed": "Duplicate keywords are not allowed",
"filter_action": "Filter Action",
"hide_media_blur": "Hide media behind a blurbash",
"hide_media_blur": "Hide media behind a blurhash",
"show_warning": "Show warning before displaying content",
"hide_content_completely": "Hide content completely",
"apply_filters_to": "Apply filters to",

2
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/landing.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/settings.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/spa.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/vendor.js vendored
View File

File diff suppressed because one or more lines are too long

10
public/mix-manifest.json
Unescape Escape View File

@ -1,5 +1,5 @@
{
"/js/app.js": "/js/app.js?id=2fb612c6ac35a15c898af6d80683a0fc",
"/js/app.js": "/js/app.js?id=f5e5f7dbdb6d5f54ce74384b89d85e30",
"/js/activity.js": "/js/activity.js?id=5ff0d41f0c063205e2fd27b7d3a89d40",
"/js/components.js": "/js/components.js?id=6e1d1eba5b3a8d160ccd2b7203f29deb",
"/js/discover.js": "/js/discover.js?id=952469fb673a19bf07f5640d8c31d6a8",
@ -17,18 +17,18 @@
"/js/story-compose.js": "/js/story-compose.js?id=53bba3b9d435cbd7a1689fc07f15439c",
"/js/direct.js": "/js/direct.js?id=7d716b0453d4ad885cb600c0cef953aa",
"/js/admin.js": "/js/admin.js?id=c2dc72c458c7159f893dc6a6df4cbafc",
"/js/spa.js": "/js/spa.js?id=b83b316c4e7eb5ea8361e5778178eca3",
"/js/spa.js": "/js/spa.js?id=55167a337cd58c5cc49f7dfdc0b9257b",
"/js/stories.js": "/js/stories.js?id=8565c19bc915466ed5dd98076cfa3f04",
"/js/portfolio.js": "/js/portfolio.js?id=2dfd35982335ad4eca174b70bc0e9bb4",
"/js/account-import.js": "/js/account-import.js?id=fb9b306bcf2293dbb12c37e6629229db",
"/js/admin_invite.js": "/js/admin_invite.js?id=f95f587114191fd4a1a5d4e21bf69bfd",
"/js/landing.js": "/js/landing.js?id=3654fbf1935928b3ba6c70c1d1827248",
"/js/landing.js": "/js/landing.js?id=d71fbdb0d5f3c03e08c5cd4bf4c2c1d0",
"/js/remote_auth.js": "/js/remote_auth.js?id=c3f3d3f486795671a8eb9074893f99b8",
"/js/groups.js": "/js/groups.js?id=9a739fa2f9b369621756149bf3aa51af",
"/js/group-status.js": "/js/group-status.js?id=0f6c426058a144597e242f70f7bc6790",
"/js/group-topic-feed.js": "/js/group-topic-feed.js?id=df12a95f1d1ba9c229ab921761fcd5ec",
"/js/custom_filters.js": "/js/custom_filters.js?id=f633fb6090aa4906678dc37b41f9f62d",
"/js/settings.js": "/js/settings.js?id=fadf8d33e7be126a83e0e7a31eea807b",
"/js/settings.js": "/js/settings.js?id=085e539d2f6d0d8fc0b6a9f4ea5ee590",
"/js/manifest.js": "/js/manifest.js?id=2e50ab7abeb6b7003e0ab1703bc23918",
"/js/home.chunk.c6aec62e9c29baee.js": "/js/home.chunk.c6aec62e9c29baee.js?id=95295a5b8bfef3a40a3b8c1897afdb90",
"/js/compose.chunk.cb3781f6e49426e4.js": "/js/compose.chunk.cb3781f6e49426e4.js?id=6b6a69634e352106f17301a08df66b24",
@ -65,5 +65,5 @@
"/css/landing.css": "/css/landing.css?id=fb78389492f56a927d3d9bbb3ebd8204",
"/css/profile.css": "/css/profile.css?id=ae4f5db9bb1a89db2ae293d6bde812e3",
"/css/spa.css": "/css/spa.css?id=041aed9a146db0e74b2cfe3ad8eaf96c",
"/js/vendor.js": "/js/vendor.js?id=f2cf955a60635d4ffe8288f2ec34febc"
"/js/vendor.js": "/js/vendor.js?id=12507d146e9aefdfa99aafa4320d9d13"
}

2
resources/assets/js/i18n/en-US.json
Unescape Escape View File

@ -277,7 +277,7 @@
"partial_word": "Partial word",
"duplicate_not_allowed": "Duplicate keywords are not allowed",
"filter_action": "Filter Action",
"hide_media_blur": "Hide media behind a blurbash",
"hide_media_blur": "Hide media behind a blurhash",
"show_warning": "Show warning before displaying content",
"hide_content_completely": "Hide content completely",
"apply_filters_to": "Apply filters to",

Write Preview
Loading…
Cancel
Save