Update email address

app/Events/AdminRequestedTestMessage.php

@@ -2,7 +2,7 @@
 
 /**
  * AdminRequestedTestMessage.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).
  *

app/Events/Event.php

@@ -2,7 +2,7 @@
 
 /**
  * Event.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).
  *

app/Events/RegisteredUser.php

@@ -2,7 +2,7 @@
 
 /**
  * RegisteredUser.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).
  *

app/Events/RequestedNewPassword.php

@@ -2,7 +2,7 @@
 
 /**
  * RequestedNewPassword.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).
  *

app/Events/RequestedReportOnJournals.php

@@ -2,7 +2,7 @@
 
 /**
  * RequestedReportOnJournals.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).
  *

app/Events/RequestedVersionCheckStatus.php

@@ -2,7 +2,7 @@
 
 /**
  * RequestedVersionCheckStatus.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).
  *

app/Events/StoredTransactionGroup.php

@@ -2,7 +2,7 @@
 
 /**
  * StoredTransactionGroup.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).
  *

app/Events/UpdatedTransactionGroup.php

@@ -2,7 +2,7 @@
 
 /**
  * UpdatedTransactionGroup.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).
  *

app/Events/UserChangedEmail.php

@@ -2,7 +2,7 @@
 
 /**
  * UserChangedEmail.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).
  *

resources/assets/js/app.js

@@ -1,6 +1,6 @@
 /*
  * app.js
- * 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).
  *

resources/assets/js/bootstrap.js

@@ -1,6 +1,6 @@
 /*
  * bootstrap.js
- * 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).
  *

resources/assets/js/components/ExampleComponent.vue

@@ -1,6 +1,6 @@
 <!--
   - ExampleComponent.vue
-  - 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).
   -

resources/assets/js/components/SomeTestComponent.vue

@@ -1,6 +1,6 @@
 <!--
   - SomeTestComponent.vue
-  - 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).
   -

resources/assets/js/components/bills/Index.vue

@@ -1,6 +1,6 @@
 <!--
   - Index.vue
-  - 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).
   -

resources/assets/js/components/passport/AuthorizedClients.vue

@@ -1,6 +1,6 @@
 <!--
   - AuthorizedClients.vue
-  - 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).
   -

resources/assets/js/components/passport/Clients.vue

@@ -1,6 +1,6 @@
 <!--
   - Clients.vue
-  - 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).
   -

resources/assets/js/components/passport/PersonalAccessTokens.vue

@@ -1,6 +1,6 @@
 <!--
   - PersonalAccessTokens.vue
-  - 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).
   -

resources/assets/js/components/profile/ProfileOptions.vue

@@ -1,6 +1,6 @@
 <!--
   - ProfileOptions.vue
-  - Copyright (c) 2020 thegrumpydictator@gmail.com
+  - Copyright (c) 2020 james@firefly-iii.org
   -
   - This file is part of Firefly III (https://github.com/firefly-iii).
   -

resources/assets/js/components/transactions/AccountSelect.vue

@@ -1,6 +1,6 @@
 <!--
   - AccountSelect.vue
-  - 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).
   -

resources/assets/js/components/transactions/Amount.vue

@@ -1,6 +1,6 @@
 <!--
   - Amount.vue
-  - 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).
   -

resources/assets/js/components/transactions/Budget.vue

@@ -1,7 +1,7 @@
 
 <!--
   - Budget.vue
-  - 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).
   -

resources/assets/js/components/transactions/Category.vue

@@ -1,6 +1,6 @@
 <!--
   - Category.vue
-  - 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).
   -

resources/assets/js/components/transactions/CreateTransaction.vue

@@ -1,6 +1,6 @@
 <!--
   - CreateTransaction.vue
-  - 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).
   -

resources/assets/js/components/transactions/CustomAttachments.vue

@@ -1,6 +1,6 @@
 <!--
   - CustomAttachments.vue
-  - 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).
   -

resources/assets/js/components/transactions/CustomDate.vue

@@ -1,6 +1,6 @@
 <!--
   - CustomDate.vue
-  - 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).
   -

resources/assets/js/components/transactions/CustomString.vue

@@ -1,6 +1,6 @@
 <!--
   - CustomString.vue
-  - 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).
   -

resources/assets/js/components/transactions/CustomTextarea.vue

@@ -1,6 +1,6 @@
 <!--
   - CustomTextarea.vue
-  - 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).
   -

resources/assets/js/components/transactions/CustomTransactionFields.vue

@@ -1,6 +1,6 @@
 <!--
   - CustomTransactionFields.vue
-  - 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).
   -

resources/assets/js/components/transactions/EditTransaction.vue

@@ -1,6 +1,6 @@
 <!--
   - EditTransaction.vue
-  - 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).
   -

resources/assets/js/components/transactions/ForeignAmountSelect.vue

@@ -1,6 +1,6 @@
 <!--
   - ForeignAmountSelect.vue
-  - 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).
   -

resources/assets/js/components/transactions/GroupDescription.vue

@@ -1,6 +1,6 @@
 <!--
   - GroupDescription.vue
-  - 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).
   -

resources/assets/js/components/transactions/PiggyBank.vue

@@ -1,6 +1,6 @@
 <!--
   - PiggyBank.vue
-  - 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).
   -

resources/assets/js/components/transactions/StandardDate.vue

@@ -1,6 +1,6 @@
 <!--
   - StandardDate.vue
-  - 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).
   -

resources/assets/js/components/transactions/Tags.vue

@@ -1,6 +1,6 @@
 <!--
   - Tags.vue
-  - 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).
   -

resources/assets/js/components/transactions/TransactionDescription.vue

@@ -1,6 +1,6 @@
 <!--
   - TransactionDescription.vue
-  - 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).
   -

resources/assets/js/components/transactions/TransactionType.vue

@@ -1,6 +1,6 @@
 <!--
   - TransactionType.vue
-  - 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).
   -

resources/assets/js/create_transaction.js

@@ -1,6 +1,6 @@
 /*
  * app.js
- * 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).
  *

resources/assets/js/edit_transaction.js

@@ -1,6 +1,6 @@
 /*
  * app.js
- * 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).
  *

resources/assets/js/profile.js

@@ -1,6 +1,6 @@
 /*
  * app.js
- * 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).
  *

resources/assets/sass/_variables.scss

@@ -1,6 +1,6 @@
 /*!
  * _variables.scss
- * 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).
  *

resources/assets/sass/app.scss

@@ -1,6 +1,6 @@
 /*!
  * app.scss
- * 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).
  *

resources/lang/en_US/api.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * api.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).
  *

resources/lang/en_US/auth.php

@@ -2,7 +2,7 @@
 
 /**
  * auth.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).
  *

resources/lang/en_US/bank.php

@@ -2,7 +2,7 @@
 
 /**
  * bank.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).
  *

resources/lang/en_US/breadcrumbs.php

@@ -2,7 +2,7 @@
 
 /**
  * breadcrumbs.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).
  *

resources/lang/en_US/components.php

@@ -2,7 +2,7 @@
 
 /**
  * components.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).
  *

resources/lang/en_US/config.php

@@ -2,7 +2,7 @@
 
 /**
  * config.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).
  *

resources/lang/en_US/csv.php

@@ -2,7 +2,7 @@
 
 /**
  * csv.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).
  *

resources/lang/en_US/demo.php

@@ -2,7 +2,7 @@
 
 /**
  * demo.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).
  *

resources/lang/en_US/firefly.php

@@ -2,7 +2,7 @@
 
 /**
  * firefly.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).
  *
@@ -309,6 +309,7 @@ return [
     'make_new_rule'                              => 'Make a new rule in rule group ":title"',
     'make_new_rule_no_group'                     => 'Make a new rule',
     'instructions_rule_from_bill'                => 'In order to match transactions to your new bill ":name", Firefly III can create a rule that will automatically be checked against any transactions you store. Please verify the details below and store the rule to have Firefly III automatically match transactions to your new bill.',
+    'instructions_rule_from_journal'             => 'Create a rule based on one of your transactions. Complement or submit the form below.',
     'rule_is_strict'                             => 'strict rule',
     'rule_is_not_strict'                         => 'non-strict rule',
     'rule_help_stop_processing'                  => 'When you check this box, later rules in this group will not be executed.',
@@ -493,6 +494,9 @@ return [
     'new_rule_for_bill_title'         => 'Rule for bill ":name"',
     'new_rule_for_bill_description'   => 'This rule marks transactions for bill ":name".',
 
+    'new_rule_for_journal_title'         => 'Rule based on transaction ":description"',
+    'new_rule_for_journal_description'   => 'This rule is based on transaction ":description". It will match transactions that are exactly the same.',
+
     // tags
     'store_new_tag'                   => 'Store new tag',
     'update_tag'                      => 'Update tag',

resources/lang/en_US/form.php

@@ -2,7 +2,7 @@
 
 /**
  * form.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).
  *

resources/lang/en_US/import.php

@@ -2,7 +2,7 @@
 
 /**
  * import.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).
  *

resources/lang/en_US/intro.php

@@ -2,7 +2,7 @@
 
 /**
  * intro.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).
  *

resources/lang/en_US/list.php

@@ -2,7 +2,7 @@
 
 /**
  * list.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).
  *

resources/lang/en_US/pagination.php

@@ -2,7 +2,7 @@
 
 /**
  * pagination.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).
  *

resources/lang/en_US/passwords.php

@@ -2,7 +2,7 @@
 
 /**
  * passwords.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).
  *

resources/lang/en_US/validation.php

@@ -2,7 +2,7 @@
 
 /**
  * validation.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).
  *

resources/views/v1/emails/error-html.twig

@@ -32,7 +32,7 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
     The full stacktrace is below. If you think this is a bug in Firefly III, you
     can forward this message to
-    <a href="mailto:thegrumpydictator@gmail.com?subject=BUG!">thegrumpydictator@gmail.com</a>.
+    <a href="mailto:james@firefly-iii.org?subject=BUG!">james@firefly-iii.org</a>.
     This can help fix the bug you just encountered.
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">

resources/views/v1/emails/error-text.twig

@@ -18,7 +18,7 @@ URL is: {{ url }}
 User agent: {{ userAgent }}
 
 The full stacktrace is below. If you think this is a bug in Firefly III, you
-can forward this message to thegrumpydictator@gmail.com. This can help fix
+can forward this message to james@firefly-iii.org. This can help fix
 the bug you just encountered.
 
 If you prefer, you can also open a new issue here:

resources/views/v1/error.twig

@@ -19,7 +19,7 @@
             <p>
                 If you do not know how to handle this error, please open an issue on
                 <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>
-                or <a href="mailto:thegrumpydictator@gmail.com">send me a message</a>.
+                or <a href="mailto:james@firefly-iii.org">send me a message</a>.
             </p>
         </div>
     </div>