Merge branch 'release/5.1.0-beta.1'

2025-02-25 18:45:27 -06:00 · 2020-02-23 07:47:37 +01:00 · 2020-02-23 07:47:37 +01:00 · 4b7460c1cf
commit 4b7460c1cf
parent e8bf53ad11 8c8a2a1596
949 changed files with 2911 additions and 2679 deletions
--- a/.github/code_of_conduct.md
+++ b/.github/code_of_conduct.md
@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

 ## Enforcement

-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at thegrumpydictator@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at james@firefly-iii.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

--- a/.github/contributing.md
+++ b/.github/contributing.md
@ -4,7 +4,7 @@

 ## Feature requests

-I am always interested in expanding Firefly III's many features. Just open a ticket or [drop me a line](mailto:thegrumpydictator@gmail.com).
+I am always interested in expanding Firefly III's many features. Just open a ticket or [drop me a line](mailto:james@firefly-iii.org).

 ## Pull requests

--- a/.github/security.md
+++ b/.github/security.md
@ -6,7 +6,7 @@ Only the latest version of Firefly III is supported. If you're not running the l

 ## Reporting a Vulnerability

-If you find something that compromises the security of Firefly III, you should [send me a message](mailto:thegrumpydictator@gmail.com) as soon as possible. These issues will be fixed immediately. You can also open an issue, but if you feel the issue is sensitive, please drop me a message instead.
+If you find something that compromises the security of Firefly III, you should [send me a message](mailto:james@firefly-iii.org) as soon as possible. These issues will be fixed immediately. You can also open an issue, but if you feel the issue is sensitive, please drop me a message instead.

 You can use my [GPG key](https://keybase.io/jc5) for extra security. My [GitHub commits](https://github.com/firefly-iii/firefly-iii/commits/master) are almost always signed with this key.

--- a/app/Api/V1/Controllers/Search/AccountController.php
+++ b/app/Api/V1/Controllers/Search/AccountController.php
@ -32,6 +32,7 @@ use Illuminate\Http\Response;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
+use Log;

 /**
 * Class AccountController
@ -62,6 +63,7 @@ class AccountController extends Controller
     */
    public function search(Request $request)
    {
+        Log::debug('Now in account search()');
        $manager = $this->getManager();
        $query   = $request->get('query');
        $field   = $request->get('field');
@ -70,6 +72,8 @@ class AccountController extends Controller
            return response(null, 422);
        }
        $types = $this->mapAccountTypes($type);
+        Log::debug(sprintf('Going to search for "%s" in types', $query), $types);
+
        /** @var AccountSearch $search */
        $search = app(AccountSearch::class);
        $search->setUser(auth()->user());
@ -79,6 +83,8 @@ class AccountController extends Controller

        $accounts = $search->search();

+        Log::debug(sprintf('Found %d accounts', $accounts->count()));
+
        /** @var AccountTransformer $transformer */
        $transformer = app(AccountTransformer::class);
        $transformer->setParameters($this->parameters);
--- a/app/Api/V1/Controllers/TransactionController.php
+++ b/app/Api/V1/Controllers/TransactionController.php
@ -274,6 +274,7 @@ class TransactionController extends Controller
     */
    public function store(TransactionStoreRequest $request): JsonResponse
    {
+        Log::debug('Now in API TransactionController::store()');
        $data         = $request->getAll();
        $data['user'] = auth()->user()->id;

@ -283,6 +284,7 @@ class TransactionController extends Controller
        try {
            $transactionGroup = $this->groupRepository->store($data);
        } catch (DuplicateTransactionException $e) {
+            Log::warning('Caught a duplicate. Return error message.');
            // return bad validation message.
            // TODO use Laravel's internal validation thing to do this.
            $response = [
@ -294,7 +296,7 @@ class TransactionController extends Controller

            return response()->json($response, 422);
        }
-
+        app('preferences')->mark();
        event(new StoredTransactionGroup($transactionGroup));

        $manager = $this->getManager();
@ -338,6 +340,7 @@ class TransactionController extends Controller
        $transactionGroup = $this->groupRepository->update($transactionGroup, $data);
        $manager          = $this->getManager();

+        app('preferences')->mark();
        event(new UpdatedTransactionGroup($transactionGroup));

        /** @var User $admin */
--- a/app/Api/V1/Requests/TransactionStoreRequest.php
+++ b/app/Api/V1/Requests/TransactionStoreRequest.php
@ -30,7 +30,7 @@ use FireflyIII\Rules\IsDateOrTime;
 use FireflyIII\Support\NullArrayObject;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Validation\Validator;
-
+use Log;

 /**
 * Class TransactionStoreRequest
@ -46,6 +46,7 @@ class TransactionStoreRequest extends Request
     */
    public function authorize(): bool
    {
+        Log::debug('Authorize TransactionStoreRequest');
        // Only allow authenticated users
        return auth()->check();
    }
@ -57,6 +58,7 @@ class TransactionStoreRequest extends Request
     */
    public function getAll(): array
    {
+        Log::debug('get all data in TransactionStoreRequest');
        $data = [
            'group_title'             => $this->string('group_title'),
            'error_if_duplicate_hash' => $this->boolean('error_if_duplicate_hash'),
@ -73,6 +75,7 @@ class TransactionStoreRequest extends Request
     */
    public function rules(): array
    {
+        Log::debug('Collect rules of TransactionStoreRequest');
        $rules = [
            // basic fields for group:
            'group_title'                          => 'between:1,1000|nullable',
--- a/app/Exceptions/GracefulNotFoundHandler.php
+++ b/app/Exceptions/GracefulNotFoundHandler.php
@ -65,6 +65,7 @@ class GracefulNotFoundHandler extends ExceptionHandler

                return parent::render($request, $exception);
            case 'accounts.show':
+            case 'accounts.show.all':
                return $this->handleAccount($request, $exception);
            case 'transactions.show':
                return $this->handleGroup($request, $exception);
--- a/app/Factory/AccountFactory.php
+++ b/app/Factory/AccountFactory.php
@ -2,7 +2,7 @@

 /**
 * AccountFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Factory/AccountMetaFactory.php
+++ b/app/Factory/AccountMetaFactory.php
@ -2,7 +2,7 @@

 /**
 * AccountMetaFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Factory/AttachmentFactory.php
+++ b/app/Factory/AttachmentFactory.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AttachmentFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Factory/BillFactory.php
+++ b/app/Factory/BillFactory.php
@ -2,7 +2,7 @@

 /**
 * BillFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Factory/BudgetFactory.php
+++ b/app/Factory/BudgetFactory.php
@ -1,7 +1,7 @@
 <?php
 /**
 * BudgetFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Factory/CategoryFactory.php
+++ b/app/Factory/CategoryFactory.php
@ -1,7 +1,7 @@
 <?php
 /**
 * CategoryFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Factory/PiggyBankEventFactory.php
+++ b/app/Factory/PiggyBankEventFactory.php
@ -1,7 +1,7 @@
 <?php
 /**
 * PiggyBankEventFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Factory/PiggyBankFactory.php
+++ b/app/Factory/PiggyBankFactory.php
@ -1,7 +1,7 @@
 <?php
 /**
 * PiggyBankFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Factory/RecurrenceFactory.php
+++ b/app/Factory/RecurrenceFactory.php
@ -1,7 +1,7 @@
 <?php
 /**
 * RecurrenceFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Factory/TagFactory.php
+++ b/app/Factory/TagFactory.php
@ -1,7 +1,7 @@
 <?php
 /**
 * TagFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Factory/TransactionCurrencyFactory.php
+++ b/app/Factory/TransactionCurrencyFactory.php
@ -1,7 +1,7 @@
 <?php
 /**
 * TransactionCurrencyFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Factory/TransactionFactory.php
+++ b/app/Factory/TransactionFactory.php
@ -2,7 +2,7 @@

 /**
 * TransactionFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Factory/TransactionGroupFactory.php
+++ b/app/Factory/TransactionGroupFactory.php
@ -1,7 +1,7 @@
 <?php
 /**
 * TransactionGroupFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
@ -26,6 +26,7 @@ namespace FireflyIII\Factory;
 use FireflyIII\Exceptions\DuplicateTransactionException;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\User;
+use Log;

 /**
 * Class TransactionGroupFactory
@ -60,7 +61,12 @@ class TransactionGroupFactory
        $this->journalFactory->setUser($this->user);
        $this->journalFactory->setErrorOnHash($data['error_if_duplicate_hash'] ?? false);

-        $collection = $this->journalFactory->create($data);
+        try {
+            $collection = $this->journalFactory->create($data);
+        } catch(DuplicateTransactionException $e) {
+            Log::warning('GroupFactory::create() caught journalFactory::create() with a duplicate!');
+            throw new DuplicateTransactionException($e->getMessage());
+        }
        $title      = $data['group_title'] ?? null;
        $title      = '' === $title ? null : $title;

--- a/app/Factory/TransactionJournalFactory.php
+++ b/app/Factory/TransactionJournalFactory.php
@ -2,7 +2,7 @@

 /**
 * TransactionJournalFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
@ -129,11 +129,11 @@ class TransactionJournalFactory
    public function create(array $data): Collection
    {
        // convert to special object.
-        $data = new NullArrayObject($data);
+        $dataObject = new NullArrayObject($data);

        Log::debug('Start of TransactionJournalFactory::create()');
        $collection   = new Collection;
-        $transactions = $data['transactions'] ?? [];
+        $transactions = $dataObject['transactions'] ?? [];
        if (0 === count($transactions)) {
            Log::error('There are no transactions in the array, the TransactionJournalFactory cannot continue.');

@ -145,7 +145,12 @@ class TransactionJournalFactory
            Log::debug(sprintf('Now creating journal %d/%d', $index + 1, count($transactions)));

            Log::debug('Going to call createJournal', $row);
-            $journal = $this->createJournal(new NullArrayObject($row));
+            try {
+                $journal = $this->createJournal(new NullArrayObject($row));
+            } catch (DuplicateTransactionException|Exception $e) {
+                Log::warning('TransactionJournalFactory::create() caught a duplicate journal in createJournal()');
+                throw new DuplicateTransactionException($e->getMessage());
+            }
            if (null !== $journal) {
                $collection->push($journal);
            }
@ -395,17 +400,20 @@ class TransactionJournalFactory
     */
    private function errorIfDuplicate(string $hash): void
    {
+        Log::debug(sprintf('In errorIfDuplicate(%s)', $hash));
        if (false === $this->errorOnHash) {
            return;
        }
        $result = null;
        if ($this->errorOnHash) {
+            Log::debug('Will verify duplicate!');
            /** @var TransactionJournalMeta $result */
            $result = TransactionJournalMeta::where('data', json_encode($hash, JSON_THROW_ON_ERROR))
                                            ->with(['transactionJournal', 'transactionJournal.transactionGroup'])
                                            ->first();
        }
        if (null !== $result) {
+            Log::warning('Found a duplicate!');
            throw new DuplicateTransactionException(sprintf('Duplicate of transaction #%d.', $result->transactionJournal->transaction_group_id));
        }
    }
@ -526,6 +534,9 @@ class TransactionJournalFactory
    public function setErrorOnHash(bool $errorOnHash): void
    {
        $this->errorOnHash = $errorOnHash;
+        if (true === $errorOnHash) {
+            Log::info('Will trigger duplication alert for this journal.');
+        }
    }


--- a/app/Factory/TransactionJournalMetaFactory.php
+++ b/app/Factory/TransactionJournalMetaFactory.php
@ -1,7 +1,7 @@
 <?php
 /**
 * TransactionJournalMetaFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Factory/TransactionTypeFactory.php
+++ b/app/Factory/TransactionTypeFactory.php
@ -2,7 +2,7 @@

 /**
 * TransactionTypeFactory.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Helpers/Collector/GroupCollector.php
+++ b/app/Helpers/Collector/GroupCollector.php
@ -60,6 +60,8 @@ class GroupCollector implements GroupCollectorInterface
    private $hasCatInformation;
    /** @var bool Will be true of the query has the tag info tables joined. */
    private $hasJoinedTagTables;
+    /** @var bool Will be true for attachments */
+    private $hasJoinedAttTables;
    /** @var int The maximum number of results. */
    private $limit;
    /** @var int The page to return. */
@ -86,7 +88,8 @@ class GroupCollector implements GroupCollectorInterface
        $this->hasBudgetInformation = false;
        $this->hasBillInformation   = false;
        $this->hasJoinedTagTables   = false;
-        $this->integerFields = [
+        $this->hasJoinedAttTables   = false;
+        $this->integerFields        = [
            'transaction_group_id',
            'user_id',
            'transaction_journal_id',
@ -101,10 +104,10 @@ class GroupCollector implements GroupCollectorInterface
            'destination_transaction_id',
            'destination_account_id',
            'category_id',
-            'budget_id'
+            'budget_id',
        ];
-        $this->total  = 0;
-        $this->fields = [
+        $this->total                = 0;
+        $this->fields               = [
            # group
            'transaction_groups.id as transaction_group_id',
            'transaction_groups.user_id as user_id',
@ -281,11 +284,10 @@ class GroupCollector implements GroupCollectorInterface
     */
    public function getGroups(): Collection
    {
-        $start = microtime(true);
+        //$start = microtime(true);
        /** @var Collection $result */
        $result = $this->query->get($this->fields);
-        $end    = round(microtime(true) - $start, 5);
-
+        //$end    = round(microtime(true) - $start, 5);
        // log info about query time.
        //Log::info(sprintf('Query took Firefly III %s seconds', $end));
        //Log::info($this->query->toSql(), $this->query->getBindings());
@ -950,6 +952,24 @@ class GroupCollector implements GroupCollectorInterface
        }
    }

+    /**
+     * Join table to get attachment information.
+     */
+    private function joinAttachmentTables(): void
+    {
+        if (false === $this->hasJoinedAttTables) {
+            // join some extra tables:
+            $this->hasJoinedAttTables = true;
+            $this->query->leftJoin('attachments', 'attachments.attachable_id', '=', 'transaction_journals.id')
+                        ->where(
+                            static function (EloquentBuilder $q1) {
+                                $q1->where('attachments.attachable_type', TransactionJournal::class);
+                                $q1->orWhereNull('attachments.attachable_type');
+                            }
+                        );
+        }
+    }
+
    /**
     * @param array              $existingJournal
     * @param TransactionJournal $newJournal
@ -980,6 +1000,26 @@ class GroupCollector implements GroupCollectorInterface
        return $existingJournal;
    }

+    /**
+     * @param array              $existingJournal
+     * @param TransactionJournal $newJournal
+     *
+     * @return array
+     */
+    private function mergeAttachments(array $existingJournal, TransactionJournal $newJournal): array
+    {
+        $newArray = $newJournal->toArray();
+        if (isset($newArray['attachment_id'])) {
+            $attachmentId                                  = (int)$newJournal['tag_id'];
+            $existingJournal['attachments'][$attachmentId] = [
+                'id' => $attachmentId,
+            ];
+        }
+
+        return $existingJournal;
+    }
+
+
    /**
     * @param Collection $collection
     *
@ -994,7 +1034,7 @@ class GroupCollector implements GroupCollectorInterface

            if (!isset($groups[$groupId])) {
                // make new array
-                $parsedGroup                            = $this->parseAugmentedGroup($augumentedJournal);
+                $parsedGroup                            = $this->parseAugmentedJournal($augumentedJournal);
                $groupArray                             = [
                    'id'               => (int)$augumentedJournal->transaction_group_id,
                    'user_id'          => (int)$augumentedJournal->user_id,
@ -1014,11 +1054,14 @@ class GroupCollector implements GroupCollectorInterface
            $groups[$groupId]['count']++;

            if (isset($groups[$groupId]['transactions'][$journalId])) {
+                // append data to existing group + journal (for multiple tags or multiple attachments)
                $groups[$groupId]['transactions'][$journalId] = $this->mergeTags($groups[$groupId]['transactions'][$journalId], $augumentedJournal);
+                $groups[$groupId]['transactions'][$journalId] = $this->mergeAttachments($groups[$groupId]['transactions'][$journalId], $augumentedJournal);
            }

            if (!isset($groups[$groupId]['transactions'][$journalId])) {
-                $groups[$groupId]['transactions'][$journalId] = $this->parseAugmentedGroup($augumentedJournal);
+                // create second, third, fourth split:
+                $groups[$groupId]['transactions'][$journalId] = $this->parseAugmentedJournal($augumentedJournal);
            }


@ -1034,10 +1077,11 @@ class GroupCollector implements GroupCollectorInterface
     *
     * @return array
     */
-    private function parseAugmentedGroup(TransactionJournal $augumentedJournal): array
+    private function parseAugmentedJournal(TransactionJournal $augumentedJournal): array
    {
-        $result         = $augumentedJournal->toArray();
-        $result['tags'] = [];
+        $result                = $augumentedJournal->toArray();
+        $result['tags']        = [];
+        $result['attachments'] = [];
        try {
            $result['date']       = new Carbon($result['date']);
            $result['created_at'] = new Carbon($result['created_at']);
@ -1067,6 +1111,14 @@ class GroupCollector implements GroupCollectorInterface
            ];
        }

+        // also merge attachments:
+        if (isset($augumentedJournal['attachment_id'])) {
+            $attachmentId                         = (int)$augumentedJournal['attachment_id'];
+            $result['attachments'][$attachmentId] = [
+                'id' => $attachmentId,
+            ];
+        }
+
        return $result;
    }

@ -1230,4 +1282,15 @@ class GroupCollector implements GroupCollectorInterface

        return $this;
    }
+
+    /**
+     * @inheritDoc
+     */
+    public function withAttachmentInformation(): GroupCollectorInterface
+    {
+        $this->fields[] = 'attachments.id as attachment_id';
+        $this->joinAttachmentTables();
+
+        return $this;
+    }
 }
--- a/app/Helpers/Collector/GroupCollectorInterface.php
+++ b/app/Helpers/Collector/GroupCollectorInterface.php
@ -57,6 +57,13 @@ interface GroupCollectorInterface
     */
    public function amountLess(string $amount): GroupCollectorInterface;

+    /**
+     * Add basic info on attachments of transactions.
+     *
+     * @return GroupCollectorInterface
+     */
+    public function withAttachmentInformation(): GroupCollectorInterface;
+
    /**
     * Get transactions where the amount is more than.
     *
--- a/app/Http/Controllers/DebugController.php
+++ b/app/Http/Controllers/DebugController.php
@ -118,6 +118,7 @@ class DebugController extends Controller
        $search  = ['~', '#'];
        $replace = ['\~', '# '];

+        $installationId = app('fireflyconfig')->get('installation_id', '')->data;
        $phpVersion     = str_replace($search, $replace, PHP_VERSION);
        $phpOs          = str_replace($search, $replace, PHP_OS);
        $interface      = PHP_SAPI;
@ -126,8 +127,6 @@ class DebugController extends Controller
        $drivers        = implode(', ', DB::availableDrivers());
        $currentDriver  = DB::getDriverName();
        $userAgent      = $request->header('user-agent');
-        $isSandstorm    = var_export(config('firefly.is_sandstorm'), true);
-        $toSandbox      = var_export(config('firefly.bunq_use_sandbox'), true);
        $trustedProxies = config('firefly.trusted_proxies');
        $displayErrors  = ini_get('display_errors');
        $errorReporting = $this->errorReporting((int)ini_get('error_reporting'));
@ -174,9 +173,10 @@ class DebugController extends Controller

        return view(
            'debug', compact(
-            'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'logChannel', 'appLogLevel', 'now', 'drivers', 'currentDriver', 'loginProvider',
-            'userAgent', 'displayErrors', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'isSandstorm', 'trustedProxies', 'toSandbox'
-        )
+                       'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'logChannel', 'appLogLevel', 'now', 'drivers', 'currentDriver',
+                       'loginProvider',
+                       'userAgent', 'displayErrors', 'installationId', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'trustedProxies'
+                   )
        );
    }

--- a/app/Http/Controllers/Transaction/CreateController.php
+++ b/app/Http/Controllers/Transaction/CreateController.php
@ -70,6 +70,12 @@ class CreateController extends Controller
        $service  = app(GroupCloneService::class);
        $newGroup = $service->cloneGroup($group);

+        app('preferences')->mark();
+
+        $title = $newGroup->title ?? $newGroup->transactionJournals->first()->description;
+
+        session()->flash('success', trans('firefly.stored_journal', ['description' => $title]));
+
        return redirect(route('transactions.show', [$newGroup->id]));
    }

--- a/app/Http/Controllers/Transaction/IndexController.php
+++ b/app/Http/Controllers/Transaction/IndexController.php
@ -107,7 +107,8 @@ class IndexController extends Controller
                  ->setPage($page)
                  ->withBudgetInformation()
                  ->withCategoryInformation()
-                  ->withAccountInformation();
+                  ->withAccountInformation()
+                  ->withAttachmentInformation();
        $groups = $collector->getPaginatedGroups();
        $groups->setPath($path);

@ -147,7 +148,8 @@ class IndexController extends Controller
                  ->setPage($page)
                  ->withAccountInformation()
                  ->withBudgetInformation()
-                  ->withCategoryInformation();
+                  ->withCategoryInformation()
+                  ->withAttachmentInformation();
        $groups = $collector->getPaginatedGroups();
        $groups->setPath($path);

--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Account.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/AccountMeta.php
+++ b/app/Models/AccountMeta.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AccountMeta.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/AccountType.php
+++ b/app/Models/AccountType.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AccountType.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/Attachment.php
+++ b/app/Models/Attachment.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Attachment.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/AvailableBudget.php
+++ b/app/Models/AvailableBudget.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AvailableBudget.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Bill.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/Budget.php
+++ b/app/Models/Budget.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Budget.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/BudgetLimit.php
+++ b/app/Models/BudgetLimit.php
@ -1,7 +1,7 @@
 <?php
 /**
 * BudgetLimit.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Category.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Configuration.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/CurrencyExchangeRate.php
+++ b/app/Models/CurrencyExchangeRate.php
@ -1,7 +1,7 @@
 <?php
 /**
 * CurrencyExchangeRate.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/ImportJob.php
+++ b/app/Models/ImportJob.php
@ -1,7 +1,7 @@
 <?php
 /**
 * ImportJob.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/LinkType.php
+++ b/app/Models/LinkType.php
@ -1,7 +1,7 @@
 <?php
 /**
 * LinkType.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Location.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/Note.php
+++ b/app/Models/Note.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Note.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@ -1,7 +1,7 @@
 <?php
 /**
 * PiggyBank.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/PiggyBankEvent.php
+++ b/app/Models/PiggyBankEvent.php
@ -1,7 +1,7 @@
 <?php
 /**
 * PiggyBankEvent.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/PiggyBankRepetition.php
+++ b/app/Models/PiggyBankRepetition.php
@ -1,7 +1,7 @@
 <?php
 /**
 * PiggyBankRepetition.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Preference.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/Recurrence.php
+++ b/app/Models/Recurrence.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Recurrence.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/RecurrenceMeta.php
+++ b/app/Models/RecurrenceMeta.php
@ -1,7 +1,7 @@
 <?php
 /**
 * RecurrenceMeta.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/RecurrenceRepetition.php
+++ b/app/Models/RecurrenceRepetition.php
@ -1,7 +1,7 @@
 <?php
 /**
 * RecurrenceRepetition.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/RecurrenceTransaction.php
+++ b/app/Models/RecurrenceTransaction.php
@ -1,7 +1,7 @@
 <?php
 /**
 * RecurrenceTransaction.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/RecurrenceTransactionMeta.php
+++ b/app/Models/RecurrenceTransactionMeta.php
@ -1,7 +1,7 @@
 <?php
 /**
 * RecurrenceTransactionMeta.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/Role.php
+++ b/app/Models/Role.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Role.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/Rule.php
+++ b/app/Models/Rule.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Rule.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/RuleAction.php
+++ b/app/Models/RuleAction.php
@ -1,7 +1,7 @@
 <?php
 /**
 * RuleAction.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/RuleGroup.php
+++ b/app/Models/RuleGroup.php
@ -1,7 +1,7 @@
 <?php
 /**
 * RuleGroup.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/RuleTrigger.php
+++ b/app/Models/RuleTrigger.php
@ -1,7 +1,7 @@
 <?php
 /**
 * RuleTrigger.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Tag.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@ -1,7 +1,7 @@
 <?php
 /**
 * Transaction.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/TransactionCurrency.php
+++ b/app/Models/TransactionCurrency.php
@ -1,7 +1,7 @@
 <?php
 /**
 * TransactionCurrency.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/TransactionGroup.php
+++ b/app/Models/TransactionGroup.php
@ -1,7 +1,7 @@
 <?php
 /**
 * TransactionGroup.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@ -1,7 +1,7 @@
 <?php
 /**
 * TransactionJournal.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/TransactionJournalLink.php
+++ b/app/Models/TransactionJournalLink.php
@ -1,7 +1,7 @@
 <?php
 /**
 * TransactionJournalLink.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/TransactionJournalMeta.php
+++ b/app/Models/TransactionJournalMeta.php
@ -1,7 +1,7 @@
 <?php
 /**
 * TransactionJournalMeta.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Models/TransactionType.php
+++ b/app/Models/TransactionType.php
@ -1,7 +1,7 @@
 <?php
 /**
 * TransactionType.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/AccountServiceProvider.php
+++ b/app/Providers/AccountServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AccountServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/AdminServiceProvider.php
+++ b/app/Providers/AdminServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AdminServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AppServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/AttachmentServiceProvider.php
+++ b/app/Providers/AttachmentServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AttachmentServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AuthServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/BillServiceProvider.php
+++ b/app/Providers/BillServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * BillServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/BroadcastServiceProvider.php
+++ b/app/Providers/BroadcastServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * BroadcastServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/BudgetServiceProvider.php
+++ b/app/Providers/BudgetServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * BudgetServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/CategoryServiceProvider.php
+++ b/app/Providers/CategoryServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * CategoryServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/CurrencyServiceProvider.php
+++ b/app/Providers/CurrencyServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * CurrencyServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * EventServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/FireflyServiceProvider.php
+++ b/app/Providers/FireflyServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * FireflyServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/FireflySessionProvider.php
+++ b/app/Providers/FireflySessionProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * FireflySessionProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/ImportServiceProvider.php
+++ b/app/Providers/ImportServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * ImportServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/JournalServiceProvider.php
+++ b/app/Providers/JournalServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * JournalServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/PiggyBankServiceProvider.php
+++ b/app/Providers/PiggyBankServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * PiggyBankServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/RecurringServiceProvider.php
+++ b/app/Providers/RecurringServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * RecurringServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * RouteServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/RuleGroupServiceProvider.php
+++ b/app/Providers/RuleGroupServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * RuleGroupServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/RuleServiceProvider.php
+++ b/app/Providers/RuleServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * RuleServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/SearchServiceProvider.php
+++ b/app/Providers/SearchServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * SearchServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/SessionServiceProvider.php
+++ b/app/Providers/SessionServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * SessionServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Providers/TagServiceProvider.php
+++ b/app/Providers/TagServiceProvider.php
@ -1,7 +1,7 @@
 <?php
 /**
 * TagServiceProvider.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AccountRepository.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Repositories/Account/AccountRepositoryInterface.php
+++ b/app/Repositories/Account/AccountRepositoryInterface.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AccountRepositoryInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Repositories/Account/AccountTasker.php
+++ b/app/Repositories/Account/AccountTasker.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AccountTasker.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Repositories/Account/AccountTaskerInterface.php
+++ b/app/Repositories/Account/AccountTaskerInterface.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AccountTaskerInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Repositories/Account/OperationsRepository.php
+++ b/app/Repositories/Account/OperationsRepository.php
@ -1,7 +1,7 @@
 <?php
 /**
 * OperationsRepository.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Repositories/Account/OperationsRepositoryInterface.php
+++ b/app/Repositories/Account/OperationsRepositoryInterface.php
@ -1,7 +1,7 @@
 <?php
 /**
 * OperationsRepositoryInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Repositories/Attachment/AttachmentRepository.php
+++ b/app/Repositories/Attachment/AttachmentRepository.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AttachmentRepository.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php
+++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AttachmentRepositoryInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Repositories/Bill/BillRepository.php
+++ b/app/Repositories/Bill/BillRepository.php
@ -1,7 +1,7 @@
 <?php
 /**
 * BillRepository.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Repositories/Bill/BillRepositoryInterface.php
+++ b/app/Repositories/Bill/BillRepositoryInterface.php
@ -1,7 +1,7 @@
 <?php
 /**
 * BillRepositoryInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Repositories/Budget/AvailableBudgetRepository.php
+++ b/app/Repositories/Budget/AvailableBudgetRepository.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AvailableBudgetRepository.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php
+++ b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php
@ -1,7 +1,7 @@
 <?php
 /**
 * AvailableBudgetRepositoryInterface.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2019 james@firefly-iii.org
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
--- a/Show More
+++ b/Show More