Merge pull request #5851 from pixelfed/staging

Staging

CHANGELOG.md

@@ -48,6 +48,9 @@
 - Update CuratedOnboarding, add new app:curated-onboarding command, extend email verification window to 7 days and fix resend verification mails ([49604210](https://github.com/pixelfed/pixelfed/commit/49604210))
 - Update DirectMessageController, fix performance issue ([4ec9f99](https://github.com/pixelfed/pixelfed/commit/4ec9f99))
 - Update App Register to expire codes after 4 hours instead of 60 minutes ([0844094b](https://github.com/pixelfed/pixelfed/commit/0844094b))
+- Update ApiV1Controller, fix max_id pagination on home and public timeline feeds ([38e17a06e](https://github.com/pixelfed/pixelfed/commit/38e17a06e))
+- Update Post component, rewrite local post urls ([d2f2a1b1c](https://github.com/pixelfed/pixelfed/commit/d2f2a1b1c))
+- Update Profile component, rewrite local profile urls ([dfbccaa19](https://github.com/pixelfed/pixelfed/commit/dfbccaa19))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.12.4 (2024-11-08)](https://github.com/pixelfed/pixelfed/compare/v0.12.4...dev)

composer.json

@@ -14,15 +14,15 @@
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "bacon/bacon-qr-code": "^3.0",
-        "brick/math": "^0.9.3",
+        "brick/math": "^0.11",
         "buzz/laravel-h-captcha": "^1.0.4",
         "doctrine/dbal": "^3.0",
         "endroid/qr-code": "^6.0",
         "intervention/image": "^2.4",
         "jenssegers/agent": "^2.6",
-        "laravel-notification-channels/expo": "~1.3.0|~2.0.0",
-        "laravel-notification-channels/webpush": "^8.0",
-        "laravel/framework": "^11.0",
+        "laravel-notification-channels/expo": "^2.0.0",
+        "laravel-notification-channels/webpush": "^10.2",
+        "laravel/framework": "^12.0",
         "laravel/helpers": "^1.1",
         "laravel/horizon": "^5.0",
         "laravel/passport": "^12.0",
@@ -40,8 +40,8 @@
         "predis/predis": "^2.0",
         "pusher/pusher-php-server": "^7.2",
         "resend/resend-php": "^0.13.0",
-        "spatie/laravel-backup": "^8.0.0",
-        "spatie/laravel-image-optimizer": "^1.8.0",
+        "spatie/laravel-backup": "^9.2.9",
+        "spatie/laravel-image-optimizer": "^1.8.2",
         "stevebauman/purify": "^6.2.0",
         "symfony/http-client": "^6.1",
         "symfony/mailgun-mailer": "^6.1"
@@ -49,7 +49,7 @@
     "require-dev": {
         "fakerphp/faker": "^1.23",
         "laravel/pint": "^1.13",
-        "laravel/telescope": "^5.0",
+        "laravel/telescope": "^5.5",
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^8.1",
         "phpunit/phpunit": "^11.0.1"

config/backup.php

@@ -152,7 +152,7 @@ return [
         'notifiable' => \Spatie\Backup\Notifications\Notifiable::class,
 
         'mail' => [
-            'to' => env('BACKUP_EMAIL_ADDRESS', ''),
+            'to' => env('BACKUP_EMAIL_ADDRESS', 'noreply@example.com'),
 
             'from' => [
                 'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),

public/mix-manifest.json

@@ -16,7 +16,7 @@
     "/js/profile-directory.js": "/js/profile-directory.js?id=12062dff1852e33308b71f239f79d0fe",
     "/js/story-compose.js": "/js/story-compose.js?id=a25351b1487264fd49458d47cd8c121f",
     "/js/direct.js": "/js/direct.js?id=3e9c970e8ee5cc4e744a262b6b58339a",
-    "/js/admin.js": "/js/admin.js?id=5be9caec4f61a9caa193af921080c4f5",
+    "/js/admin.js": "/js/admin.js?id=4f07b4fac37aa56cf7db83f76a20d0d6",
     "/js/spa.js": "/js/spa.js?id=315a588c1b9b8d4af7beb93e7d498107",
     "/js/stories.js": "/js/stories.js?id=f5637cea14c47edfa96df7346b724236",
     "/js/portfolio.js": "/js/portfolio.js?id=5f64242a8cccdeb9d0642c9216396192",

resources/assets/components/admin/AdminSettings.vue

@@ -1022,11 +1022,15 @@
                     }
 
                     if(this.mediaTypes.mp4) {
-                        res += 'video/mp4'
+                        res += 'video/mp4,'
+                    }
+
+                    if(this.mediaTypes.heic) {
+                        res += 'image/heic,'
                     }
 
                     if(this.mediaTypes.avif) {
-                        res += 'image/avif'
+                        res += 'image/avif,'
                     }
 
                     if(res.endsWith(',')) {