|
| 1 | +diff --git a/CHANGELOG.md b/CHANGELOG.md |
| 2 | +index 5e8baa21..43d17400 100644 |
| 3 | +--- a/CHANGELOG.md |
| 4 | ++++ b/CHANGELOG.md |
| 5 | +@@ -1,6 +1,26 @@ |
| 6 | + # Release Notes |
| 7 | + |
| 8 | +-## [Unreleased](https://github.com/laravel/laravel/compare/v10.2.9...10.x) |
| 9 | ++## [Unreleased](https://github.com/laravel/laravel/compare/v10.3.2...10.x) |
| 10 | ++ |
| 11 | ++## [v10.3.2](https://github.com/laravel/laravel/compare/v10.3.1...v10.3.2) - 2024-01-04 |
| 12 | ++ |
| 13 | ++* [10.x] Reverts `assertOk` change by [@nunomaduro](https://github.com/nunomaduro) in https://github.com/laravel/laravel/pull/6303 |
| 14 | ++* Update Axios to latest version by [@u01jmg3](https://github.com/u01jmg3) in https://github.com/laravel/laravel/pull/6306 |
| 15 | ++* [10.x] Update Axios to latest version by [@u01jmg3](https://github.com/u01jmg3) in https://github.com/laravel/laravel/pull/6313 |
| 16 | ++ |
| 17 | ++## [v10.3.1](https://github.com/laravel/laravel/compare/v10.3.0...v10.3.1) - 2023-12-23 |
| 18 | ++ |
| 19 | ++* [10.x] Add roundrobin transport driver config by [@me-shaon](https://github.com/me-shaon) in https://github.com/laravel/laravel/pull/6301 |
| 20 | ++ |
| 21 | ++## [v10.3.0](https://github.com/laravel/laravel/compare/v10.2.10...v10.3.0) - 2023-12-19 |
| 22 | ++ |
| 23 | ++* [10.x] Use `assertOk()` instead of `assertStatus(200)` in tests by [@TENIOS](https://github.com/TENIOS) in https://github.com/laravel/laravel/pull/6287 |
| 24 | ++* [10.x] Vite 5 by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/laravel/pull/6292 |
| 25 | ++ |
| 26 | ++## [v10.2.10](https://github.com/laravel/laravel/compare/v10.2.9...v10.2.10) - 2023-11-30 |
| 27 | ++ |
| 28 | ++* [10.x] Fixes missing property description by [@nunomaduro](https://github.com/nunomaduro) in https://github.com/laravel/laravel/pull/6275 |
| 29 | ++* [10.x] Add partitioned cookie config key by [@fabricecw](https://github.com/fabricecw) in https://github.com/laravel/laravel/pull/6257 |
| 30 | + |
| 31 | + ## [v10.2.9](https://github.com/laravel/laravel/compare/v10.2.8...v10.2.9) - 2023-11-13 |
| 32 | + |
| 33 | +diff --git a/README.md b/README.md |
| 34 | +index 1824fc1b..1a4c26ba 100644 |
| 35 | +--- a/README.md |
| 36 | ++++ b/README.md |
| 37 | +@@ -27,7 +27,7 @@ Laravel has the most extensive and thorough [documentation](https://laravel.com/ |
| 38 | + |
| 39 | + You may also try the [Laravel Bootcamp](https://bootcamp.laravel.com), where you will be guided through building a modern Laravel application from scratch. |
| 40 | + |
| 41 | +-If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 2000 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library. |
| 42 | ++If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains thousands of video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library. |
| 43 | + |
| 44 | + ## Laravel Sponsors |
| 45 | + |
| 46 | +diff --git a/config/mail.php b/config/mail.php |
| 47 | +index d7416b15..e894b2e5 100644 |
| 48 | +--- a/config/mail.php |
| 49 | ++++ b/config/mail.php |
| 50 | +@@ -29,7 +29,7 @@ return [ |
| 51 | + | mailers below. You are free to add additional mailers as required. |
| 52 | + | |
| 53 | + | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2", |
| 54 | +- | "postmark", "log", "array", "failover" |
| 55 | ++ | "postmark", "log", "array", "failover", "roundrobin" |
| 56 | + | |
| 57 | + */ |
| 58 | + |
| 59 | +@@ -50,16 +50,16 @@ return [ |
| 60 | + 'transport' => 'ses', |
| 61 | + ], |
| 62 | + |
| 63 | +- 'mailgun' => [ |
| 64 | +- 'transport' => 'mailgun', |
| 65 | ++ 'postmark' => [ |
| 66 | ++ 'transport' => 'postmark', |
| 67 | ++ // 'message_stream_id' => null, |
| 68 | + // 'client' => [ |
| 69 | + // 'timeout' => 5, |
| 70 | + // ], |
| 71 | + ], |
| 72 | + |
| 73 | +- 'postmark' => [ |
| 74 | +- 'transport' => 'postmark', |
| 75 | +- // 'message_stream_id' => null, |
| 76 | ++ 'mailgun' => [ |
| 77 | ++ 'transport' => 'mailgun', |
| 78 | + // 'client' => [ |
| 79 | + // 'timeout' => 5, |
| 80 | + // ], |
| 81 | +@@ -86,6 +86,14 @@ return [ |
| 82 | + 'log', |
| 83 | + ], |
| 84 | + ], |
| 85 | ++ |
| 86 | ++ 'roundrobin' => [ |
| 87 | ++ 'transport' => 'roundrobin', |
| 88 | ++ 'mailers' => [ |
| 89 | ++ 'ses', |
| 90 | ++ 'postmark', |
| 91 | ++ ], |
| 92 | ++ ], |
| 93 | + ], |
| 94 | + |
| 95 | + /* |
| 96 | +diff --git a/package.json b/package.json |
| 97 | +index e9319dfe..56f5ddcc 100644 |
| 98 | +--- a/package.json |
| 99 | ++++ b/package.json |
| 100 | +@@ -6,8 +6,8 @@ |
| 101 | + "build": "vite build" |
| 102 | + }, |
| 103 | + "devDependencies": { |
| 104 | +- "axios": "^1.6.1", |
| 105 | +- "laravel-vite-plugin": "^0.8.0", |
| 106 | +- "vite": "^4.0.0" |
| 107 | ++ "axios": "^1.6.4", |
| 108 | ++ "laravel-vite-plugin": "^1.0.0", |
| 109 | ++ "vite": "^5.0.0" |
| 110 | + } |
| 111 | + } |
| 112 | +diff --git a/phpunit.xml b/phpunit.xml |
| 113 | +index f112c0c8..bc86714b 100644 |
| 114 | +--- a/phpunit.xml |
| 115 | ++++ b/phpunit.xml |
| 116 | +@@ -24,6 +24,7 @@ |
| 117 | + <!-- <env name="DB_CONNECTION" value="sqlite"/> --> |
| 118 | + <!-- <env name="DB_DATABASE" value=":memory:"/> --> |
| 119 | + <env name="MAIL_MAILER" value="array"/> |
| 120 | ++ <env name="PULSE_ENABLED" value="false"/> |
| 121 | + <env name="QUEUE_CONNECTION" value="sync"/> |
| 122 | + <env name="SESSION_DRIVER" value="array"/> |
| 123 | + <env name="TELESCOPE_ENABLED" value="false"/> |
| 124 | +diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php |
| 125 | +index 638ec960..33533508 100644 |
| 126 | +--- a/resources/views/welcome.blade.php |
| 127 | ++++ b/resources/views/welcome.blade.php |
| 128 | +@@ -119,18 +119,11 @@ |
| 129 | + </div> |
| 130 | + |
| 131 | + <div class="flex justify-center mt-16 px-0 sm:items-center sm:justify-between"> |
| 132 | +- <div class="text-center text-sm text-gray-500 dark:text-gray-400 sm:text-left"> |
| 133 | +- <div class="flex items-center gap-4"> |
| 134 | +- <a href="https://github.com/sponsors/taylorotwell" class="group inline-flex items-center hover:text-gray-700 dark:hover:text-white focus:outline focus:outline-2 focus:rounded-sm focus:outline-red-500"> |
| 135 | +- <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" class="-mt-px mr-1 w-5 h-5 stroke-gray-400 dark:stroke-gray-600 group-hover:stroke-gray-600 dark:group-hover:stroke-gray-400"> |
| 136 | +- <path stroke-linecap="round" stroke-linejoin="round" d="M21 8.25c0-2.485-2.099-4.5-4.688-4.5-1.935 0-3.597 1.126-4.312 2.733-.715-1.607-2.377-2.733-4.313-2.733C5.1 3.75 3 5.765 3 8.25c0 7.22 9 12 9 12s9-4.78 9-12z" /> |
| 137 | +- </svg> |
| 138 | +- Sponsor |
| 139 | +- </a> |
| 140 | +- </div> |
| 141 | ++ <div class="text-center text-sm sm:text-left"> |
| 142 | ++ |
| 143 | + </div> |
| 144 | + |
| 145 | +- <div class="ml-4 text-center text-sm text-gray-500 dark:text-gray-400 sm:text-right sm:ml-0"> |
| 146 | ++ <div class="text-center text-sm text-gray-500 dark:text-gray-400 sm:text-right sm:ml-0"> |
| 147 | + Laravel v{{ Illuminate\Foundation\Application::VERSION }} (PHP v{{ PHP_VERSION }}) |
| 148 | + </div> |
| 149 | + </div> |
0 commit comments