From 56c902629919b319a166f9e0e675b52628145e70 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 06:18:27 +0200 Subject: [PATCH] Auto commit for release 'develop' on 2024-04-26 --- THANKS.md | 187 +++++++++++++++++++++++++++++++++++++++++++++ composer.lock | 12 +-- config/firefly.php | 2 +- package-lock.json | 6 +- routes/api.php | 2 +- 5 files changed, 198 insertions(+), 11 deletions(-) diff --git a/THANKS.md b/THANKS.md index 4a23745305..3e7726b552 100755 --- a/THANKS.md +++ b/THANKS.md @@ -3,6 +3,193 @@ Over time, many people have contributed to Firefly III. Their efforts are not always visible, but always remembered and appreciated. Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution. +## 2024 +- imlonghao +- Rahman Yusuf +- Michael Thomas +- WardenJakx +- kuilin +- Stevie Robinson +- luzpaz +- Lemuel Roberto Bonifácio +- maureenferreira + +## 2023 +- tieu1991 +- Maxco10 +- zqye +- Mateus Pereira +- josephbadow +- Christian Desktop +- Edgars +- Hannah K +- noxonad +- Kaijia Feng +- Marc Ordinas i Llopis +- Kuba Turek +- Julien Stébenne + +## 2022 +- Johannes Zellner +- Janne Heß +- charlesteets +- Nathan PERIER +- Jan Willhaus +- canoine +- Rick Cuddy +- James +- Hugo Meyronneinc +- naveen +- neilnaveen +- naveensrinivasan +- Federico Micelli +- George Hahn + +## 2021 +- StillLoading +- Igor Rzegocki +- Lorenzo Breda +- Hosh +- Flightkick +- alex6480 +- VREEdom +- Hamza FADIL +- Kasper Læssø Sørensen +- Alex +- Jeroen De Meerleer +- Ruben van Erk +- Fabian Zimmermann +- Mirko Berger +- KaihatsuOnline +- MihataBG + +## 2020 +- Hannes Körber +- Julien Cassagne +- bu4ak +- Viktor Yakovlev +- Oliver Kaufmann +- Arvind Chembarpu +- GrayStrider +- psychowood +- Hosh Sadiq +- emansih +- Aniruddha Maru +- johnny +- sephrat +- bpatath +- Florian Dupret +- Maxim Kurbatov +- Lucas Guima +- Sandro +- Ruben Verhoef +- Daniel Idzerda +- Calum Smith +- Agraphie +- Tomer Shvueli +- Tomer S + +## 2019 +- Pascal Jungblut +- Justyn Shull +- Timendum +- Nicolas Lœuillet +- Dominic Guhl +- Melroy van den Berg +- Henning Stein +- Jan Klepek +- Jonathan +- Geoffrey “Frogeye” Preud'homme +- Michael Fix +- Juraj Mlich +- Eddybrando Vásquez +- hulloanson +- Will Rouesnel +- lastlink +- Mr. Funk +- Simon Taddiken +- Joris +- Bastiaan Nijkamp + +## 2018 +- a1ex4 +- Daniel Quah +- Marco Lourenço +- Dennis Enderink +- Luca Bognolo +- Mike Conway +- Ben +- Mathieu Post +- George Hertz +- HamuZ HamuZ +- David Meiseles +- Erik Gelderblom +- Luca Vallerini +- Clemens Wijnekus +- Jacob Weisz +- Mateusz Gozdek +- anmol26s +- Kevin Hellemun +- Shashank M Chakravarthy +- Nico Schreiner +- Paul Sohier +- Brenden Conte +- Ben Yanke +- Andrew Prokhorenkov +- devlearner +- Kelvin +- J'informatique + +## 2017 +- Victor Mosin +- Justin +- Hugo van Duijn +- Lukas Winkler +- Marcin Szymanski +- Jens Kat +- koziolek +- jleeong +- Simon Hanna +- richard & xeli.eu +- Sergey Besedin +- Welbert Serra +- Joris de Vries +- Patrick Kostjens +- Enrico Lamperti +- Christian Musa +- Enno Lohmeier + +## 2016 +- Sander +- Toon Schoenmakers +- Telyn +- Sander Kleykens +- Tom van der Werf +- Matthew Peck +- Sander Mulders +- Bonno Nachtegaal-Karels +- Niek Haarman +- Edwin +- Thijs Alkemade +- zjean +- Graham Miller +- Robert Horlings +- leander091 + +## 2015 +- Antonio Spinelli +- Colin O'Dell +- RonaldvanMeer +- Richard Ebbers +- Balazs Varkonyi +- Niek van der Kooy +- Ilya Kil + +## 2014 +- Stewart Malik +- Graham Campbell +- Sander Dorigo +- James Cole Thank you for all your support! diff --git a/composer.lock b/composer.lock index 4718820352..764182e6c3 100644 --- a/composer.lock +++ b/composer.lock @@ -5404,16 +5404,16 @@ }, { "name": "spatie/laravel-html", - "version": "3.8.0", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-html.git", - "reference": "f1dcd290b9feebf50ad6b5c8e5627b0bf87b7ebe" + "reference": "35802bd9b276ce08e1d9d15584b17fdef965063b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-html/zipball/f1dcd290b9feebf50ad6b5c8e5627b0bf87b7ebe", - "reference": "f1dcd290b9feebf50ad6b5c8e5627b0bf87b7ebe", + "url": "https://api.github.com/repos/spatie/laravel-html/zipball/35802bd9b276ce08e1d9d15584b17fdef965063b", + "reference": "35802bd9b276ce08e1d9d15584b17fdef965063b", "shasum": "" }, "require": { @@ -5470,7 +5470,7 @@ "spatie" ], "support": { - "source": "https://github.com/spatie/laravel-html/tree/3.8.0" + "source": "https://github.com/spatie/laravel-html/tree/3.9.0" }, "funding": [ { @@ -5478,7 +5478,7 @@ "type": "custom" } ], - "time": "2024-04-24T12:52:13+00:00" + "time": "2024-04-25T08:07:39+00:00" }, { "name": "spatie/laravel-ignition", diff --git a/config/firefly.php b/config/firefly.php index cf04d45b4d..2087c4fdc4 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -117,7 +117,7 @@ return [ 'expression_engine' => false, // see cer.php for exchange rates feature flag. ], - 'version' => 'develop/2024-04-25', + 'version' => 'develop/2024-04-26', 'api_version' => '2.0.14', 'db_version' => 24, diff --git a/package-lock.json b/package-lock.json index dfb94b3129..47bdb23794 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5095,9 +5095,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.748", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.748.tgz", - "integrity": "sha512-VWqjOlPZn70UZ8FTKUOkUvBLeTQ0xpty66qV0yJcAGY2/CthI4xyW9aEozRVtuwv3Kpf5xTesmJUcPwuJmgP4A==", + "version": "1.4.749", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.749.tgz", + "integrity": "sha512-LRMMrM9ITOvue0PoBrvNIraVmuDbJV5QC9ierz/z5VilMdPOVMjOtpICNld3PuXuTZ3CHH/UPxX9gHhAPwi+0Q==", "dev": true }, "node_modules/elliptic": { diff --git a/routes/api.php b/routes/api.php index c1a2588b2f..f33b7800b3 100644 --- a/routes/api.php +++ b/routes/api.php @@ -818,7 +818,7 @@ Route::group( static function (): void { Route::get('', ['uses' => 'PreferencesController@index', 'as' => 'index']); Route::post('', ['uses' => 'PreferencesController@store', 'as' => 'store']); - //Route::get('{preferenceList}', ['uses' => 'PreferencesController@showList', 'as' => 'show-list'])->where('preferenceList', ',+'); + // Route::get('{preferenceList}', ['uses' => 'PreferencesController@showList', 'as' => 'show-list'])->where('preferenceList', ',+'); Route::get('{preference}', ['uses' => 'PreferencesController@show', 'as' => 'show']); Route::put('{preference}', ['uses' => 'PreferencesController@update', 'as' => 'update']); }