Auto commit for release 'v6.1.15' on 2024-04-23

Signed-off-by: James Cole <james@firefly-iii.org>

.ci/php-cs-fixer/composer.lock

@@ -226,16 +226,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.52.1",
+            "version": "v3.54.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc"
+                "reference": "2aecbc8640d7906c38777b3dcab6f4ca79004d08"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/6e77207f0d851862ceeb6da63e6e22c01b1587bc",
-                "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/2aecbc8640d7906c38777b3dcab6f4ca79004d08",
+                "reference": "2aecbc8640d7906c38777b3dcab6f4ca79004d08",
                 "shasum": ""
             },
             "require": {
@@ -259,6 +259,7 @@
             },
             "require-dev": {
                 "facile-it/paraunit": "^1.3 || ^2.0",
+                "infection/infection": "^0.27.11",
                 "justinrainbow/json-schema": "^5.2",
                 "keradus/cli-executor": "^2.1",
                 "mikey179/vfsstream": "^1.6.11",
@@ -306,7 +307,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.52.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.54.0"
             },
             "funding": [
                 {
@@ -314,7 +315,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-19T21:02:43+00:00"
+            "time": "2024-04-17T08:12:13+00:00"
         },
         {
             "name": "psr/container",

.ci/phpcs.sh

@@ -20,23 +20,8 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-# Install composer packages
-#composer install --no-scripts --no-ansi
-
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
-# enable test .env file.
-# cp .ci/.env.ci .env
-
-OUTPUT_FORMAT=txt
-EXTRA_PARAMS=""
-
-if [[ $GITHUB_ACTIONS = "true" ]]
-then
-    OUTPUT_FORMAT=txt
-    EXTRA_PARAMS=""
-fi
-
 # clean up php code
 cd $SCRIPT_DIR/php-cs-fixer
 composer update --quiet
@@ -44,8 +29,8 @@ rm -f .php-cs-fixer.cache
 PHP_CS_FIXER_IGNORE_ENV=true
 ./vendor/bin/php-cs-fixer fix \
     --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \
-    --format=$OUTPUT_FORMAT \
-    --allow-risky=yes $EXTRA_PARAMS
+    --format=txt \
+    --allow-risky=yes
 
 EXIT_CODE=$?
 

.github/pull_request_template.md

@@ -1,13 +1,13 @@
 <!--
 Thank you for submitting new code to Firefly III, or any of the related projects. Please read the following rules carefully.
 
-- Do not submit solutions for problems that are not already reported in an issue
-- Firefly III can't be your learning experience. If you're new to all of this, please go be new somewhere else
-- Do not open PRs to "discuss" possible solutions or to "get feedback" on your code. I don't have time for that.
+- Please do not submit solutions for problems that are not already reported in an issue.
+- Unfortunately, Firefly III can't be your learning experience. If you're new to all of this, please open an issue first.
+- Please do not open PRs to "discuss" possible solutions or to "get feedback" on your code. I simply don't have time for that.
 - Pull requests for the MAIN branch will be closed.
 - DO NOT include translated strings in your PR.
 
-Perhaps open an issue first, before you open a PR?
+If it feels necessary to open an issue first, please do so, before you open a PR.
 
 See also: https://docs.firefly-iii.org/explanation/support/#contributing-code
 

.github/workflows/close-duplicates.yml

@@ -13,7 +13,7 @@ jobs:
   close_duplicates:
     runs-on: ubuntu-latest
     steps:
-      - uses: github/command@v1.1.0
+      - uses: github/command@v1.1.1
         id: command
         with:
           allowed_contexts: "issue"

.github/workflows/release.yml

@@ -51,7 +51,7 @@ jobs:
           CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
       - name: Cleanup translations
         id: cleanup-transactions
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:crowdin-warning'
           output: ''
@@ -60,7 +60,7 @@ jobs:
           GH_TOKEN: ''
       - name: Cleanup changelog
         id: cleanup-changelog
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:changelog'
           output: ''
@@ -69,7 +69,7 @@ jobs:
           GH_TOKEN: ${{ secrets.CHANGELOG_TOKEN }}
       - name: Extract changelog
         id: extract-changelog
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:extract-changelog'
           output: 'output'
@@ -78,7 +78,7 @@ jobs:
           GH_TOKEN: ""
       - name: Replace version
         id: replace-version
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:version'
           output: ''
@@ -88,7 +88,7 @@ jobs:
           FF_III_VERSION: ${{ github.event_name == 'schedule' && 'develop' || github.event.inputs.version }}
       - name: Generate JSON v1
         id: json-v1
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:json-translations v1'
           output: ''
@@ -97,7 +97,7 @@ jobs:
           GH_TOKEN: ''
       - name: Generate JSON v2
         id: json-v2
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:json-translations v2'
           output: ''
@@ -106,7 +106,7 @@ jobs:
           GH_TOKEN: ''
       - name: Code cleanup
         id: code-cleanup
-        uses: JC5/firefly-iii-dev@v38
+        uses: JC5/firefly-iii-dev@main
         with:
           action: 'ff3:code'
           output: ''
@@ -122,10 +122,14 @@ jobs:
       - name: Run CI
         run: |
           rm -rf vendor composer.lock
-          composer validate --strict
           composer update --no-dev --no-scripts --no-plugins -q
           sudo chown -R runner:docker resources/lang
           .ci/phpcs.sh
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.PASSPHRASE }}
       - name: Release
         run: |
           # do some configuration
@@ -141,7 +145,6 @@ jobs:
           tarName=FireflyIII-$version.tar.gz
 
           # update composer (again)
-          composer validate --strict
           composer update --no-dev --no-scripts --no-plugins
           composer dump-autoload
 
@@ -191,6 +194,10 @@ jobs:
           sha256sum -b $zipName > $zipName.sha256
           sha256sum -b $tarName > $tarName.sha256
 
+          # add signatures:
+          gpg --armor --detach-sign $zipName
+          gpg --armor --detach-sign $tarName
+
           # create a development (nightly) release:
           if [[ "develop" == "$version" ]]; then
             echo 'Develop release.'
@@ -198,7 +205,7 @@ jobs:
             rm output.txt
             echo "Bi-weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
             echo "" >> output.txt
-            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible." >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
             echo "" >> output.txt
             echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
             echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
@@ -221,6 +228,10 @@ jobs:
             gh release upload $releaseName $zipName.sha256
             gh release upload $releaseName $tarName.sha256
 
+            # add signatures to release
+            gh release upload $releaseName $zipName.asc
+            gh release upload $releaseName $tarName.asc
+
             # get current HEAD and add as file to the release
             HEAD=$(git rev-parse HEAD)
             echo $HEAD > HEAD.txt
@@ -234,6 +245,7 @@ jobs:
             echo '' >> output.txt
             echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
             echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)."
 
             echo "Create default release."
             git tag -a $releaseName -m "Here be changelog"
@@ -248,6 +260,10 @@ jobs:
             gh release upload $releaseName $zipName.sha256
             gh release upload $releaseName $tarName.sha256
 
+            # add signatures to release
+            gh release upload $releaseName $zipName.asc
+            gh release upload $releaseName $tarName.asc
+
             # get current HEAD and add as file to the release
             HEAD=$(git rev-parse HEAD)
             echo $HEAD > HEAD.txt

app/Api/V1/Controllers/Models/Transaction/UpdateController.php

@@ -73,7 +73,8 @@ class UpdateController extends Controller
         $data             = $request->getAll();
 
         // Fixes 8750.
-        foreach ($data['transactions'] as $index => $info) {
+        $transactions     = $data['transactions'] ?? [];
+        foreach ($transactions as $index => $info) {
             unset($data['transactions'][$index]['type']);
         }
 

app/Api/V1/Controllers/User/PreferencesController.php

@@ -84,6 +84,10 @@ class PreferencesController extends Controller
     {
         $manager     = $this->getManager();
 
+        if ('currencyPreference' === $preference->name) {
+            throw new FireflyException('Please use api/v1/currencies/default instead.');
+        }
+
         /** @var PreferenceTransformer $transformer */
         $transformer = app(PreferenceTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -103,6 +107,11 @@ class PreferencesController extends Controller
     {
         $manager     = $this->getManager();
         $data        = $request->getAll();
+
+        if ('currencyPreference' === $data['name']) {
+            throw new FireflyException('Please use api/v1/currencies/default instead.');
+        }
+
         $pref        = app('preferences')->set($data['name'], $data['data']);
 
         /** @var PreferenceTransformer $transformer */
@@ -122,6 +131,10 @@ class PreferencesController extends Controller
      */
     public function update(PreferenceUpdateRequest $request, Preference $preference): JsonResponse
     {
+        if ('currencyPreference' === $preference->name) {
+            throw new FireflyException('Please use api/v1/currencies/default instead.');
+        }
+
         $manager     = $this->getManager();
         $data        = $request->getAll();
         $pref        = app('preferences')->set($preference->name, $data['data']);

app/Api/V1/Requests/Models/Rule/StoreRequest.php

@@ -71,8 +71,9 @@ class StoreRequest extends FormRequest
         if (is_array($triggers)) {
             foreach ($triggers as $trigger) {
                 $return[] = [
-                    'type'            => $trigger['type'],
-                    'value'           => $trigger['value'],
+                    'type'            => $trigger['type'] ?? '',
+                    'value'           => $trigger['value'] ?? null,
+                    'prohibited'      => $this->convertBoolean((string)($trigger['prohibited'] ?? 'false')),
                     'active'          => $this->convertBoolean((string)($trigger['active'] ?? 'true')),
                     'stop_processing' => $this->convertBoolean((string)($trigger['stop_processing'] ?? 'false')),
                 ];

app/Api/V1/Requests/Models/Rule/UpdateRequest.php

@@ -81,10 +81,12 @@ class UpdateRequest extends FormRequest
         if (is_array($triggers)) {
             foreach ($triggers as $trigger) {
                 $active         = array_key_exists('active', $trigger) ? $trigger['active'] : true;
+                $prohibited     = array_key_exists('prohibited', $trigger) ? $trigger['prohibited'] : false;
                 $stopProcessing = array_key_exists('stop_processing', $trigger) ? $trigger['stop_processing'] : false;
                 $return[]       = [
                     'type'            => $trigger['type'],
                     'value'           => $trigger['value'],
+                    'prohibited'      => $prohibited,
                     'active'          => $active,
                     'stop_processing' => $stopProcessing,
                 ];

app/Api/V2/Controllers/Chart/BalanceController.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Chart\BalanceChartRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\TransactionCurrency;
@@ -42,6 +43,7 @@ use Illuminate\Support\Collection;
 class BalanceController extends Controller
 {
     use CleansChartData;
+    protected array                    $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * The code is practically a duplicate of ReportController::operations.

app/Api/V2/Controllers/Controller.php

@@ -122,6 +122,9 @@ class Controller extends BaseController
                     $obj = null;
                 }
             }
+            if (null !== $date && 'end' === $field) {
+                $obj->endOfDay();
+            }
             $bag->set($field, $obj);
         }
 

app/Api/V2/Controllers/Model/Account/IndexController.php

@@ -25,7 +25,6 @@ namespace FireflyIII\Api\V2\Controllers\Model\Account;
 
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Model\Account\IndexRequest;
-use FireflyIII\Api\V2\Request\Model\Transaction\InfiniteListRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
 use FireflyIII\Transformers\V2\AccountTransformer;
@@ -58,7 +57,7 @@ class IndexController extends Controller
     }
 
     /**
-     * TODO see autocomplete/accountcontroller for list.
+     * TODO see autocomplete/account controller for list.
      */
     public function index(IndexRequest $request): JsonResponse
     {
@@ -80,25 +79,4 @@ class IndexController extends Controller
             ->header('Content-Type', self::CONTENT_TYPE)
         ;
     }
-
-    public function infiniteList(InfiniteListRequest $request): JsonResponse
-    {
-        $this->repository->resetAccountOrder();
-
-        // get accounts of the specified type, and return.
-        $types       = $request->getAccountTypes();
-
-        // get from repository
-        $accounts    = $this->repository->getAccountsInOrder($types, $request->getSortInstructions('accounts'), $request->getStartRow(), $request->getEndRow());
-        $total       = $this->repository->countAccounts($types);
-        $count       = $request->getEndRow() - $request->getStartRow();
-        $paginator   = new LengthAwarePaginator($accounts, $total, $count, $this->parameters->get('page'));
-        $transformer = new AccountTransformer();
-        $transformer->setParameters($this->parameters); // give params to transformer
-
-        return response()
-            ->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))
-            ->header('Content-Type', self::CONTENT_TYPE)
-        ;
-    }
 }

app/Api/V2/Request/Chart/BalanceChartRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V2\Request\Chart;
 
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -39,6 +40,7 @@ class BalanceChartRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
     use ValidatesUserGroupTrait;
+    protected array                    $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * Get all data from the request.

app/Api/V2/Request/Model/Account/IndexRequest.php

@@ -44,14 +44,11 @@ class IndexRequest extends FormRequest
 
     public function getAccountTypes(): array
     {
-        $type = (string)$this->get('type', 'default');
+        $type = (string) $this->get('type', 'default');
 
         return $this->mapAccountTypes($type);
     }
 
-    /**
-     * Get all data from the request.
-     */
     public function getDate(): Carbon
     {
         return $this->getCarbonDate('date');
@@ -63,7 +60,9 @@ class IndexRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'date' => 'date|after:1900-01-01|before:2099-12-31',
+            'date'  => 'date|after:1900-01-01|before:2099-12-31',
+            'start' => 'date|after:1900-01-01|before:2099-12-31|before:end|required_with:end',
+            'end'   => 'date|after:1900-01-01|before:2099-12-31|after:start|required_with:start',
         ];
     }
 }

app/Console/Commands/Integrity/CreateGroupMemberships.php

@@ -80,7 +80,7 @@ class CreateGroupMemberships extends Command
         // check if membership exists
         $userGroup  = UserGroup::where('title', $user->email)->first();
         if (null === $userGroup) {
-            $userGroup = UserGroup::create(['title' => $user->email, 'default_administration' => true]);
+            $userGroup = UserGroup::create(['title' => $user->email]);
         }
 
         $userRole   = UserRole::where('title', UserRoleEnum::OWNER->value)->first();

app/Http/Controllers/Account/ShowController.php

@@ -106,7 +106,7 @@ class ShowController extends Controller
         $periods          = $this->getAccountPeriodOverview($account, $firstTransaction, $end);
 
         // if layout = v2, overrule the page title.
-        if ('v1' !== config('firefly.layout')) {
+        if ('v1' !== config('view.layout')) {
             $subTitle = (string)trans('firefly.all_journals_for_account', ['name' => $account->name]);
         }
 

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -31,6 +31,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -106,6 +107,8 @@ class ForgotPasswordController extends Controller
         }
         $host           = request()->host();
         if ($configuredHost !== $host) {
+            Log::error(sprintf('Host header is "%s", APP_URL is "%s".', $host, $configuredHost));
+
             throw new FireflyException('The Host-header does not match the host in the APP_URL environment variable. Please make sure these match. See also: https://bit.ly/FF3-host-header');
         }
     }

app/Http/Controllers/Controller.php

@@ -70,7 +70,7 @@ abstract class Controller extends BaseController
         $logoutUrl        = config('firefly.custom_logout_url');
 
         // overrule v2 layout back to v1.
-        if ('true' === request()->get('force_default_layout') && 'v2' === config('firefly.layout')) {
+        if ('true' === request()->get('force_default_layout') && 'v2' === config('view.layout')) {
             app('view')->getFinder()->setPaths([realpath(base_path('resources/views'))]); // @phpstan-ignore-line
         }
 

app/Http/Middleware/SecureHeaders.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Middleware;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Vite;
+use Barryvdh\Debugbar\Facades\Debugbar;
 
 /**
  * Class SecureHeaders
@@ -43,6 +44,9 @@ class SecureHeaders
         // generate and share nonce.
         $nonce              = base64_encode(random_bytes(16));
         Vite::useCspNonce($nonce);
+        if (class_exists('Barryvdh\Debugbar\Facades\Debugbar')) {
+            Debugbar::getJavascriptRenderer()->setCspNonce($nonce);
+        }
         app('view')->share('JS_NONCE', $nonce);
 
         $response           = $next($request);
@@ -55,14 +59,29 @@ class SecureHeaders
             "base-uri 'self'",
             "font-src 'self' data:",
             sprintf("connect-src 'self' %s", $trackingScriptSrc),
-            sprintf("img-src 'self' 'nonce-%1s'", $nonce),
+            sprintf("img-src 'self' data: 'nonce-%1s' ", $nonce),
             "manifest-src 'self'",
         ];
 
+        // overrule in development mode
+        if (true === env('IS_LOCAL_DEV')) {
+            $csp = [
+                "default-src 'none'",
+                "object-src 'none'",
+                sprintf("script-src 'unsafe-eval' 'strict-dynamic' 'nonce-%1s' https://firefly.sd.internal/_debugbar/assets", $nonce),
+                "style-src 'unsafe-inline' 'self' https://10.0.0.15:5173/",
+                "base-uri 'self'",
+                "font-src 'self' data: https://10.0.0.15:5173/",
+                sprintf("connect-src 'self' %s https://10.0.0.15:5173/ wss://10.0.0.15:5173/", $trackingScriptSrc),
+                sprintf("img-src 'self' data: 'nonce-%1s'", $nonce),
+                "manifest-src 'self'",
+            ];
+        }
+
         $route              = $request->route();
         $customUrl          = '';
-        $authGuard          = (string)config('firefly.authentication_guard');
-        $logoutUrl          = (string)config('firefly.custom_logout_url');
+        $authGuard          = (string) config('firefly.authentication_guard');
+        $logoutUrl          = (string) config('firefly.custom_logout_url');
         if ('remote_user_guard' === $authGuard && '' !== $logoutUrl) {
             $customUrl = $logoutUrl;
         }
@@ -110,8 +129,8 @@ class SecureHeaders
      */
     private function getTrackingScriptSource(): string
     {
-        if ('' !== (string)config('firefly.tracker_site_id') && '' !== (string)config('firefly.tracker_url')) {
-            return (string)config('firefly.tracker_url');
+        if ('' !== (string) config('firefly.tracker_site_id') && '' !== (string) config('firefly.tracker_url')) {
+            return (string) config('firefly.tracker_url');
         }
 
         return '';

app/Jobs/MailError.php

@@ -109,18 +109,21 @@ class MailError extends Job implements ShouldQueue
     private function reachedLimit(): bool
     {
         Log::debug('reachedLimit()');
-        $types  = [
+        $types     = [
             '5m'  => ['limit' => 5, 'reset' => 5 * 60],
             '1h'  => ['limit' => 15, 'reset' => 60 * 60],
             '24h' => ['limit' => 15, 'reset' => 24 * 60 * 60],
         ];
-        $file   = storage_path('framework/cache/error-count.json');
-        $limits = [];
-        if (!is_writable($file)) {
-            Log::error(sprintf('MailError: cannot write to "%s", cannot rate limit errors!', $file));
+        $file      = storage_path('framework/cache/error-count.json');
+        $directory = storage_path('framework/cache');
+        $limits    = [];
+
+        if (!is_writable($directory)) {
+            Log::error(sprintf('MailError: cannot write to "%s", cannot rate limit errors!', $directory));
 
             return false;
         }
+
         if (!file_exists($file)) {
             Log::debug(sprintf('Wrote new file in "%s"', $file));
             file_put_contents($file, json_encode($limits, JSON_PRETTY_PRINT));

app/Models/UserGroup.php

@@ -98,7 +98,7 @@ class UserGroup extends Model
 {
     use ReturnsIntegerIdTrait;
 
-    protected $fillable = ['title', 'default_administration'];
+    protected $fillable = ['title'];
 
     /**
      * Route binder. Converts the key in the URL to the specified object (or throw 404).

app/Repositories/UserGroup/UserGroupRepository.php

@@ -295,4 +295,16 @@ class UserGroupRepository implements UserGroupRepositoryInterface
         $this->user->user_group_id = $userGroup->id;
         $this->user->save();
     }
+
+    #[\Override]
+    public function getMembershipsFromGroupId(int $groupId): Collection
+    {
+        return $this->user->groupMemberships()->where('user_group_id', $groupId)->get();
+    }
+
+    #[\Override]
+    public function getById(int $id): ?UserGroup
+    {
+        return UserGroup::find($id);
+    }
 }

app/Repositories/UserGroup/UserGroupRepositoryInterface.php

@@ -36,8 +36,12 @@ interface UserGroupRepositoryInterface
 {
     public function destroy(UserGroup $userGroup): void;
 
+    public function getMembershipsFromGroupId(int $groupId): Collection;
+
     public function get(): Collection;
 
+    public function getById(int $id): ?UserGroup;
+
     public function getAll(): Collection;
 
     public function setUser(null|Authenticatable|User $user): void;

app/Repositories/UserGroups/Account/AccountRepository.php

@@ -27,11 +27,13 @@ namespace FireflyIII\Repositories\UserGroups\Account;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Services\Internal\Update\AccountUpdateService;
 use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 
 /**
  * Class AccountRepository
@@ -121,7 +123,7 @@ class AccountRepository implements AccountRepositoryInterface
         if (!in_array($type, $list, true)) {
             return null;
         }
-        $currencyId = (int)$this->getMetaValue($account, 'currency_id');
+        $currencyId = (int) $this->getMetaValue($account, 'currency_id');
         if ($currencyId > 0) {
             return TransactionCurrency::find($currencyId);
         }
@@ -143,7 +145,7 @@ class AccountRepository implements AccountRepositoryInterface
             return null;
         }
         if (1 === $result->count()) {
-            return (string)$result->first()->data;
+            return (string) $result->first()->data;
         }
 
         return null;
@@ -228,7 +230,7 @@ class AccountRepository implements AccountRepositoryInterface
 
                     continue;
                 }
-                if ($index !== (int)$account->order) {
+                if ($index !== (int) $account->order) {
                     app('log')->debug(sprintf('Account #%d ("%s"): order should %d be but is %d.', $account->id, $account->name, $index, $account->order));
                     $account->order = $index;
                     $account->save();
@@ -305,4 +307,34 @@ class AccountRepository implements AccountRepositoryInterface
 
         return $service->update($account, $data);
     }
+
+    #[\Override]
+    public function getMetaValues(Collection $accounts, array $fields): Collection
+    {
+        $query = AccountMeta::whereIn('account_id', $accounts->pluck('id')->toArray());
+        if (count($fields) > 0) {
+            $query->whereIn('name', $fields);
+        }
+
+        return $query->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data']);
+    }
+
+    #[\Override]
+    public function getAccountTypes(Collection $accounts): Collection
+    {
+        return AccountType::leftJoin('accounts', 'accounts.account_type_id', '=', 'account_types.id')
+            ->whereIn('accounts.id', $accounts->pluck('id')->toArray())
+            ->get(['accounts.id', 'account_types.type'])
+        ;
+    }
+
+    #[\Override]
+    public function getLastActivity(Collection $accounts): array
+    {
+        return Transaction::whereIn('account_id', $accounts->pluck('id')->toArray())
+            ->leftJoin('transaction_journals', 'transaction_journals.id', 'transactions.transaction_journal_id')
+            ->groupBy('transactions.account_id')
+            ->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) as date_max')])->toArray() // @phpstan-ignore-line
+        ;
+    }
 }

app/Repositories/UserGroups/Account/AccountRepositoryInterface.php

@@ -37,6 +37,12 @@ interface AccountRepositoryInterface
 {
     public function countAccounts(array $types): int;
 
+    public function getAccountTypes(Collection $accounts): Collection;
+
+    public function getLastActivity(Collection $accounts): array;
+
+    public function getMetaValues(Collection $accounts, array $fields): Collection;
+
     public function find(int $accountId): ?Account;
 
     public function findByAccountNumber(string $number, array $types): ?Account;

app/Support/Authentication/RemoteUserProvider.php

@@ -80,9 +80,10 @@ class RemoteUserProvider implements UserProvider
                 $roleObject = Role::where('name', 'owner')->first();
                 $user->roles()->attach($roleObject);
             }
-            // make sure the user gets an administration as well.
-            CreateGroupMemberships::createGroupMembership($user);
         }
+        // make sure the user gets an administration as well.
+        CreateGroupMemberships::createGroupMembership($user);
+
         app('log')->debug(sprintf('Going to return user #%d (%s)', $user->id, $user->email));
 
         return $user;

app/Support/Http/Api/ValidatesUserGroupTrait.php

@@ -24,12 +24,13 @@ declare(strict_types=1);
 namespace FireflyIII\Support\Http\Api;
 
 use FireflyIII\Enums\UserRoleEnum;
-use FireflyIII\Models\GroupMembership;
 use FireflyIII\Models\UserGroup;
+use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Trait ValidatesUserGroupTrait
@@ -42,63 +43,64 @@ trait ValidatesUserGroupTrait
      */
     protected function validateUserGroup(Request $request): UserGroup
     {
-        app('log')->debug(sprintf('validateUserGroup: %s', static::class));
+        Log::debug(sprintf('validateUserGroup: %s', static::class));
         if (!auth()->check()) {
-            app('log')->debug('validateUserGroup: user is not logged in, return NULL.');
+            Log::debug('validateUserGroup: user is not logged in, return NULL.');
 
             throw new AuthenticationException();
         }
 
         /** @var User $user */
-        $user       = auth()->user();
-        $groupId    = 0;
+        $user        = auth()->user();
+        $groupId     = 0;
         if (!$request->has('user_group_id')) {
             $groupId = $user->user_group_id;
-            app('log')->debug(sprintf('validateUserGroup: no user group submitted, use default group #%d.', $groupId));
+            Log::debug(sprintf('validateUserGroup: no user group submitted, use default group #%d.', $groupId));
         }
         if ($request->has('user_group_id')) {
-            $groupId = (int)$request->get('user_group_id');
-            app('log')->debug(sprintf('validateUserGroup: user group submitted, search for memberships in group #%d.', $groupId));
+            $groupId = (int) $request->get('user_group_id');
+            Log::debug(sprintf('validateUserGroup: user group submitted, search for memberships in group #%d.', $groupId));
         }
 
-        /** @var null|GroupMembership $membership */
-        $membership = $user->groupMemberships()->where('user_group_id', $groupId)->first();
+        /** @var UserGroupRepositoryInterface $repository */
+        $repository  = app(UserGroupRepositoryInterface::class);
+        $repository->setUser($user);
+        $memberships = $repository->getMembershipsFromGroupId($groupId);
 
-        if (null === $membership) {
-            app('log')->debug(sprintf('validateUserGroup: user has no access to group #%d.', $groupId));
+        if (0 === $memberships->count()) {
+            Log::debug(sprintf('validateUserGroup: user has no access to group #%d.', $groupId));
 
-            throw new AuthorizationException((string)trans('validation.no_access_group'));
+            throw new AuthorizationException((string) trans('validation.no_access_group'));
         }
 
         // need to get the group from the membership:
-        /** @var null|UserGroup $group */
-        $group      = $membership->userGroup;
+        $group       = $repository->getById($groupId);
         if (null === $group) {
-            app('log')->debug(sprintf('validateUserGroup: group #%d does not exist.', $groupId));
+            Log::debug(sprintf('validateUserGroup: group #%d does not exist.', $groupId));
 
-            throw new AuthorizationException((string)trans('validation.belongs_user_or_user_group'));
+            throw new AuthorizationException((string) trans('validation.belongs_user_or_user_group'));
         }
-        app('log')->debug(sprintf('validateUserGroup: validate access of user to group #%d ("%s").', $groupId, $group->title));
-        $roles      = property_exists($this, 'acceptedRoles') ? $this->acceptedRoles : [];
+        Log::debug(sprintf('validateUserGroup: validate access of user to group #%d ("%s").', $groupId, $group->title));
+        $roles       = property_exists($this, 'acceptedRoles') ? $this->acceptedRoles : [];
         if (0 === count($roles)) {
-            app('log')->debug('validateUserGroup: no roles defined, so no access.');
+            Log::debug('validateUserGroup: no roles defined, so no access.');
 
-            throw new AuthorizationException((string)trans('validation.no_accepted_roles_defined'));
+            throw new AuthorizationException((string) trans('validation.no_accepted_roles_defined'));
         }
-        app('log')->debug(sprintf('validateUserGroup: have %d roles to check.', count($roles)), $roles);
+        Log::debug(sprintf('validateUserGroup: have %d roles to check.', count($roles)), $roles);
 
         /** @var UserRoleEnum $role */
         foreach ($roles as $role) {
             if ($user->hasRoleInGroupOrOwner($group, $role)) {
-                app('log')->debug(sprintf('validateUserGroup: User has role "%s" in group #%d, return the group.', $role->value, $groupId));
+                Log::debug(sprintf('validateUserGroup: User has role "%s" in group #%d, return the group.', $role->value, $groupId));
 
                 return $group;
             }
-            app('log')->debug(sprintf('validateUserGroup: User does NOT have role "%s" in group #%d, continue searching.', $role->value, $groupId));
+            Log::debug(sprintf('validateUserGroup: User does NOT have role "%s" in group #%d, continue searching.', $role->value, $groupId));
         }
 
-        app('log')->debug('validateUserGroup: User does NOT have enough rights to access endpoint.');
+        Log::debug('validateUserGroup: User does NOT have enough rights to access endpoint.');
 
-        throw new AuthorizationException((string)trans('validation.belongs_user_or_user_group'));
+        throw new AuthorizationException((string) trans('validation.belongs_user_or_user_group'));
     }
 }

app/Support/Navigation.php

@@ -464,14 +464,15 @@ class Navigation
         $increment     = 'addDay';
         $format        = $this->preferredCarbonFormat($start, $end);
         $displayFormat = (string)trans('config.month_and_day_js', [], $locale);
+        $diff          = $start->diffInMonths($end, true);
         // increment by month (for year)
-        if ($start->diffInMonths($end, true) > 1) {
+        if ($diff >= 1.0001) {
             $increment     = 'addMonth';
             $displayFormat = (string)trans('config.month_js');
         }
 
         // increment by year (for multi-year)
-        if ($start->diffInMonths($end, true) > 12) {
+        if ($diff >= 12.0001) {
             $increment     = 'addYear';
             $displayFormat = (string)trans('config.year_js');
         }
@@ -494,11 +495,15 @@ class Navigation
     public function preferredCarbonFormat(Carbon $start, Carbon $end): string
     {
         $format = 'Y-m-d';
-        if ((int)$start->diffInMonths($end, true) > 1) {
+        $diff   = $start->diffInMonths($end, true);
+        Log::debug(sprintf('preferredCarbonFormat(%s, %s) = %f', $start->format('Y-m-d'), $end->format('Y-m-d'), $diff));
+        if ($diff >= 1.001) {
+            Log::debug(sprintf('Return Y-m because %s', $diff));
             $format = 'Y-m';
         }
 
-        if ((int)$start->diffInMonths($end, true) > 12) {
+        if ($diff >= 12.001) {
+            Log::debug(sprintf('Return Y because %s', $diff));
             $format = 'Y';
         }
 

app/Support/Preferences.php

@@ -44,6 +44,7 @@ class Preferences
         }
 
         return Preference::where('user_id', $user->id)
+            ->where('name', '!=', 'currencyPreference')
             ->where(function (Builder $q) use ($user): void {
                 $q->whereNull('user_group_id');
                 $q->orWhere('user_group_id', $user->user_group_id);

app/Support/Search/OperatorQuerySearch.php

@@ -159,6 +159,10 @@ class OperatorQuerySearch implements SearchInterface
         foreach ($query1->getNodes() as $searchNode) {
             $this->handleSearchNode($searchNode);
         }
+
+        // add missing information
+        $this->collector->withBillInformation();
+
         $this->collector->setSearchWords($this->words);
         $this->collector->excludeSearchWords($this->prohibitedWords);
     }

app/Support/Twig/Translation.php

@@ -49,6 +49,7 @@ class Translation extends AbstractExtension
     {
         return [
             $this->journalLinkTranslation(),
+            $this->laravelTranslation(),
         ];
     }
 
@@ -68,4 +69,19 @@ class Translation extends AbstractExtension
             ['is_safe' => ['html']]
         );
     }
+
+    public function laravelTranslation(): TwigFunction
+    {
+        return new TwigFunction(
+            '__',
+            static function (string $key) {
+                $translation = trans($key);
+                if ($key === $translation) {
+                    return $key;
+                }
+
+                return $translation;
+            }
+        );
+    }
 }

app/Transformers/RuleTransformer.php

@@ -34,8 +34,7 @@ use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
  */
 class RuleTransformer extends AbstractTransformer
 {
-    /** @var RuleRepositoryInterface */
-    private $ruleRepository;
+    private RuleRepositoryInterface $ruleRepository;
 
     /**
      * CurrencyTransformer constructor.
@@ -109,8 +108,16 @@ class RuleTransformer extends AbstractTransformer
             if ('user_action' === $ruleTrigger->trigger_type) {
                 continue;
             }
+            $triggerType  = (string) $ruleTrigger->trigger_type;
             $triggerValue = (string)$ruleTrigger->trigger_value;
-            $needsContext = config(sprintf('search.operators.%s.needs_context', $ruleTrigger->trigger_type), true);
+            $prohibited   = false;
+
+            if (str_starts_with($triggerType, '-')) {
+                $prohibited  = true;
+                $triggerType = substr($triggerType, 1);
+            }
+
+            $needsContext = config(sprintf('search.operators.%s.needs_context', $triggerType), true);
             if (false === $needsContext) {
                 $triggerValue = 'true';
             }
@@ -119,8 +126,9 @@ class RuleTransformer extends AbstractTransformer
                 'id'              => (string)$ruleTrigger->id,
                 'created_at'      => $ruleTrigger->created_at->toAtomString(),
                 'updated_at'      => $ruleTrigger->updated_at->toAtomString(),
-                'type'            => $ruleTrigger->trigger_type,
+                'type'            => $triggerType,
                 'value'           => $triggerValue,
+                'prohibited'      => $prohibited,
                 'order'           => $ruleTrigger->order,
                 'active'          => $ruleTrigger->active,
                 'stop_processing' => $ruleTrigger->stop_processing,

app/Transformers/V2/AccountTransformer.php

@@ -27,13 +27,12 @@ namespace FireflyIII\Transformers\V2;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\AccountType;
-use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class AccountTransformer
@@ -42,118 +41,45 @@ class AccountTransformer extends AbstractTransformer
 {
     private array               $accountMeta;
     private array               $accountTypes;
-    private array               $balances;
+    private array               $balanceDifferences;
     private array               $convertedBalances;
     private array               $currencies;
     private TransactionCurrency $default;
     private array               $lastActivity;
 
     /**
-     * @throws FireflyException
+     * This method collects meta-data for one or all accounts in the transformer's collection.
      */
     public function collectMetaData(Collection $objects): Collection
     {
-        // TODO separate methods
-        $this->currencies        = [];
-        $this->accountMeta       = [];
-        $this->accountTypes      = [];
-        $this->lastActivity      = [];
-        $this->balances          = app('steam')->balancesByAccounts($objects, $this->getDate());
-        $this->convertedBalances = app('steam')->balancesByAccountsConverted($objects, $this->getDate());
+        $this->currencies         = [];
+        $this->accountMeta        = [];
+        $this->accountTypes       = [];
+        $this->lastActivity       = [];
+        $this->convertedBalances  = [];
+        $this->balanceDifferences = [];
 
-        /** @var CurrencyRepositoryInterface $repository */
-        $repository              = app(CurrencyRepositoryInterface::class);
-        $this->default           = app('amount')->getDefaultCurrency();
+        // get balances of all accounts
+        $this->getMetaBalances($objects);
 
-        // get currencies:
-        $accountIds              = $objects->pluck('id')->toArray();
-        // TODO move query to repository
-        $meta                    = AccountMeta::whereIn('account_id', $accountIds)
-            ->whereIn('name', ['currency_id', 'account_role', 'account_number'])
-            ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data'])
-        ;
-        $currencyIds             = $meta->where('name', 'currency_id')->pluck('data')->toArray();
+        // get default currency:
+        $this->getDefaultCurrency();
+
+        // collect currency and other meta-data:
+        $this->collectAccountMetaData($objects);
 
-        $currencies              = $repository->getByIds($currencyIds);
-        foreach ($currencies as $currency) {
-            $id                    = $currency->id;
-            $this->currencies[$id] = $currency;
-        }
-        foreach ($meta as $entry) {
-            $id                                   = $entry->account_id;
-            $this->accountMeta[$id][$entry->name] = $entry->data;
-        }
         // get account types:
-        // select accounts.id, account_types.type from account_types left join accounts on accounts.account_type_id = account_types.id;
-        // TODO move query to repository
-        $accountTypes            = AccountType::leftJoin('accounts', 'accounts.account_type_id', '=', 'account_types.id')
-            ->whereIn('accounts.id', $accountIds)
-            ->get(['accounts.id', 'account_types.type'])
-        ;
+        $this->collectAccountTypes($objects);
 
-        /** @var AccountType $row */
-        foreach ($accountTypes as $row) {
-            $this->accountTypes[$row->id] = (string)config(sprintf('firefly.shortNamesByFullName.%s', $row->type));
+        // get last activity:
+        $this->getLastActivity($objects);
+
+        // TODO add balance difference
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $this->getBalanceDifference($objects, $this->parameters->get('start'), $this->parameters->get('end'));
         }
 
-        // get last activity
-        // TODO move query to repository
-        $array                   = Transaction::whereIn('account_id', $accountIds)
-            ->leftJoin('transaction_journals', 'transaction_journals.id', 'transactions.transaction_journal_id')
-            ->groupBy('transactions.account_id')
-            ->get(['transactions.account_id', DB::raw('MAX(transaction_journals.date) as date_max')])->toArray() // @phpstan-ignore-line
-        ;
-        foreach ($array as $row) {
-            $this->lastActivity[(int)$row['account_id']] = Carbon::parse($row['date_max'], config('app.timezone'));
-        }
-
-        // TODO needs separate method.
-        /** @var null|array $sort */
-        $sort                    = $this->parameters->get('sort');
-        if (null !== $sort && count($sort) > 0) {
-            foreach ($sort as $column => $direction) {
-                // account_number + iban
-                if ('iban' === $column) {
-                    $meta    = $this->accountMeta;
-                    $objects = $objects->sort(function (Account $left, Account $right) use ($meta, $direction) {
-                        $leftIban  = trim(sprintf('%s%s', $left->iban, $meta[$left->id]['account_number'] ?? ''));
-                        $rightIban = trim(sprintf('%s%s', $right->iban, $meta[$right->id]['account_number'] ?? ''));
-                        if ('asc' === $direction) {
-                            return strcasecmp($leftIban, $rightIban);
-                        }
-
-                        return strcasecmp($rightIban, $leftIban);
-                    });
-                }
-                if ('balance' === $column) {
-                    $balances = $this->convertedBalances;
-                    $objects  = $objects->sort(function (Account $left, Account $right) use ($balances, $direction) {
-                        $leftBalance  = (float)($balances[$left->id]['native_balance'] ?? 0);
-                        $rightBalance = (float)($balances[$right->id]['native_balance'] ?? 0);
-                        if ('asc' === $direction) {
-                            return $leftBalance <=> $rightBalance;
-                        }
-
-                        return $rightBalance <=> $leftBalance;
-                    });
-                }
-                if ('last_activity' === $column) {
-                    $dates   = $this->lastActivity;
-                    $objects = $objects->sort(function (Account $left, Account $right) use ($dates, $direction) {
-                        $leftDate  = $dates[$left->id] ?? Carbon::create(1900, 1, 1, 0, 0, 0);
-                        $rightDate = $dates[$right->id] ?? Carbon::create(1900, 1, 1, 0, 0, 0);
-                        if ('asc' === $direction) {
-                            return $leftDate->gt($rightDate) ? 1 : -1;
-                        }
-
-                        return $rightDate->gt($leftDate) ? 1 : -1;
-                    });
-                }
-            }
-        }
-
-        // $objects = $objects->sortByDesc('name');
-        return $objects;
+        return $this->sortAccounts($objects);
     }
 
     private function getDate(): Carbon
@@ -171,44 +97,56 @@ class AccountTransformer extends AbstractTransformer
      */
     public function transform(Account $account): array
     {
-        $id            = $account->id;
+        $id                = $account->id;
 
         // various meta
-        $accountRole   = $this->accountMeta[$id]['account_role'] ?? null;
-        $accountType   = $this->accountTypes[$id];
-        $order         = $account->order;
+        $accountRole       = $this->accountMeta[$id]['account_role'] ?? null;
+        $accountType       = $this->accountTypes[$id];
+        $order             = $account->order;
 
         // no currency? use default
-        $currency      = $this->default;
-        if (array_key_exists($id, $this->accountMeta) && 0 !== (int)($this->accountMeta[$id]['currency_id'] ?? 0)) {
-            $currency = $this->currencies[(int)$this->accountMeta[$id]['currency_id']];
+        $currency          = $this->default;
+        if (array_key_exists($id, $this->accountMeta) && 0 !== (int) ($this->accountMeta[$id]['currency_id'] ?? 0)) {
+            $currency = $this->currencies[(int) $this->accountMeta[$id]['currency_id']];
         }
         // amounts and calculation.
-        $balance       = $this->balances[$id] ?? null;
-        $nativeBalance = $this->convertedBalances[$id]['native_balance'] ?? null;
+        $balance           = $this->balances[$id]['balance'] ?? null;
+        $nativeBalance     = $this->convertedBalances[$id]['native_balance'] ?? null;
 
         // no order for some accounts:
         if (!in_array(strtolower($accountType), ['liability', 'liabilities', 'asset'], true)) {
             $order = null;
         }
 
+        // balance difference
+        $diffStart         = null;
+        $diffEnd           = null;
+        $balanceDiff       = null;
+        $nativeBalanceDiff = null;
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $diffStart         = $this->parameters->get('start')->toAtomString();
+            $diffEnd           = $this->parameters->get('end')->toAtomString();
+            $balanceDiff       = $this->balanceDifferences[$id]['balance'] ?? null;
+            $nativeBalanceDiff = $this->balanceDifferences[$id]['native_balance'] ?? null;
+        }
+
         return [
-            'id'                             => (string)$account->id,
+            'id'                             => (string) $account->id,
             'created_at'                     => $account->created_at->toAtomString(),
             'updated_at'                     => $account->updated_at->toAtomString(),
             'active'                         => $account->active,
             'order'                          => $order,
             'name'                           => $account->name,
-            'iban'                           => '' === (string)$account->iban ? null : $account->iban,
+            'iban'                           => '' === (string) $account->iban ? null : $account->iban,
             'account_number'                 => $this->accountMeta[$id]['account_number'] ?? null,
             'type'                           => strtolower($accountType),
             'account_role'                   => $accountRole,
-            'currency_id'                    => (string)$currency->id,
+            'currency_id'                    => (string) $currency->id,
             'currency_code'                  => $currency->code,
             'currency_symbol'                => $currency->symbol,
             'currency_decimal_places'        => $currency->decimal_places,
 
-            'native_currency_id'             => (string)$this->default->id,
+            'native_currency_id'             => (string) $this->default->id,
             'native_currency_code'           => $this->default->code,
             'native_currency_symbol'         => $this->default->symbol,
             'native_currency_decimal_places' => $this->default->decimal_places,
@@ -218,6 +156,12 @@ class AccountTransformer extends AbstractTransformer
             'native_current_balance'         => $nativeBalance,
             'current_balance_date'           => $this->getDate()->endOfDay()->toAtomString(),
 
+            // balance difference
+            'balance_difference'             => $balanceDiff,
+            'native_balance_difference'      => $nativeBalanceDiff,
+            'balance_difference_start'       => $diffStart,
+            'balance_difference_end'         => $diffEnd,
+
             // more meta
             'last_activity'                  => array_key_exists($id, $this->lastActivity) ? $this->lastActivity[$id]->toAtomString() : null,
 
@@ -246,4 +190,179 @@ class AccountTransformer extends AbstractTransformer
             ],
         ];
     }
+
+    private function getMetaBalances(Collection $accounts): void
+    {
+        try {
+            $this->convertedBalances = app('steam')->balancesByAccountsConverted($accounts, $this->getDate());
+        } catch (FireflyException $e) {
+            Log::error($e->getMessage());
+        }
+    }
+
+    private function getDefaultCurrency(): void
+    {
+        $this->default = app('amount')->getDefaultCurrency();
+    }
+
+    private function collectAccountMetaData(Collection $accounts): void
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository        = app(CurrencyRepositoryInterface::class);
+
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        $metaFields        = $accountRepository->getMetaValues($accounts, ['currency_id', 'account_role', 'account_number']);
+        $currencyIds       = $metaFields->where('name', 'currency_id')->pluck('data')->toArray();
+
+        $currencies        = $repository->getByIds($currencyIds);
+        foreach ($currencies as $currency) {
+            $id                    = $currency->id;
+            $this->currencies[$id] = $currency;
+        }
+        foreach ($metaFields as $entry) {
+            $id                                   = $entry->account_id;
+            $this->accountMeta[$id][$entry->name] = $entry->data;
+        }
+    }
+
+    private function collectAccountTypes(Collection $accounts): void
+    {
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        $accountTypes      = $accountRepository->getAccountTypes($accounts);
+
+        /** @var AccountType $row */
+        foreach ($accountTypes as $row) {
+            $this->accountTypes[$row->id] = (string) config(sprintf('firefly.shortNamesByFullName.%s', $row->type));
+        }
+    }
+
+    private function getLastActivity(Collection $accounts): void
+    {
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        $lastActivity      = $accountRepository->getLastActivity($accounts);
+        foreach ($lastActivity as $row) {
+            $this->lastActivity[(int) $row['account_id']] = Carbon::parse($row['date_max'], config('app.timezone'));
+        }
+    }
+
+    private function sortAccounts(Collection $accounts): Collection
+    {
+        /** @var null|array $sort */
+        $sort = $this->parameters->get('sort');
+
+        if (null === $sort || 0 === count($sort)) {
+            return $accounts;
+        }
+
+        /**
+         * @var string $column
+         * @var string $direction
+         */
+        foreach ($sort as $column => $direction) {
+            // account_number + iban
+            if ('iban' === $column) {
+                $accounts = $this->sortByIban($accounts, $direction);
+            }
+            if ('balance' === $column) {
+                $accounts = $this->sortByBalance($accounts, $direction);
+            }
+            if ('last_activity' === $column) {
+                $accounts = $this->sortByLastActivity($accounts, $direction);
+            }
+            if ('balance_difference' === $column) {
+                $accounts = $this->sortByBalanceDifference($accounts, $direction);
+            }
+        }
+
+        return $accounts;
+    }
+
+    private function sortByIban(Collection $accounts, string $direction): Collection
+    {
+        $meta = $this->accountMeta;
+
+        return $accounts->sort(function (Account $left, Account $right) use ($meta, $direction) {
+            $leftIban  = trim(sprintf('%s%s', $left->iban, $meta[$left->id]['account_number'] ?? ''));
+            $rightIban = trim(sprintf('%s%s', $right->iban, $meta[$right->id]['account_number'] ?? ''));
+            if ('asc' === $direction) {
+                return strcasecmp($leftIban, $rightIban);
+            }
+
+            return strcasecmp($rightIban, $leftIban);
+        });
+    }
+
+    private function sortByBalance(Collection $accounts, string $direction): Collection
+    {
+        $balances = $this->convertedBalances;
+
+        return $accounts->sort(function (Account $left, Account $right) use ($balances, $direction) {
+            $leftBalance  = (float) ($balances[$left->id]['native_balance'] ?? 0);
+            $rightBalance = (float) ($balances[$right->id]['native_balance'] ?? 0);
+            if ('asc' === $direction) {
+                return $leftBalance <=> $rightBalance;
+            }
+
+            return $rightBalance <=> $leftBalance;
+        });
+    }
+
+    private function sortByLastActivity(Collection $accounts, string $direction): Collection
+    {
+        $dates = $this->lastActivity;
+
+        return $accounts->sort(function (Account $left, Account $right) use ($dates, $direction) {
+            $leftDate  = $dates[$left->id] ?? Carbon::create(1900, 1, 1, 0, 0, 0);
+            $rightDate = $dates[$right->id] ?? Carbon::create(1900, 1, 1, 0, 0, 0);
+            if ('asc' === $direction) {
+                return $leftDate->gt($rightDate) ? 1 : -1;
+            }
+
+            return $rightDate->gt($leftDate) ? 1 : -1;
+        });
+    }
+
+    private function getBalanceDifference(Collection $accounts, Carbon $start, Carbon $end): void
+    {
+        // collect balances, start and end for both native and converted.
+        // yes the b is usually used for boolean by idiots but here it's for balance.
+        $bStart = [];
+        $bEnd   = [];
+
+        try {
+            $bStart = app('steam')->balancesByAccountsConverted($accounts, $start);
+            $bEnd   = app('steam')->balancesByAccountsConverted($accounts, $end);
+        } catch (FireflyException $e) {
+            Log::error($e->getMessage());
+        }
+
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $id = $account->id;
+            if (array_key_exists($id, $bStart) && array_key_exists($id, $bEnd)) {
+                $this->balanceDifferences[$id] = [
+                    'balance'        => bcsub($bEnd[$id]['balance'], $bStart[$id]['balance']),
+                    'native_balance' => bcsub($bEnd[$id]['native_balance'], $bStart[$id]['native_balance']),
+                ];
+            }
+        }
+    }
+
+    private function sortByBalanceDifference(Collection $accounts, string $direction): Collection
+    {
+        $balances = $this->balanceDifferences;
+
+        return $accounts->sort(function (Account $left, Account $right) use ($balances, $direction) {
+            $leftBalance  = (float) ($balances[$left->id]['native_balance'] ?? 0);
+            $rightBalance = (float) ($balances[$right->id]['native_balance'] ?? 0);
+            if ('asc' === $direction) {
+                return $leftBalance <=> $rightBalance;
+            }
+
+            return $rightBalance <=> $leftBalance;
+        });
+    }
 }

app/User.php

@@ -381,10 +381,7 @@ class User extends Authenticatable
         $dbRolesTitles    = $dbRoles->pluck('title')->toArray();
 
         /** @var Collection $groupMemberships */
-        $groupMemberships = $this->groupMemberships()
-            ->whereIn('user_role_id', $dbRolesIds)
-            ->where('user_group_id', $userGroup->id)->get()
-        ;
+        $groupMemberships = $this->groupMemberships()->whereIn('user_role_id', $dbRolesIds)->where('user_group_id', $userGroup->id)->get();
         if (0 === $groupMemberships->count()) {
             app('log')->error(sprintf(
                 'User #%d "%s" does not have roles %s in user group #%d "%s"',

changelog.md

@@ -3,11 +3,33 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.1.15 - 2024-04-24
 
-## 6.1.14 - 2024-xx-xx
+### Fixed
+
+- [Issue 8812](https://github.com/firefly-iii/firefly-iii/issues/8812) (Login with `AUTHENTICATION_GUARD=remote_user_guard` fails due to missing UserGroup) reported by @nebulade
+
+## 6.1.14 - 2024-04-24
 
 ### Changed
-- You will have to define again which asset accounts you want to see on the dashboard. Sorry about that.
+- You may have to define again which asset accounts you want to see on the dashboard. Sorry about that.
+- Expanded some database models.
+- Limit the number of error messages Firefly III will send (so Mailgun keeps liking me).
+- [PR 8746](https://github.com/firefly-iii/firefly-iii/pull/8746) (Set date to now when cloning journal) reported by @imlonghao
+
+### Fixed
+
+- [Issue 8748](https://github.com/firefly-iii/firefly-iii/issues/8748) (Release tarballs mistakenly include the `.zip` artifact) reported by @sudoBash418
+- [Discussion 8750](https://github.com/orgs/firefly-iii/discussions/8750) (API To change  transaction fails to find destination_id) started by @soloam 
+- [Issue 8779](https://github.com/firefly-iii/firefly-iii/issues/8779) (Change Password Form not working ≥  6.1.11) reported by @jemtz-deleon
+- [Issue 8781](https://github.com/firefly-iii/firefly-iii/issues/8781) (Bill information missing in /api/v1/search/transactions responses) reported by @daanvanberkel
+- [Issue 8752](https://github.com/firefly-iii/firefly-iii/issues/8752) (Transactions reorder not work (error 404)) reported by @BoGnY
+- [Issue 8613](https://github.com/firefly-iii/firefly-iii/issues/8613) (Some minor color issues) reported by @rumpff
+- [Issue 8776](https://github.com/firefly-iii/firefly-iii/issues/8776) (report-data/category/expenses has wrong sums with specific date range) reported by @bouil
+
+### API
+
+- [Issue 8804](https://github.com/firefly-iii/firefly-iii/issues/8804) (Unable to create rules with negation via API) reported by @tailg8nj
 
 ## 6.1.13 - 2024-04-01
 

composer.json

@@ -101,6 +101,7 @@
         "psr/log": "<4",
         "ramsey/uuid": "^4.7",
         "rcrowe/twigbridge": "^0.14",
+        "twig/twig": "3.8.0",
         "spatie/laravel-html": "^3.2",
         "spatie/laravel-ignition": "^2",
         "spatie/period": "^2.4",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "90c32aa5ed2c60408abbdd7edf8100db",
+    "content-hash": "be35d14f371e7f8bc178ae6f7a615e5c",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -1670,16 +1670,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.2.0",
+            "version": "v11.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "a1750156b671f37cba702380107e2d22161c31e3"
+                "reference": "c1dc67c28811dc5be524a30b18f29ce62126716a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/a1750156b671f37cba702380107e2d22161c31e3",
-                "reference": "a1750156b671f37cba702380107e2d22161c31e3",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/c1dc67c28811dc5be524a30b18f29ce62126716a",
+                "reference": "c1dc67c28811dc5be524a30b18f29ce62126716a",
                 "shasum": ""
             },
             "require": {
@@ -1698,7 +1698,7 @@
                 "fruitcake/php-cors": "^1.3",
                 "guzzlehttp/guzzle": "^7.8",
                 "guzzlehttp/uri-template": "^1.0",
-                "laravel/prompts": "^0.1.15",
+                "laravel/prompts": "^0.1.18",
                 "laravel/serializable-closure": "^1.3",
                 "league/commonmark": "^2.2.1",
                 "league/flysystem": "^3.8.0",
@@ -1871,20 +1871,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-04-02T14:01:33+00:00"
+            "time": "2024-04-16T14:38:51+00:00"
         },
         {
             "name": "laravel/passport",
-            "version": "v12.0.2",
+            "version": "v12.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/passport.git",
-                "reference": "21099f1aff81706781578a19335d8a4c7c96422a"
+                "reference": "ff4742c71c58a4941b8738496ba96dabdf5e395b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/21099f1aff81706781578a19335d8a4c7c96422a",
-                "reference": "21099f1aff81706781578a19335d8a4c7c96422a",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/ff4742c71c58a4941b8738496ba96dabdf5e395b",
+                "reference": "ff4742c71c58a4941b8738496ba96dabdf5e395b",
                 "shasum": ""
             },
             "require": {
@@ -1947,20 +1947,20 @@
                 "issues": "https://github.com/laravel/passport/issues",
                 "source": "https://github.com/laravel/passport"
             },
-            "time": "2024-03-21T18:44:57+00:00"
+            "time": "2024-04-15T18:49:04+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.1.17",
+            "version": "v0.1.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5"
+                "reference": "0ab75ac3434d9f610c5691758a6146a3d1940c18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5",
-                "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/0ab75ac3434d9f610c5691758a6146a3d1940c18",
+                "reference": "0ab75ac3434d9f610c5691758a6146a3d1940c18",
                 "shasum": ""
             },
             "require": {
@@ -2002,22 +2002,22 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.1.17"
+                "source": "https://github.com/laravel/prompts/tree/v0.1.19"
             },
-            "time": "2024-03-13T16:05:43+00:00"
+            "time": "2024-04-16T14:20:35+00:00"
         },
         {
             "name": "laravel/sanctum",
-            "version": "v4.0.1",
+            "version": "v4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sanctum.git",
-                "reference": "d1de99bf8d31199aaf93881561622489ab91ba58"
+                "reference": "9cfc0ce80cabad5334efff73ec856339e8ec1ac1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/d1de99bf8d31199aaf93881561622489ab91ba58",
-                "reference": "d1de99bf8d31199aaf93881561622489ab91ba58",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/9cfc0ce80cabad5334efff73ec856339e8ec1ac1",
+                "reference": "9cfc0ce80cabad5334efff73ec856339e8ec1ac1",
                 "shasum": ""
             },
             "require": {
@@ -2068,7 +2068,7 @@
                 "issues": "https://github.com/laravel/sanctum/issues",
                 "source": "https://github.com/laravel/sanctum"
             },
-            "time": "2024-03-19T20:09:38+00:00"
+            "time": "2024-04-10T19:39:58+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -2324,16 +2324,16 @@
         },
         {
             "name": "lcobucci/jwt",
-            "version": "5.2.0",
+            "version": "5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lcobucci/jwt.git",
-                "reference": "0ba88aed12c04bd2ed9924f500673f32b67a6211"
+                "reference": "08071d8d2c7f4b00222cc4b1fb6aa46990a80f83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/0ba88aed12c04bd2ed9924f500673f32b67a6211",
-                "reference": "0ba88aed12c04bd2ed9924f500673f32b67a6211",
+                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/08071d8d2c7f4b00222cc4b1fb6aa46990a80f83",
+                "reference": "08071d8d2c7f4b00222cc4b1fb6aa46990a80f83",
                 "shasum": ""
             },
             "require": {
@@ -2381,7 +2381,7 @@
             ],
             "support": {
                 "issues": "https://github.com/lcobucci/jwt/issues",
-                "source": "https://github.com/lcobucci/jwt/tree/5.2.0"
+                "source": "https://github.com/lcobucci/jwt/tree/5.3.0"
             },
             "funding": [
                 {
@@ -2393,7 +2393,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-11-20T21:17:42+00:00"
+            "time": "2024-04-11T23:07:54+00:00"
         },
         {
             "name": "league/commonmark",
@@ -2728,16 +2728,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.26.0",
+            "version": "3.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "072735c56cc0da00e10716dd90d5a7f7b40b36be"
+                "reference": "4729745b1ab737908c7d055148c9a6b3e959832f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/072735c56cc0da00e10716dd90d5a7f7b40b36be",
-                "reference": "072735c56cc0da00e10716dd90d5a7f7b40b36be",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4729745b1ab737908c7d055148c9a6b3e959832f",
+                "reference": "4729745b1ab737908c7d055148c9a6b3e959832f",
                 "shasum": ""
             },
             "require": {
@@ -2802,7 +2802,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.26.0"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.27.0"
             },
             "funding": [
                 {
@@ -2814,7 +2814,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-25T11:49:53+00:00"
+            "time": "2024-04-07T19:17:50+00:00"
         },
         {
             "name": "league/flysystem-local",
@@ -3265,16 +3265,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "3.5.0",
+            "version": "3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448"
+                "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c915e2634718dbc8a4a15c61b0e62e7a44e14448",
-                "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4b18b21a5527a3d5ffdac2fd35d3ab25a9597654",
+                "reference": "4b18b21a5527a3d5ffdac2fd35d3ab25a9597654",
                 "shasum": ""
             },
             "require": {
@@ -3297,7 +3297,7 @@
                 "phpstan/phpstan": "^1.9",
                 "phpstan/phpstan-deprecation-rules": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.4",
-                "phpunit/phpunit": "^10.1",
+                "phpunit/phpunit": "^10.5.17",
                 "predis/predis": "^1.1 || ^2",
                 "ruflin/elastica": "^7",
                 "symfony/mailer": "^5.4 || ^6",
@@ -3350,7 +3350,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.5.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.6.0"
             },
             "funding": [
                 {
@@ -3362,20 +3362,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-27T15:32:31+00:00"
+            "time": "2024-04-12T21:02:21+00:00"
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.2.4",
+            "version": "3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "82c28278c1c8f7b82dcdab25692237f052ffc8d8"
+                "reference": "7219739c4e01d4680c980545821733b6ed8ee880"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/82c28278c1c8f7b82dcdab25692237f052ffc8d8",
-                "reference": "82c28278c1c8f7b82dcdab25692237f052ffc8d8",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7219739c4e01d4680c980545821733b6ed8ee880",
+                "reference": "7219739c4e01d4680c980545821733b6ed8ee880",
                 "shasum": ""
             },
             "require": {
@@ -3468,7 +3468,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-05T09:58:10+00:00"
+            "time": "2024-04-18T16:35:06+00:00"
         },
         {
             "name": "nette/schema",
@@ -5320,16 +5320,16 @@
         },
         {
             "name": "spatie/ignition",
-            "version": "1.13.1",
+            "version": "1.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/ignition.git",
-                "reference": "889bf1dfa59e161590f677728b47bf4a6893983b"
+                "reference": "952798e239d9969e4e694b124c2cc222798dbb28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/ignition/zipball/889bf1dfa59e161590f677728b47bf4a6893983b",
-                "reference": "889bf1dfa59e161590f677728b47bf4a6893983b",
+                "url": "https://api.github.com/repos/spatie/ignition/zipball/952798e239d9969e4e694b124c2cc222798dbb28",
+                "reference": "952798e239d9969e4e694b124c2cc222798dbb28",
                 "shasum": ""
             },
             "require": {
@@ -5399,7 +5399,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-29T14:03:47+00:00"
+            "time": "2024-04-16T08:49:17+00:00"
         },
         {
             "name": "spatie/laravel-html",
@@ -5481,16 +5481,16 @@
         },
         {
             "name": "spatie/laravel-ignition",
-            "version": "2.5.1",
+            "version": "2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-ignition.git",
-                "reference": "0c864b3cbd66ce67a2096c5f743e07ce8f1d6ab9"
+                "reference": "c93fcadcc4629775c839ac9a90916f07a660266f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/0c864b3cbd66ce67a2096c5f743e07ce8f1d6ab9",
-                "reference": "0c864b3cbd66ce67a2096c5f743e07ce8f1d6ab9",
+                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/c93fcadcc4629775c839ac9a90916f07a660266f",
+                "reference": "c93fcadcc4629775c839ac9a90916f07a660266f",
                 "shasum": ""
             },
             "require": {
@@ -5500,7 +5500,7 @@
                 "illuminate/support": "^10.0|^11.0",
                 "php": "^8.1",
                 "spatie/flare-client-php": "^1.3.5",
-                "spatie/ignition": "^1.13",
+                "spatie/ignition": "^1.13.2",
                 "symfony/console": "^6.2.3|^7.0",
                 "symfony/var-dumper": "^6.2.3|^7.0"
             },
@@ -5569,7 +5569,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-02T06:30:22+00:00"
+            "time": "2024-04-16T08:57:16+00:00"
         },
         {
             "name": "spatie/period",
@@ -8900,16 +8900,16 @@
     "packages-dev": [
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v3.13.3",
+            "version": "v3.13.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "241e9bddb04ab42a04a5fe8b2b9654374c864229"
+                "reference": "00201bcd1eaf9b1d3debddcdc13c219e4835fb61"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/241e9bddb04ab42a04a5fe8b2b9654374c864229",
-                "reference": "241e9bddb04ab42a04a5fe8b2b9654374c864229",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/00201bcd1eaf9b1d3debddcdc13c219e4835fb61",
+                "reference": "00201bcd1eaf9b1d3debddcdc13c219e4835fb61",
                 "shasum": ""
             },
             "require": {
@@ -8968,7 +8968,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.13.3"
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.13.4"
             },
             "funding": [
                 {
@@ -8980,7 +8980,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-04T02:42:49+00:00"
+            "time": "2024-04-10T09:15:45+00:00"
         },
         {
             "name": "barryvdh/laravel-ide-helper",
@@ -9507,16 +9507,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v2.9.2",
+            "version": "v2.9.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "a79b46b96060504b400890674b83f66aa7f5db6d"
+                "reference": "101f1a4470f87326f4d3995411d28679d8800abe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/a79b46b96060504b400890674b83f66aa7f5db6d",
-                "reference": "a79b46b96060504b400890674b83f66aa7f5db6d",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/101f1a4470f87326f4d3995411d28679d8800abe",
+                "reference": "101f1a4470f87326f4d3995411d28679d8800abe",
                 "shasum": ""
             },
             "require": {
@@ -9529,15 +9529,15 @@
                 "illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.0",
                 "illuminate/support": "^9.52.16 || ^10.28.0 || ^11.0",
                 "php": "^8.0.2",
-                "phpmyadmin/sql-parser": "^5.8.2",
-                "phpstan/phpstan": "^1.10.50"
+                "phpmyadmin/sql-parser": "^5.9.0",
+                "phpstan/phpstan": "^1.10.66"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
-                "nikic/php-parser": "^4.17.1",
-                "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.0",
-                "orchestra/testbench": "^7.33.0 || ^8.13.0 || ^9.0.0",
-                "phpunit/phpunit": "^9.6.13 || ^10.5"
+                "nikic/php-parser": "^4.19.1",
+                "orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.2",
+                "orchestra/testbench": "^7.33.0 || ^8.13.0 || ^9.0.3",
+                "phpunit/phpunit": "^9.6.13 || ^10.5.16"
             },
             "suggest": {
                 "orchestra/testbench": "Using Larastan for analysing a package needs Testbench"
@@ -9585,7 +9585,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v2.9.2"
+                "source": "https://github.com/larastan/larastan/tree/v2.9.5"
             },
             "funding": [
                 {
@@ -9605,7 +9605,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-02-27T03:16:03+00:00"
+            "time": "2024-04-16T19:13:34+00:00"
         },
         {
             "name": "maximebf/debugbar",
@@ -10285,16 +10285,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.66",
+            "version": "1.10.67",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "94779c987e4ebd620025d9e5fdd23323903950bd"
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/94779c987e4ebd620025d9e5fdd23323903950bd",
-                "reference": "94779c987e4ebd620025d9e5fdd23323903950bd",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/16ddbe776f10da6a95ebd25de7c1dbed397dc493",
+                "reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493",
                 "shasum": ""
             },
             "require": {
@@ -10337,13 +10337,9 @@
                 {
                     "url": "https://github.com/phpstan",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2024-03-28T16:17:31+00:00"
+            "time": "2024-04-16T07:22:02+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -10395,16 +10391,16 @@
         },
         {
             "name": "phpstan/phpstan-strict-rules",
-            "version": "1.5.3",
+            "version": "1.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-strict-rules.git",
-                "reference": "568210bd301f94a0d4b1e5a0808c374c1b9cf11b"
+                "reference": "2e193a07651a6f4be3baa44ddb21d822681f5918"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/568210bd301f94a0d4b1e5a0808c374c1b9cf11b",
-                "reference": "568210bd301f94a0d4b1e5a0808c374c1b9cf11b",
+                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/2e193a07651a6f4be3baa44ddb21d822681f5918",
+                "reference": "2e193a07651a6f4be3baa44ddb21d822681f5918",
                 "shasum": ""
             },
             "require": {
@@ -10438,9 +10434,9 @@
             "description": "Extra strict and opinionated rules for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
-                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.5.3"
+                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.5.5"
             },
-            "time": "2024-04-06T07:43:25+00:00"
+            "time": "2024-04-19T15:12:26+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -10765,16 +10761,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.17",
+            "version": "10.5.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c1f736a473d21957ead7e94fcc029f571895abf5"
+                "reference": "c726f0de022368f6ed103e452a765d3304a996a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c1f736a473d21957ead7e94fcc029f571895abf5",
-                "reference": "c1f736a473d21957ead7e94fcc029f571895abf5",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c726f0de022368f6ed103e452a765d3304a996a4",
+                "reference": "c726f0de022368f6ed103e452a765d3304a996a4",
                 "shasum": ""
             },
             "require": {
@@ -10846,7 +10842,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.17"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.19"
             },
             "funding": [
                 {
@@ -10862,7 +10858,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-05T04:39:01+00:00"
+            "time": "2024-04-17T14:06:18+00:00"
         },
         {
             "name": "sebastian/cli-parser",

config/debugbar.php

@@ -0,0 +1,326 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+    /*
+     |--------------------------------------------------------------------------
+     | Debugbar Settings
+     |--------------------------------------------------------------------------
+     |
+     | Debugbar is enabled by default, when debug is set to true in app.php.
+     | You can override the value by setting enable to true or false instead of null.
+     |
+     | You can provide an array of URI's that must be ignored (eg. 'api/*')
+     |
+     */
+
+    'enabled'                 => env('DEBUGBAR_ENABLED', null),
+    'except'                  => [
+        'telescope*',
+        'horizon*',
+    ],
+
+    /*
+     |--------------------------------------------------------------------------
+     | Storage settings
+     |--------------------------------------------------------------------------
+     |
+     | DebugBar stores data for session/ajax requests.
+     | You can disable this, so the debugbar stores data in headers/session,
+     | but this can cause problems with large data collectors.
+     | By default, file storage (in the storage folder) is used. Redis and PDO
+     | can also be used. For PDO, run the package migrations first.
+     |
+     | Warning: Enabling storage.open will allow everyone to access previous
+     | request, do not enable open storage in publicly available environments!
+     | Specify a callback if you want to limit based on IP or authentication.
+     | Leaving it to null will allow localhost only.
+     */
+    'storage'                 => [
+        'enabled'    => true,
+        'open'       => env('DEBUGBAR_OPEN_STORAGE'), // bool/callback.
+        'driver'     => 'file', // redis, file, pdo, socket, custom
+        'path'       => storage_path('debugbar'), // For file driver
+        'connection' => null,   // Leave null for default connection (Redis/PDO)
+        'provider'   => '', // Instance of StorageInterface for custom driver
+        'hostname'   => '127.0.0.1', // Hostname to use with the "socket" driver
+        'port'       => 2304, // Port to use with the "socket" driver
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Editor
+    |--------------------------------------------------------------------------
+    |
+    | Choose your preferred editor to use when clicking file name.
+    |
+    | Supported: "phpstorm", "vscode", "vscode-insiders", "vscode-remote",
+    |            "vscode-insiders-remote", "vscodium", "textmate", "emacs",
+    |            "sublime", "atom", "nova", "macvim", "idea", "netbeans",
+    |            "xdebug", "espresso"
+    |
+    */
+
+    'editor'                  => env('DEBUGBAR_EDITOR') ?: env('IGNITION_EDITOR', 'phpstorm'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Remote Path Mapping
+    |--------------------------------------------------------------------------
+    |
+    | If you are using a remote dev server, like Laravel Homestead, Docker, or
+    | even a remote VPS, it will be necessary to specify your path mapping.
+    |
+    | Leaving one, or both of these, empty or null will not trigger the remote
+    | URL changes and Debugbar will treat your editor links as local files.
+    |
+    | "remote_sites_path" is an absolute base path for your sites or projects
+    | in Homestead, Vagrant, Docker, or another remote development server.
+    |
+    | Example value: "/home/vagrant/Code"
+    |
+    | "local_sites_path" is an absolute base path for your sites or projects
+    | on your local computer where your IDE or code editor is running on.
+    |
+    | Example values: "/Users/<name>/Code", "C:\Users\<name>\Documents\Code"
+    |
+    */
+
+    'remote_sites_path'       => env('DEBUGBAR_REMOTE_SITES_PATH'),
+    'local_sites_path'        => env('DEBUGBAR_LOCAL_SITES_PATH', env('IGNITION_LOCAL_SITES_PATH')),
+
+    /*
+     |--------------------------------------------------------------------------
+     | Vendors
+     |--------------------------------------------------------------------------
+     |
+     | Vendor files are included by default, but can be set to false.
+     | This can also be set to 'js' or 'css', to only include javascript or css vendor files.
+     | Vendor files are for css: font-awesome (including fonts) and highlight.js (css files)
+     | and for js: jquery and highlight.js
+     | So if you want syntax highlighting, set it to true.
+     | jQuery is set to not conflict with existing jQuery scripts.
+     |
+     */
+
+    'include_vendors'         => true,
+
+    /*
+     |--------------------------------------------------------------------------
+     | Capture Ajax Requests
+     |--------------------------------------------------------------------------
+     |
+     | The Debugbar can capture Ajax requests and display them. If you don't want this (ie. because of errors),
+     | you can use this option to disable sending the data through the headers.
+     |
+     | Optionally, you can also send ServerTiming headers on ajax requests for the Chrome DevTools.
+     |
+     | Note for your request to be identified as ajax requests they must either send the header
+     | X-Requested-With with the value XMLHttpRequest (most JS libraries send this), or have application/json as a Accept header.
+     |
+     | By default `ajax_handler_auto_show` is set to true allowing ajax requests to be shown automatically in the Debugbar.
+     | Changing `ajax_handler_auto_show` to false will prevent the Debugbar from reloading.
+     */
+
+    'capture_ajax'            => true,
+    'add_ajax_timing'         => false,
+    'ajax_handler_auto_show'  => true,
+    'ajax_handler_enable_tab' => true,
+
+    /*
+     |--------------------------------------------------------------------------
+     | Custom Error Handler for Deprecated warnings
+     |--------------------------------------------------------------------------
+     |
+     | When enabled, the Debugbar shows deprecated warnings for Symfony components
+     | in the Messages tab.
+     |
+     */
+    'error_handler'           => false,
+
+    /*
+     |--------------------------------------------------------------------------
+     | Clockwork integration
+     |--------------------------------------------------------------------------
+     |
+     | The Debugbar can emulate the Clockwork headers, so you can use the Chrome
+     | Extension, without the server-side code. It uses Debugbar collectors instead.
+     |
+     */
+    'clockwork'               => false,
+
+    /*
+     |--------------------------------------------------------------------------
+     | DataCollectors
+     |--------------------------------------------------------------------------
+     |
+     | Enable/disable DataCollectors
+     |
+     */
+
+    'collectors'              => [
+        'phpinfo'         => true,  // Php version
+        'messages'        => true,  // Messages
+        'time'            => true,  // Time Datalogger
+        'memory'          => true,  // Memory usage
+        'exceptions'      => true,  // Exception displayer
+        'log'             => true,  // Logs from Monolog (merged in messages if enabled)
+        'db'              => true,  // Show database (PDO) queries and bindings
+        'views'           => true,  // Views with their data
+        'route'           => true,  // Current route information
+        'auth'            => false, // Display Laravel authentication status
+        'gate'            => true,  // Display Laravel Gate checks
+        'session'         => true,  // Display session data
+        'symfony_request' => true,  // Only one can be enabled..
+        'mail'            => true,  // Catch mail messages
+        'laravel'         => false, // Laravel version and environment
+        'events'          => false, // All events fired
+        'default_request' => false, // Regular or special Symfony request logger
+        'logs'            => false, // Add the latest log messages
+        'files'           => false, // Show the included files
+        'config'          => false, // Display config settings
+        'cache'           => false, // Display cache events
+        'models'          => true,  // Display models
+        'livewire'        => true,  // Display Livewire (when available)
+        'jobs'            => false, // Display dispatched jobs
+    ],
+
+    /*
+     |--------------------------------------------------------------------------
+     | Extra options
+     |--------------------------------------------------------------------------
+     |
+     | Configure some DataCollectors
+     |
+     */
+
+    'options'                 => [
+        'time'            => [
+            'memory_usage' => false,  // Calculated by subtracting memory start and end, it may be inaccurate
+        ],
+        'messages'        => [
+            'trace' => true,   // Trace the origin of the debug message
+        ],
+        'memory'          => [
+            'reset_peak'    => false,     // run memory_reset_peak_usage before collecting
+            'with_baseline' => false,  // Set boot memory usage as memory peak baseline
+            'precision'     => 0,          // Memory rounding precision
+        ],
+        'auth'            => [
+            'show_name'   => true,   // Also show the users name/email in the debugbar
+            'show_guards' => true, // Show the guards that are used
+        ],
+        'db'              => [
+            'with_params'             => true,   // Render SQL with the parameters substituted
+            'backtrace'               => true,   // Use a backtrace to find the origin of the query in your files.
+            'backtrace_exclude_paths' => [],   // Paths to exclude from backtrace. (in addition to defaults)
+            'timeline'                => false,  // Add the queries to the timeline
+            'duration_background'     => true,   // Show shaded background on each query relative to how long it took to execute.
+            'explain'                 => [                 // Show EXPLAIN output on queries
+                'enabled' => false,
+                'types'   => ['SELECT'],     // Deprecated setting, is always only SELECT
+            ],
+            'hints'                   => false,    // Show hints for common mistakes
+            'show_copy'               => false,    // Show copy button next to the query,
+            'slow_threshold'          => false,   // Only track queries that last longer than this time in ms
+            'memory_usage'            => false,   // Show queries memory usage
+            'soft_limit'              => 100,      // After the soft limit, no parameters/backtrace are captured
+            'hard_limit'              => 500,      // After the hard limit, queries are ignored
+        ],
+        'mail'            => [
+            'timeline'  => false,  // Add mails to the timeline
+            'show_body' => true,
+        ],
+        'views'           => [
+            'timeline'      => false,    // Add the views to the timeline (Experimental)
+            'data'          => false,        // true for all data, 'keys' for only names, false for no parameters.
+            'group'         => 50,          // Group duplicate views. Pass value to auto-group, or true/false to force
+            'exclude_paths' => [    // Add the paths which you don't want to appear in the views
+                'vendor/filament',   // Exclude Filament components by default
+            ],
+        ],
+        'route'           => [
+            'label' => true,  // show complete route on bar
+        ],
+        'session'         => [
+            'hiddens' => [], // hides sensitive values using array paths
+        ],
+        'symfony_request' => [
+            'hiddens' => [], // hides sensitive values using array paths, example: request_request.password
+        ],
+        'events'          => [
+            'data' => false, // collect events data, listeners
+        ],
+        'logs'            => [
+            'file' => null,
+        ],
+        'cache'           => [
+            'values' => true, // collect cache values
+        ],
+    ],
+
+    /*
+     |--------------------------------------------------------------------------
+     | Inject Debugbar in Response
+     |--------------------------------------------------------------------------
+     |
+     | Usually, the debugbar is added just before </body>, by listening to the
+     | Response after the App is done. If you disable this, you have to add them
+     | in your template yourself. See http://phpdebugbar.com/docs/rendering.html
+     |
+     */
+
+    'inject'                  => true,
+
+    /*
+     |--------------------------------------------------------------------------
+     | DebugBar route prefix
+     |--------------------------------------------------------------------------
+     |
+     | Sometimes you want to set route prefix to be used by DebugBar to load
+     | its resources from. Usually the need comes from misconfigured web server or
+     | from trying to overcome bugs like this: http://trac.nginx.org/nginx/ticket/97
+     |
+     */
+    'route_prefix'            => '_debugbar',
+
+    /*
+     |--------------------------------------------------------------------------
+     | DebugBar route middleware
+     |--------------------------------------------------------------------------
+     |
+     | Additional middleware to run on the Debugbar routes
+     */
+    'route_middleware'        => [],
+
+    /*
+     |--------------------------------------------------------------------------
+     | DebugBar route domain
+     |--------------------------------------------------------------------------
+     |
+     | By default DebugBar route served from the same domain that request served.
+     | To override default domain, specify it as a non-empty value.
+     */
+    'route_domain'            => null,
+
+    /*
+     |--------------------------------------------------------------------------
+     | DebugBar theme
+     |--------------------------------------------------------------------------
+     |
+     | Switches between light and dark theme. If set to auto it will respect system preferences
+     | Possible values: auto, light, dark
+     */
+    'theme'                   => env('DEBUGBAR_THEME', 'auto'),
+
+    /*
+     |--------------------------------------------------------------------------
+     | Backtrace stack limit
+     |--------------------------------------------------------------------------
+     |
+     | By default, the DebugBar limits the number of frames returned by the 'debug_backtrace()' function.
+     | If you need larger stacktraces, you can increase this number. Setting it to 0 will result in no limit.
+     */
+    'debug_backtrace_limit'   => 50,
+];

config/firefly.php

@@ -117,8 +117,8 @@ return [
         'expression_engine' => false,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2024-04-07',
-    'api_version'                  => '2.0.13',
+    'version'                      => '6.1.15',
+    'api_version'                  => '2.0.14',
     'db_version'                   => 24,
 
     // generic settings
@@ -206,7 +206,6 @@ return [
 
     // web configuration:
     'trusted_proxies'              => env('TRUSTED_PROXIES', ''),
-    'layout'                       => envNonEmpty('FIREFLY_III_LAYOUT', 'v1'),
 
     // map configuration
     'default_location'             => [
@@ -925,7 +924,7 @@ return [
     'sorting'                      => [
         'allowed' => [
             'transactions' => ['description', 'amount'],
-            'accounts'     => ['name', 'active', 'iban', 'balance', 'last_activity'],
+            'accounts'     => ['name', 'active', 'iban', 'balance', 'last_activity', 'balance_difference'],
         ],
     ],
 ];

config/translations.php

@@ -34,6 +34,19 @@ return [
             'form'       => [
                 'title',
             ],
+            'list'       => [
+                'drag_and_drop',
+                'active',
+                'name',
+                'type',
+                'number',
+                'liability_type',
+                'current_balance',
+                'last_activity',
+                'amount_due',
+                'balance_difference',
+                'menu',
+            ],
             'validation' => [
                 'bad_type_source',
                 'bad_type_destination',
@@ -94,6 +107,19 @@ return [
                 'account_role_savingAsset',
                 'account_role_ccAsset',
                 'account_role_cashWalletAsset',
+                //                'account_column_opt_drag_and_drop',
+                //                'account_column_opt_active',
+                //                'account_column_opt_name',
+                //                'account_column_opt_type',
+                //                'account_column_opt_liability_type',
+                //                'account_column_opt_liability_direction',
+                //                'account_column_opt_liability_interest',
+                //                'account_column_opt_number',
+                //                'account_column_opt_current_balance',
+                //                'account_column_opt_amount_due',
+                //                'account_column_opt_last_activity',
+                //                'account_column_opt_balance_difference',
+                //                'account_column_opt_menu',
             ],
         ],
         'v1' => [

public/v1/js/ff/list/groups.js

@@ -22,95 +22,10 @@ var count = 0;
 
 $(document).ready(function () {
     updateListButtons();
-    addSort();
     $('.clone-transaction').click(cloneTransaction);
     $('.clone-transaction-and-edit').click(cloneTransactionAndEdit);
 });
 
-var fixHelper = function (e, tr) {
-    "use strict";
-    var $originals = tr.children();
-    var $helper = tr.clone();
-    $helper.children().each(function (index) {
-        // Set helper cell sizes to match the original sizes
-        $(this).width($originals.eq(index).width());
-    });
-    return $helper;
-};
-
-/**
- *
- */
-function addSort() {
-    if (typeof $(".table-sortable>tbody").sortable !== "undefined") {
-        $('.table-sortable>tbody').sortable(
-            {
-                items: "tr:not(.unsortable)",
-                handle: '.object-handle',
-                stop: sortStop,
-                start: function (event, ui) {
-                    // Build a placeholder cell that spans all the cells in the row
-                    var cellCount = 0;
-                    $('td, th', ui.helper).each(function () {
-                        // For each TD or TH try and get it's colspan attribute, and add that or 1 to the total
-                        var colspan = 1;
-                        var colspanAttr = $(this).attr('colspan');
-                        if (colspanAttr > 1) {
-                            colspan = colspanAttr;
-                        }
-                        cellCount += colspan;
-                    });
-
-                    // Add the placeholder UI - note that this is the item's content, so TD rather than TR
-                    ui.placeholder.html('<td colspan="' + cellCount + '">&nbsp;</td>');
-                }
-            }
-        );
-    }
-}
-
-/**
- *
- * @param event
- * @param ui
- * @returns {boolean|undefined}
- */
-function sortStop(event, ui) {
-    "use strict";
-    var current = $(ui.item);
-    var thisDate = current.data('date');
-    var originalBG = current.css('backgroundColor');
-
-
-    if (current.prev().data('date') !== thisDate && current.next().data('date') !== thisDate) {
-        // animate something with color:
-        current.animate({backgroundColor: "#d9534f"}, 200, function () {
-            $(this).animate({backgroundColor: originalBG}, 200);
-            return undefined;
-        });
-
-        return false;
-    }
-    //return false;
-    // do update
-    var list = $('tr[data-date="' + thisDate + '"]');
-    var submit = [];
-    $.each(list, function (i, v) {
-        var row = $(v);
-        var id = row.data('id');
-        submit.push(id);
-    });
-
-    // do extra animation when done?
-    $.post('transactions/reorder', {items: submit, date: thisDate, _token: token});
-
-    current.animate({backgroundColor: "#5cb85c"}, 200, function () {
-        $(this).animate({backgroundColor: originalBG}, 200);
-        return undefined;
-    });
-    return undefined;
-}
-
 
 /**
  *

public/v1/lib/adminlte/css/skins/skin-dark.css

@@ -103,6 +103,12 @@
 .skin-firefly-iii .btn-info {
   color: #fff;
 }
+.skin-firefly-iii .btn-danger {
+  color: #fff;
+}
+.skin-firefly-iii .btn-warning {
+  color: #fff;
+}
 .skin-firefly-iii .btn-default {
   background-color: #55606a;
   color: #bec5cb;
@@ -251,6 +257,11 @@
 }
 .skin-firefly-iii .table > thead > tr > th,
 .skin-firefly-iii .table > tbody > tr > th,
+.skin-firefly-iii .table > tfoot > tr > th {
+  border-bottom: 2px #c9d1d9 solid;
+}
+.skin-firefly-iii .table > thead > tr > th,
+.skin-firefly-iii .table > tbody > tr > th,
 .skin-firefly-iii .table > tfoot > tr > th,
 .skin-firefly-iii .table > thead > tr > td,
 .skin-firefly-iii .table > tbody > tr > td,
@@ -480,6 +491,7 @@
 .skin-firefly-iii .nav-tabs-custom > .nav-tabs > li.active > a {
   border-left-color: #353c42;
   border-right-color: #353c42;
+  color: #bec5cb;
 }
 .skin-firefly-iii .nav-tabs-custom > .nav-tabs.pull-right > li:first-of-type.active > a {
   border-left-color: #353c42;
@@ -511,7 +523,7 @@
   background-color: #272c30;
 }
 .skin-firefly-iii .input-group .input-group-addon {
-  border-right: 1px solid #272c30;
+  border: 1px solid #272c30;
 }
 .skin-firefly-iii .form-control {
   border-color: #272c30;

public/v2/i18n/bg.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "\u0410\u043a\u0442\u0438\u0432\u0435\u043d \u043b\u0438 \u0435?",
+        "name": "\u0418\u043c\u0435",
+        "type": "\u0412\u0438\u0434",
+        "number": "Account number",
+        "liability_type": "\u0412\u0438\u0434 \u043d\u0430 \u0437\u0430\u0434\u044a\u043b\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/bg_BG.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "\u0410\u043a\u0442\u0438\u0432\u0435\u043d \u043b\u0438 \u0435?",
+        "name": "\u0418\u043c\u0435",
+        "type": "\u0412\u0438\u0434",
+        "number": "Account number",
+        "liability_type": "\u0412\u0438\u0434 \u043d\u0430 \u0437\u0430\u0434\u044a\u043b\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/ca.json

@@ -9,28 +9,41 @@
     "form": {
         "title": "T\u00edtol"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Est\u00e0 actiu?",
+        "name": "Nom",
+        "type": "Tipus",
+        "number": "Account number",
+        "liability_type": "Tipus de passiu",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III no pot determinar el tipus de transacci\u00f3 a partir d'aquest compte font.",
         "bad_type_destination": "Firefly III no pot determinar el tipus de transacci\u00f3 a partir d'aquest compte de dest\u00ed."
     },
     "firefly": {
         "spent": "Gastat",
-        "administration_owner": "Administration owner: {{email}}",
-        "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
-        "administration_role_mng_budgets": "Manage budgets",
-        "administration_role_mng_piggies": "Manage piggy banks",
-        "administration_role_mng_subscriptions": "Manage subscriptions",
-        "administration_role_mng_rules": "Manage rules",
-        "administration_role_mng_recurring": "Manage recurring transactions ",
-        "administration_role_mng_webhooks": "Manage webhooks",
-        "administration_role_mng_currencies": "Manage currencies",
-        "administration_role_view_reports": "View reports",
-        "administration_role_full": "Full access",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "administration_owner": "Propietari de l'administraci\u00f3: {{email}}",
+        "administration_you": "El teu rol: {{role}}",
+        "administration_role_owner": "Propietari",
+        "administration_role_ro": "Nom\u00e9s de lectura",
+        "administration_role_mng_trx": "Gestionar transaccions",
+        "administration_role_mng_meta": "Gestionar classificaci\u00f3 i meta-dades",
+        "administration_role_mng_budgets": "Gestionar pressupostos",
+        "administration_role_mng_piggies": "Administra guardioles",
+        "administration_role_mng_subscriptions": "Gestionar subscripcions",
+        "administration_role_mng_rules": "Gestionar normes",
+        "administration_role_mng_recurring": "Gestionar transaccions recurrents ",
+        "administration_role_mng_webhooks": "Gestionar Webhooks",
+        "administration_role_mng_currencies": "Gestionar divises",
+        "administration_role_view_reports": "Veure informes",
+        "administration_role_full": "Acc\u00e9s total",
+        "new_administration_created": "S'ha creat una nova administraci\u00f3 financera \"{{title}}\"",
         "left": "Queda",
         "paid": "Pagat",
         "errors_submission_v2": "Hi ha hagut un error amb el teu enviament. Per favor, comprova els seg\u00fcents errors: {{errorMessage}}",

public/v2/i18n/ca_ES.json

@@ -9,28 +9,41 @@
     "form": {
         "title": "T\u00edtol"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Est\u00e0 actiu?",
+        "name": "Nom",
+        "type": "Tipus",
+        "number": "Account number",
+        "liability_type": "Tipus de passiu",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III no pot determinar el tipus de transacci\u00f3 a partir d'aquest compte font.",
         "bad_type_destination": "Firefly III no pot determinar el tipus de transacci\u00f3 a partir d'aquest compte de dest\u00ed."
     },
     "firefly": {
         "spent": "Gastat",
-        "administration_owner": "Administration owner: {{email}}",
-        "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
-        "administration_role_mng_budgets": "Manage budgets",
-        "administration_role_mng_piggies": "Manage piggy banks",
-        "administration_role_mng_subscriptions": "Manage subscriptions",
-        "administration_role_mng_rules": "Manage rules",
-        "administration_role_mng_recurring": "Manage recurring transactions ",
-        "administration_role_mng_webhooks": "Manage webhooks",
-        "administration_role_mng_currencies": "Manage currencies",
-        "administration_role_view_reports": "View reports",
-        "administration_role_full": "Full access",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "administration_owner": "Propietari de l'administraci\u00f3: {{email}}",
+        "administration_you": "El teu rol: {{role}}",
+        "administration_role_owner": "Propietari",
+        "administration_role_ro": "Nom\u00e9s de lectura",
+        "administration_role_mng_trx": "Gestionar transaccions",
+        "administration_role_mng_meta": "Gestionar classificaci\u00f3 i meta-dades",
+        "administration_role_mng_budgets": "Gestionar pressupostos",
+        "administration_role_mng_piggies": "Administra guardioles",
+        "administration_role_mng_subscriptions": "Gestionar subscripcions",
+        "administration_role_mng_rules": "Gestionar normes",
+        "administration_role_mng_recurring": "Gestionar transaccions recurrents ",
+        "administration_role_mng_webhooks": "Gestionar Webhooks",
+        "administration_role_mng_currencies": "Gestionar divises",
+        "administration_role_view_reports": "Veure informes",
+        "administration_role_full": "Acc\u00e9s total",
+        "new_administration_created": "S'ha creat una nova administraci\u00f3 financera \"{{title}}\"",
         "left": "Queda",
         "paid": "Pagat",
         "errors_submission_v2": "Hi ha hagut un error amb el teu enviament. Per favor, comprova els seg\u00fcents errors: {{errorMessage}}",

public/v2/i18n/cs.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "N\u00e1zev"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Aktivn\u00ed?",
+        "name": "Jm\u00e9no",
+        "type": "Typ",
+        "number": "Account number",
+        "liability_type": "Typ z\u00e1vazku",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/cs_CZ.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "N\u00e1zev"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Aktivn\u00ed?",
+        "name": "Jm\u00e9no",
+        "type": "Typ",
+        "number": "Account number",
+        "liability_type": "Typ z\u00e1vazku",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/da.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Titel"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Aktiv?",
+        "name": "Navn",
+        "type": "Type",
+        "number": "Account number",
+        "liability_type": "G\u00e6ldstype",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III kan ikke bestemme transaktionstypen baseret p\u00e5 denne kildekonto.",
         "bad_type_destination": "Firefly III kan ikke bestemme transaktionstypen baseret p\u00e5 denne destinationskonto."

public/v2/i18n/da_DK.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Titel"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Aktiv?",
+        "name": "Navn",
+        "type": "Type",
+        "number": "Account number",
+        "liability_type": "G\u00e6ldstype",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III kan ikke bestemme transaktionstypen baseret p\u00e5 denne kildekonto.",
         "bad_type_destination": "Firefly III kan ikke bestemme transaktionstypen baseret p\u00e5 denne destinationskonto."

public/v2/i18n/de.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Titel"
     },
+    "list": {
+        "drag_and_drop": "Ziehen und Ablegen",
+        "active": "Aktiv?",
+        "name": "Name",
+        "type": "Typ",
+        "number": "Kontonummer",
+        "liability_type": "Verbindlichkeitsart",
+        "current_balance": "Aktueller Kontostand",
+        "last_activity": "Letzte Aktivit\u00e4t",
+        "amount_due": "F\u00e4lliger Betrag",
+        "balance_difference": "Saldendifferenz",
+        "menu": "Men\u00fc"
+    },
     "validation": {
         "bad_type_source": "Firefly III kann die Buchungsart anhand dieses Quellkontos nicht ermitteln.",
         "bad_type_destination": "Firefly III kann die Buchungsart anhand dieses Zielkontos nicht ermitteln."
@@ -17,11 +30,11 @@
         "spent": "Ausgegeben",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Ihre Funktion: {{role}}",
-        "administration_role_owner": "Owner",
+        "administration_role_owner": "Inhaber",
         "administration_role_ro": "Schreibgesch\u00fctzt",
         "administration_role_mng_trx": "Buchungen verwalten",
         "administration_role_mng_meta": "Klassifizierungs- und Metadaten verwalten",
-        "administration_role_mng_budgets": "Manage budgets",
+        "administration_role_mng_budgets": "Budgets verwalten",
         "administration_role_mng_piggies": "Sparschweine verwalten",
         "administration_role_mng_subscriptions": "Abonnements verwalten",
         "administration_role_mng_rules": "Regeln verwalten",

public/v2/i18n/de_DE.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Titel"
     },
+    "list": {
+        "drag_and_drop": "Ziehen und Ablegen",
+        "active": "Aktiv?",
+        "name": "Name",
+        "type": "Typ",
+        "number": "Kontonummer",
+        "liability_type": "Verbindlichkeitsart",
+        "current_balance": "Aktueller Kontostand",
+        "last_activity": "Letzte Aktivit\u00e4t",
+        "amount_due": "F\u00e4lliger Betrag",
+        "balance_difference": "Saldendifferenz",
+        "menu": "Men\u00fc"
+    },
     "validation": {
         "bad_type_source": "Firefly III kann die Buchungsart anhand dieses Quellkontos nicht ermitteln.",
         "bad_type_destination": "Firefly III kann die Buchungsart anhand dieses Zielkontos nicht ermitteln."
@@ -17,11 +30,11 @@
         "spent": "Ausgegeben",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Ihre Funktion: {{role}}",
-        "administration_role_owner": "Owner",
+        "administration_role_owner": "Inhaber",
         "administration_role_ro": "Schreibgesch\u00fctzt",
         "administration_role_mng_trx": "Buchungen verwalten",
         "administration_role_mng_meta": "Klassifizierungs- und Metadaten verwalten",
-        "administration_role_mng_budgets": "Manage budgets",
+        "administration_role_mng_budgets": "Budgets verwalten",
         "administration_role_mng_piggies": "Sparschweine verwalten",
         "administration_role_mng_subscriptions": "Abonnements verwalten",
         "administration_role_mng_rules": "Regeln verwalten",

public/v2/i18n/el.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "\u03a4\u03af\u03c4\u03bb\u03bf\u03c2"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "\u0395\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03cc;",
+        "name": "\u038c\u03bd\u03bf\u03bc\u03b1",
+        "type": "\u03a4\u03cd\u03c0\u03bf\u03c2",
+        "number": "Account number",
+        "liability_type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03c5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7\u03c2",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "\u03a4\u03bf Firefly III \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03ba\u03b1\u03b8\u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c4\u03bf\u03bd \u03c4\u03cd\u03c0\u03bf \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u03bc\u03b5 \u03b2\u03ac\u03c3\u03b7 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7\u03c2.",
         "bad_type_destination": "\u03a4\u03bf Firefly III \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03ba\u03b1\u03b8\u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c4\u03bf\u03bd \u03c4\u03cd\u03c0\u03bf \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u03bc\u03b5 \u03b2\u03ac\u03c3\u03b7 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03bf\u03cd."

public/v2/i18n/el_GR.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "\u03a4\u03af\u03c4\u03bb\u03bf\u03c2"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "\u0395\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03cc;",
+        "name": "\u038c\u03bd\u03bf\u03bc\u03b1",
+        "type": "\u03a4\u03cd\u03c0\u03bf\u03c2",
+        "number": "Account number",
+        "liability_type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03c5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7\u03c2",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "\u03a4\u03bf Firefly III \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03ba\u03b1\u03b8\u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c4\u03bf\u03bd \u03c4\u03cd\u03c0\u03bf \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u03bc\u03b5 \u03b2\u03ac\u03c3\u03b7 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7\u03c2.",
         "bad_type_destination": "\u03a4\u03bf Firefly III \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03ba\u03b1\u03b8\u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c4\u03bf\u03bd \u03c4\u03cd\u03c0\u03bf \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u03bc\u03b5 \u03b2\u03ac\u03c3\u03b7 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03bf\u03cd."

public/v2/i18n/en-gb.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Title"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Is active?",
+        "name": "Name",
+        "type": "Type",
+        "number": "Account number",
+        "liability_type": "Type of liability",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/en.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Title"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Is active?",
+        "name": "Name",
+        "type": "Type",
+        "number": "Account number",
+        "liability_type": "Type of liability",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/en_GB.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Title"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Is active?",
+        "name": "Name",
+        "type": "Type",
+        "number": "Account number",
+        "liability_type": "Type of liability",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/en_US.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Title"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Is active?",
+        "name": "Name",
+        "type": "Type",
+        "number": "Account number",
+        "liability_type": "Type of liability",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/es.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "T\u00edtulo"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "\u00bfEst\u00e1 Activo?",
+        "name": "Nombre",
+        "type": "Tipo",
+        "number": "Account number",
+        "liability_type": "Tipo de pasivo",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III no puede determinar el tipo de transacci\u00f3n basado en esta cuenta de origen.",
         "bad_type_destination": "Firefly III no puede determinar el tipo de transacci\u00f3n basado en esta cuenta de destino."

public/v2/i18n/es_ES.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "T\u00edtulo"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "\u00bfEst\u00e1 Activo?",
+        "name": "Nombre",
+        "type": "Tipo",
+        "number": "Account number",
+        "liability_type": "Tipo de pasivo",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III no puede determinar el tipo de transacci\u00f3n basado en esta cuenta de origen.",
         "bad_type_destination": "Firefly III no puede determinar el tipo de transacci\u00f3n basado en esta cuenta de destino."

public/v2/i18n/fi.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Otsikko"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Aktiivinen?",
+        "name": "Nimi",
+        "type": "Tyyppi",
+        "number": "Account number",
+        "liability_type": "Lainatyyppi",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/fi_FI.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Otsikko"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Aktiivinen?",
+        "name": "Nimi",
+        "type": "Tyyppi",
+        "number": "Account number",
+        "liability_type": "Lainatyyppi",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/fr.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Titre"
     },
+    "list": {
+        "drag_and_drop": "Glisser-d\u00e9poser",
+        "active": "Actif ?",
+        "name": "Nom",
+        "type": "Type",
+        "number": "N\u00b0 de compte",
+        "liability_type": "Type de passif",
+        "current_balance": "Solde actuel",
+        "last_activity": "Activit\u00e9 r\u00e9cente",
+        "amount_due": "Montant d\u00fb",
+        "balance_difference": "Diff\u00e9rence de solde",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III ne peut pas d\u00e9terminer le type de transaction bas\u00e9 sur ce compte source.",
         "bad_type_destination": "Firefly III ne peut pas d\u00e9terminer le type de transaction bas\u00e9 sur ce compte de destination."

public/v2/i18n/fr_FR.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Titre"
     },
+    "list": {
+        "drag_and_drop": "Glisser-d\u00e9poser",
+        "active": "Actif ?",
+        "name": "Nom",
+        "type": "Type",
+        "number": "N\u00b0 de compte",
+        "liability_type": "Type de passif",
+        "current_balance": "Solde actuel",
+        "last_activity": "Activit\u00e9 r\u00e9cente",
+        "amount_due": "Montant d\u00fb",
+        "balance_difference": "Diff\u00e9rence de solde",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III ne peut pas d\u00e9terminer le type de transaction bas\u00e9 sur ce compte source.",
         "bad_type_destination": "Firefly III ne peut pas d\u00e9terminer le type de transaction bas\u00e9 sur ce compte de destination."

public/v2/i18n/hu.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "C\u00edm"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Akt\u00edv?",
+        "name": "N\u00e9v",
+        "type": "T\u00edpus",
+        "number": "Account number",
+        "liability_type": "A k\u00f6telezetts\u00e9g t\u00edpusa",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "A Firefly III nem tudja eld\u00f6nteni a tranzakci\u00f3 t\u00edpus\u00e1t a forr\u00e1ssz\u00e1mla alapj\u00e1n.",
         "bad_type_destination": "A Firefly III nem tudja eld\u00f6nteni a tranzakci\u00f3 t\u00edpus\u00e1t a c\u00e9lsz\u00e1mla alapj\u00e1n."

public/v2/i18n/hu_HU.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "C\u00edm"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Akt\u00edv?",
+        "name": "N\u00e9v",
+        "type": "T\u00edpus",
+        "number": "Account number",
+        "liability_type": "A k\u00f6telezetts\u00e9g t\u00edpusa",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "A Firefly III nem tudja eld\u00f6nteni a tranzakci\u00f3 t\u00edpus\u00e1t a forr\u00e1ssz\u00e1mla alapj\u00e1n.",
         "bad_type_destination": "A Firefly III nem tudja eld\u00f6nteni a tranzakci\u00f3 t\u00edpus\u00e1t a c\u00e9lsz\u00e1mla alapj\u00e1n."

public/v2/i18n/id.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Judul"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Aktif?",
+        "name": "Nama",
+        "type": "Jenis",
+        "number": "Account number",
+        "liability_type": "Jenis kewajiban",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/id_ID.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Judul"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Aktif?",
+        "name": "Nama",
+        "type": "Jenis",
+        "number": "Account number",
+        "liability_type": "Jenis kewajiban",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/it.json

@@ -4,11 +4,24 @@
         "date_time_fns": "do MMMM yyyy @ HH:mm:ss",
         "month_and_day_fns": "d MMMM y",
         "does_not_exist": "(config.does_not_exist)",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "date_time_fns_short": "do MMMM yyyy @ HH:mm"
     },
     "form": {
         "title": "Titolo"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Attivo",
+        "name": "Nome",
+        "type": "Tipo",
+        "number": "Account number",
+        "liability_type": "Tipo di passivit\u00e0",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III non pu\u00f2 determinare il tipo di transazione in base a questo account sorgente.",
         "bad_type_destination": "Firefly III non pu\u00f2 determinare il tipo di transazione in base a questo account di destinazione."
@@ -17,10 +30,10 @@
         "spent": "Speso",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
+        "administration_role_owner": "Proprietario",
+        "administration_role_ro": "Sola lettura",
+        "administration_role_mng_trx": "Gestisci le transazioni",
+        "administration_role_mng_meta": "Gestisci classificazione e meta-dati",
         "administration_role_mng_budgets": "Manage budgets",
         "administration_role_mng_piggies": "Manage piggy banks",
         "administration_role_mng_subscriptions": "Manage subscriptions",
@@ -48,7 +61,7 @@
         "unknown_dest_plain": "Conto di destinazione sconosciuto",
         "unknown_any_plain": "Conto sconosciuto",
         "unknown_budget_plain": "Nessun budget",
-        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
+        "stored_journal_js": "Nuova transazione \"{{description}} \" creata con successo",
         "wait_loading_transaction": "Attendi il caricamento del modello",
         "nothing_found": "(nessun risultato)",
         "wait_loading_data": "Ti preghiamo di attendere il caricamento delle tue informazioni...",

public/v2/i18n/it_IT.json

@@ -4,11 +4,24 @@
         "date_time_fns": "do MMMM yyyy @ HH:mm:ss",
         "month_and_day_fns": "d MMMM y",
         "does_not_exist": "(config.does_not_exist)",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "date_time_fns_short": "do MMMM yyyy @ HH:mm"
     },
     "form": {
         "title": "Titolo"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Attivo",
+        "name": "Nome",
+        "type": "Tipo",
+        "number": "Account number",
+        "liability_type": "Tipo di passivit\u00e0",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III non pu\u00f2 determinare il tipo di transazione in base a questo account sorgente.",
         "bad_type_destination": "Firefly III non pu\u00f2 determinare il tipo di transazione in base a questo account di destinazione."
@@ -17,10 +30,10 @@
         "spent": "Speso",
         "administration_owner": "Administration owner: {{email}}",
         "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
+        "administration_role_owner": "Proprietario",
+        "administration_role_ro": "Sola lettura",
+        "administration_role_mng_trx": "Gestisci le transazioni",
+        "administration_role_mng_meta": "Gestisci classificazione e meta-dati",
         "administration_role_mng_budgets": "Manage budgets",
         "administration_role_mng_piggies": "Manage piggy banks",
         "administration_role_mng_subscriptions": "Manage subscriptions",
@@ -48,7 +61,7 @@
         "unknown_dest_plain": "Conto di destinazione sconosciuto",
         "unknown_any_plain": "Conto sconosciuto",
         "unknown_budget_plain": "Nessun budget",
-        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
+        "stored_journal_js": "Nuova transazione \"{{description}} \" creata con successo",
         "wait_loading_transaction": "Attendi il caricamento del modello",
         "nothing_found": "(nessun risultato)",
         "wait_loading_data": "Ti preghiamo di attendere il caricamento delle tue informazioni...",

public/v2/i18n/ja.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "\u30bf\u30a4\u30c8\u30eb"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "\u6709\u52b9",
+        "name": "\u540d\u79f0",
+        "type": "\u7a2e\u5225",
+        "number": "Account number",
+        "liability_type": "\u50b5\u52d9\u7a2e\u5225",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/ja_JP.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "\u30bf\u30a4\u30c8\u30eb"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "\u6709\u52b9",
+        "name": "\u540d\u79f0",
+        "type": "\u7a2e\u5225",
+        "number": "Account number",
+        "liability_type": "\u50b5\u52d9\u7a2e\u5225",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/ko.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "\uc81c\ubaa9"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "\ud65c\uc131 \uc0c1\ud0dc\uc785\ub2c8\uae4c?",
+        "name": "\uc774\ub984",
+        "type": "\uc720\ud615",
+        "number": "Account number",
+        "liability_type": "\ubd80\ucc44 \uc720\ud615",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/ko_KR.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "\uc81c\ubaa9"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "\ud65c\uc131 \uc0c1\ud0dc\uc785\ub2c8\uae4c?",
+        "name": "\uc774\ub984",
+        "type": "\uc720\ud615",
+        "number": "Account number",
+        "liability_type": "\ubd80\ucc44 \uc720\ud615",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/nb.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Tittel"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Er aktiv?",
+        "name": "Navn",
+        "type": "Type",
+        "number": "Account number",
+        "liability_type": "Type gjeld",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/nb_NO.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Tittel"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Er aktiv?",
+        "name": "Navn",
+        "type": "Type",
+        "number": "Account number",
+        "liability_type": "Type gjeld",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/nl.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Titel"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Actief?",
+        "name": "Naam",
+        "type": "Type",
+        "number": "Account number",
+        "liability_type": "Type passiva",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III kan het transactietype niet bepalen op basis van deze bronrekening.",
         "bad_type_destination": "Firefly III kan het transactietype niet bepalen op basis van deze doelrekening."

public/v2/i18n/nl_NL.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Titel"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Actief?",
+        "name": "Naam",
+        "type": "Type",
+        "number": "Account number",
+        "liability_type": "Type passiva",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III kan het transactietype niet bepalen op basis van deze bronrekening.",
         "bad_type_destination": "Firefly III kan het transactietype niet bepalen op basis van deze doelrekening."

public/v2/i18n/nn.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Tittel"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Er aktiv?",
+        "name": "Namn",
+        "type": "Type",
+        "number": "Account number",
+        "liability_type": "Type gjeld",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/nn_NO.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Tittel"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Er aktiv?",
+        "name": "Namn",
+        "type": "Type",
+        "number": "Account number",
+        "liability_type": "Type gjeld",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/pl.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Tytu\u0142"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Jest aktywny?",
+        "name": "Nazwa",
+        "type": "Typ",
+        "number": "Account number",
+        "liability_type": "Rodzaj zobowi\u0105zania",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/pl_PL.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Tytu\u0142"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Jest aktywny?",
+        "name": "Nazwa",
+        "type": "Typ",
+        "number": "Account number",
+        "liability_type": "Rodzaj zobowi\u0105zania",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/pt-br.json

@@ -4,36 +4,49 @@
         "date_time_fns": "dd 'de' MMMM 'de' yyyy, '\u00e0s' HH:mm:ss",
         "month_and_day_fns": "d [de] MMMM [de] y",
         "does_not_exist": "(config.does_not_exist)",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "date_time_fns_short": "dd\/MMM\/yyyy HH:mm"
     },
     "form": {
         "title": "T\u00edtulo"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Est\u00e1 ativo?",
+        "name": "Nome",
+        "type": "Tipo",
+        "number": "Account number",
+        "liability_type": "Tipo de passivo",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III n\u00e3o conseguiu determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de origem.",
         "bad_type_destination": "Firefly III n\u00e3o conseguiu determinar o tipo de transa\u00e7\u00e3o baseado nesta conta destino."
     },
     "firefly": {
         "spent": "Gasto",
-        "administration_owner": "Administration owner: {{email}}",
-        "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
-        "administration_role_mng_budgets": "Manage budgets",
-        "administration_role_mng_piggies": "Manage piggy banks",
-        "administration_role_mng_subscriptions": "Manage subscriptions",
-        "administration_role_mng_rules": "Manage rules",
-        "administration_role_mng_recurring": "Manage recurring transactions ",
-        "administration_role_mng_webhooks": "Manage webhooks",
-        "administration_role_mng_currencies": "Manage currencies",
-        "administration_role_view_reports": "View reports",
-        "administration_role_full": "Full access",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "administration_owner": "Propriet\u00e1rio da administra\u00e7\u00e3o: {{email}}",
+        "administration_you": "Sua fun\u00e7\u00e3o: {{role}}",
+        "administration_role_owner": "Propriet\u00e1rio",
+        "administration_role_ro": "Somente leitura",
+        "administration_role_mng_trx": "Gerenciar transa\u00e7\u00f5es",
+        "administration_role_mng_meta": "Gerenciar classifica\u00e7\u00e3o e metadados",
+        "administration_role_mng_budgets": "Gerenciar or\u00e7amentos",
+        "administration_role_mng_piggies": "Gerenciar cofrinhos",
+        "administration_role_mng_subscriptions": "Gerenciar assinaturas",
+        "administration_role_mng_rules": "Gerenciar regras",
+        "administration_role_mng_recurring": "Gerenciar transa\u00e7\u00f5es recorrentes ",
+        "administration_role_mng_webhooks": "Gerenciar webhooks",
+        "administration_role_mng_currencies": "Gerenciar moedas",
+        "administration_role_view_reports": "Ver relat\u00f3rios",
+        "administration_role_full": "Acesso completo",
+        "new_administration_created": "Nova administra\u00e7\u00e3o financeira \"{{title}}\" foi criada",
         "left": "Restante",
         "paid": "Pago",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
+        "errors_submission_v2": "Algo deu errado com seu envio. Por favor, verifique os erros abaixo: {{errorMessage}}",
         "unpaid": "N\u00e3o pago",
         "default_group_title_name_plain": "sem grupo",
         "subscriptions_in_group": "Assinaturas no grupo \"%{title}\"",
@@ -48,7 +61,7 @@
         "unknown_dest_plain": "Conta de destino desconhecida",
         "unknown_any_plain": "Conta desconhecida",
         "unknown_budget_plain": "Nenhum or\u00e7amento",
-        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
+        "stored_journal_js": "Transa\u00e7\u00e3o \"{{description}}\" criada com sucesso",
         "wait_loading_transaction": "Por favor, aguarde o formul\u00e1rio carregar",
         "nothing_found": "(nada encontrado)",
         "wait_loading_data": "Por favor, aguarde suas informa\u00e7\u00f5es serem carregadas...",

public/v2/i18n/pt.json

@@ -4,11 +4,24 @@
         "date_time_fns": "DO [de] MMMM YYYY, @ HH:mm:ss",
         "month_and_day_fns": "d MMMM y",
         "does_not_exist": "(config.does_not_exist)",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "date_time_fns_short": "do MMMM yyyy @ HH:mm"
     },
     "form": {
         "title": "T\u00edtulo"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Esta ativo?",
+        "name": "Nome",
+        "type": "Tipo",
+        "number": "Account number",
+        "liability_type": "Tipo de responsabilidade",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "O Firefly III n\u00e3o consegue determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de origem.",
         "bad_type_destination": "O Firefly III n\u00e3o consegue determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de destino."

public/v2/i18n/pt_BR.json

@@ -4,36 +4,49 @@
         "date_time_fns": "dd 'de' MMMM 'de' yyyy, '\u00e0s' HH:mm:ss",
         "month_and_day_fns": "d [de] MMMM [de] y",
         "does_not_exist": "(config.does_not_exist)",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "date_time_fns_short": "dd\/MMM\/yyyy HH:mm"
     },
     "form": {
         "title": "T\u00edtulo"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Est\u00e1 ativo?",
+        "name": "Nome",
+        "type": "Tipo",
+        "number": "Account number",
+        "liability_type": "Tipo de passivo",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III n\u00e3o conseguiu determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de origem.",
         "bad_type_destination": "Firefly III n\u00e3o conseguiu determinar o tipo de transa\u00e7\u00e3o baseado nesta conta destino."
     },
     "firefly": {
         "spent": "Gasto",
-        "administration_owner": "Administration owner: {{email}}",
-        "administration_you": "Your role: {{role}}",
-        "administration_role_owner": "Owner",
-        "administration_role_ro": "Read-only",
-        "administration_role_mng_trx": "Manage transactions",
-        "administration_role_mng_meta": "Manage classification and meta-data",
-        "administration_role_mng_budgets": "Manage budgets",
-        "administration_role_mng_piggies": "Manage piggy banks",
-        "administration_role_mng_subscriptions": "Manage subscriptions",
-        "administration_role_mng_rules": "Manage rules",
-        "administration_role_mng_recurring": "Manage recurring transactions ",
-        "administration_role_mng_webhooks": "Manage webhooks",
-        "administration_role_mng_currencies": "Manage currencies",
-        "administration_role_view_reports": "View reports",
-        "administration_role_full": "Full access",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "administration_owner": "Propriet\u00e1rio da administra\u00e7\u00e3o: {{email}}",
+        "administration_you": "Sua fun\u00e7\u00e3o: {{role}}",
+        "administration_role_owner": "Propriet\u00e1rio",
+        "administration_role_ro": "Somente leitura",
+        "administration_role_mng_trx": "Gerenciar transa\u00e7\u00f5es",
+        "administration_role_mng_meta": "Gerenciar classifica\u00e7\u00e3o e metadados",
+        "administration_role_mng_budgets": "Gerenciar or\u00e7amentos",
+        "administration_role_mng_piggies": "Gerenciar cofrinhos",
+        "administration_role_mng_subscriptions": "Gerenciar assinaturas",
+        "administration_role_mng_rules": "Gerenciar regras",
+        "administration_role_mng_recurring": "Gerenciar transa\u00e7\u00f5es recorrentes ",
+        "administration_role_mng_webhooks": "Gerenciar webhooks",
+        "administration_role_mng_currencies": "Gerenciar moedas",
+        "administration_role_view_reports": "Ver relat\u00f3rios",
+        "administration_role_full": "Acesso completo",
+        "new_administration_created": "Nova administra\u00e7\u00e3o financeira \"{{title}}\" foi criada",
         "left": "Restante",
         "paid": "Pago",
-        "errors_submission_v2": "There was something wrong with your submission. Please check out the errors below: {{errorMessage}}",
+        "errors_submission_v2": "Algo deu errado com seu envio. Por favor, verifique os erros abaixo: {{errorMessage}}",
         "unpaid": "N\u00e3o pago",
         "default_group_title_name_plain": "sem grupo",
         "subscriptions_in_group": "Assinaturas no grupo \"%{title}\"",
@@ -48,7 +61,7 @@
         "unknown_dest_plain": "Conta de destino desconhecida",
         "unknown_any_plain": "Conta desconhecida",
         "unknown_budget_plain": "Nenhum or\u00e7amento",
-        "stored_journal_js": "Successfully created new transaction \"{{description}}\"",
+        "stored_journal_js": "Transa\u00e7\u00e3o \"{{description}}\" criada com sucesso",
         "wait_loading_transaction": "Por favor, aguarde o formul\u00e1rio carregar",
         "nothing_found": "(nada encontrado)",
         "wait_loading_data": "Por favor, aguarde suas informa\u00e7\u00f5es serem carregadas...",

public/v2/i18n/pt_PT.json

@@ -4,11 +4,24 @@
         "date_time_fns": "DO [de] MMMM YYYY, @ HH:mm:ss",
         "month_and_day_fns": "d MMMM y",
         "does_not_exist": "(config.does_not_exist)",
-        "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
+        "date_time_fns_short": "do MMMM yyyy @ HH:mm"
     },
     "form": {
         "title": "T\u00edtulo"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Esta ativo?",
+        "name": "Nome",
+        "type": "Tipo",
+        "number": "Account number",
+        "liability_type": "Tipo de responsabilidade",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "O Firefly III n\u00e3o consegue determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de origem.",
         "bad_type_destination": "O Firefly III n\u00e3o consegue determinar o tipo de transa\u00e7\u00e3o baseado nesta conta de destino."

public/v2/i18n/ro.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Titlu"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Este activ?",
+        "name": "Nume",
+        "type": "Tip",
+        "number": "Account number",
+        "liability_type": "Tip de provizion",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III nu poate determina tipul de tranzac\u021bie pe baza acestui cont surs\u0103.",
         "bad_type_destination": "Firefly III nu poate determina tipul de tranzac\u021bie bazat pe acest cont de destina\u021bie."

public/v2/i18n/ro_RO.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Titlu"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Este activ?",
+        "name": "Nume",
+        "type": "Tip",
+        "number": "Account number",
+        "liability_type": "Tip de provizion",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III nu poate determina tipul de tranzac\u021bie pe baza acestui cont surs\u0103.",
         "bad_type_destination": "Firefly III nu poate determina tipul de tranzac\u021bie bazat pe acest cont de destina\u021bie."

public/v2/i18n/ru.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a"
     },
+    "list": {
+        "drag_and_drop": "\u041f\u0435\u0440\u0435\u0442\u0430\u0441\u043a\u0438\u0432\u0430\u043d\u0438\u0435",
+        "active": "\u0410\u043a\u0442\u0438\u0432\u0435\u043d?",
+        "name": "\u0418\u043c\u044f",
+        "type": "\u0422\u0438\u043f",
+        "number": "\u041d\u043e\u043c\u0435\u0440 \u0441\u0447\u0435\u0442\u0430",
+        "liability_type": "\u0422\u0438\u043f \u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0441\u0442\u0438",
+        "current_balance": "\u0422\u0435\u043a\u0443\u0449\u0438\u0439 \u0431\u0430\u043b\u0430\u043d\u0441",
+        "last_activity": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u044c",
+        "amount_due": "\u0421\u0443\u043c\u043c\u0430 \u0434\u043e\u043b\u0433\u0430",
+        "balance_difference": "\u0420\u0430\u0437\u043d\u0438\u0446\u0430 \u0431\u0430\u043b\u0430\u043d\u0441\u0430",
+        "menu": "\u041c\u0435\u043d\u044e"
+    },
     "validation": {
         "bad_type_source": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0438\u0441\u0445\u043e\u0434\u043d\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430.",
         "bad_type_destination": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430."

public/v2/i18n/ru_RU.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a"
     },
+    "list": {
+        "drag_and_drop": "\u041f\u0435\u0440\u0435\u0442\u0430\u0441\u043a\u0438\u0432\u0430\u043d\u0438\u0435",
+        "active": "\u0410\u043a\u0442\u0438\u0432\u0435\u043d?",
+        "name": "\u0418\u043c\u044f",
+        "type": "\u0422\u0438\u043f",
+        "number": "\u041d\u043e\u043c\u0435\u0440 \u0441\u0447\u0435\u0442\u0430",
+        "liability_type": "\u0422\u0438\u043f \u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0441\u0442\u0438",
+        "current_balance": "\u0422\u0435\u043a\u0443\u0449\u0438\u0439 \u0431\u0430\u043b\u0430\u043d\u0441",
+        "last_activity": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u044c",
+        "amount_due": "\u0421\u0443\u043c\u043c\u0430 \u0434\u043e\u043b\u0433\u0430",
+        "balance_difference": "\u0420\u0430\u0437\u043d\u0438\u0446\u0430 \u0431\u0430\u043b\u0430\u043d\u0441\u0430",
+        "menu": "\u041c\u0435\u043d\u044e"
+    },
     "validation": {
         "bad_type_source": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0438\u0441\u0445\u043e\u0434\u043d\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430.",
         "bad_type_destination": "Firefly III \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u044d\u0442\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430."

public/v2/i18n/sk.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "N\u00e1zov"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Akt\u00edvne?",
+        "name": "Meno\/N\u00e1zov",
+        "type": "Typ",
+        "number": "Account number",
+        "liability_type": "Typ z\u00e1v\u00e4zku",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/sk_SK.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "N\u00e1zov"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Akt\u00edvne?",
+        "name": "Meno\/N\u00e1zov",
+        "type": "Typ",
+        "number": "Account number",
+        "liability_type": "Typ z\u00e1v\u00e4zku",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/sl.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Naslov"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Aktiviran?",
+        "name": "ime",
+        "type": "Vrsta",
+        "number": "Account number",
+        "liability_type": "Vrsta obveznost",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Na podlagi tega izvornega ra\u010duna Firefly III ne more dolo\u010diti vrste transakcije.",
         "bad_type_destination": "Na podlagi tega ciljnega ra\u010duna Firefly III ne more dolo\u010diti vrste transakcije."
@@ -30,7 +43,7 @@
         "administration_role_mng_currencies": "Upravljanje valut",
         "administration_role_view_reports": "Prikaz poro\u010dil",
         "administration_role_full": "Neomejen dostop",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "new_administration_created": "Ustvarjena je bila nova finan\u010dna administracija \"{{title}}\"",
         "left": "Preostalo",
         "paid": "Pla\u010dano",
         "errors_submission_v2": "Nekaj je bilo narobe z va\u0161o oddajo. Preverite spodnje napake: {{errorMessage}}",

public/v2/i18n/sl_SI.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Naslov"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Aktiviran?",
+        "name": "ime",
+        "type": "Vrsta",
+        "number": "Account number",
+        "liability_type": "Vrsta obveznost",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Na podlagi tega izvornega ra\u010duna Firefly III ne more dolo\u010diti vrste transakcije.",
         "bad_type_destination": "Na podlagi tega ciljnega ra\u010duna Firefly III ne more dolo\u010diti vrste transakcije."
@@ -30,7 +43,7 @@
         "administration_role_mng_currencies": "Upravljanje valut",
         "administration_role_view_reports": "Prikaz poro\u010dil",
         "administration_role_full": "Neomejen dostop",
-        "new_administration_created": "New financial administration \"{{title}}\" has been created",
+        "new_administration_created": "Ustvarjena je bila nova finan\u010dna administracija \"{{title}}\"",
         "left": "Preostalo",
         "paid": "Pla\u010dano",
         "errors_submission_v2": "Nekaj je bilo narobe z va\u0161o oddajo. Preverite spodnje napake: {{errorMessage}}",

public/v2/i18n/sv.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Titel"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "\u00c4r aktiv?",
+        "name": "Namn",
+        "type": "Typ",
+        "number": "Account number",
+        "liability_type": "Typ av ansvar",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III kan inte avg\u00f6ra transaktionstypen baserat p\u00e5 detta k\u00e4llkonto.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/sv_SE.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Titel"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "\u00c4r aktiv?",
+        "name": "Namn",
+        "type": "Typ",
+        "number": "Account number",
+        "liability_type": "Typ av ansvar",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III kan inte avg\u00f6ra transaktionstypen baserat p\u00e5 detta k\u00e4llkonto.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/tr.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Ba\u015fl\u0131k"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Aktif mi?",
+        "name": "\u0130sim",
+        "type": "T\u00fcr",
+        "number": "Account number",
+        "liability_type": "Bor\u00e7 tipi",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."

public/v2/i18n/tr_TR.json

@@ -9,6 +9,19 @@
     "form": {
         "title": "Ba\u015fl\u0131k"
     },
+    "list": {
+        "drag_and_drop": "Drag and drop",
+        "active": "Aktif mi?",
+        "name": "\u0130sim",
+        "type": "T\u00fcr",
+        "number": "Account number",
+        "liability_type": "Bor\u00e7 tipi",
+        "current_balance": "Current balance",
+        "last_activity": "Last activity",
+        "amount_due": "Amount due",
+        "balance_difference": "Balance difference",
+        "menu": "Menu"
+    },
     "validation": {
         "bad_type_source": "Firefly III can't determine the transaction type based on this source account.",
         "bad_type_destination": "Firefly III can't determine the transaction type based on this destination account."