diff --git a/public/js/ff/transactions/list.js b/public/js/ff/transactions/list.js
index fa5fc55946..bed2fceeb5 100644
--- a/public/js/ff/transactions/list.js
+++ b/public/js/ff/transactions/list.js
@@ -67,7 +67,7 @@ function goToMassEdit() {
baseHref = bases[0].href;
}
- window.location.href = baseHref + '/transactions/mass/edit/' + checkedArray;
+ window.location.href = baseHref + 'transactions/mass/edit/' + checkedArray;
return false;
}
@@ -87,7 +87,7 @@ function goToBulkEdit() {
baseHref = bases[0].href;
}
- window.location.href = baseHref + '/transactions/bulk/edit/' + checkedArray;
+ window.location.href = baseHref + 'transactions/bulk/edit/' + checkedArray;
return false;
}
@@ -106,7 +106,7 @@ function goToMassDelete() {
if (bases.length > 0) {
baseHref = bases[0].href;
}
- window.location.href = baseHref + '/transactions/mass/delete/' + checkedArray;
+ window.location.href = baseHref + 'transactions/mass/delete/' + checkedArray;
return false;
}
@@ -229,4 +229,4 @@ function startMassSelect() {
$('.mass_reconcile').hide();
return false;
-}
\ No newline at end of file
+}
diff --git a/resources/views/errors/404.twig b/resources/views/errors/404.twig
index b6e64f8c95..bfbeeae6c3 100644
--- a/resources/views/errors/404.twig
+++ b/resources/views/errors/404.twig
@@ -7,9 +7,18 @@
-
+
+ {# libraries #}
+
+
+
+ {# the theme #}
+
+
+ {# Firefly III customisations #}
+
{% include('partials.favicons') %}
diff --git a/tests/Unit/Handlers/Events/UserEventHandlerTest.php b/tests/Unit/Handlers/Events/UserEventHandlerTest.php
index cb93f505db..d4bd010378 100644
--- a/tests/Unit/Handlers/Events/UserEventHandlerTest.php
+++ b/tests/Unit/Handlers/Events/UserEventHandlerTest.php
@@ -81,7 +81,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->user();
- $event = new Login($user, true);
+ $event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff
@@ -99,7 +99,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->emptyUser();
- $event = new Login($user, true);
+ $event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff
@@ -121,7 +121,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->emptyUser();
- $event = new Login($user, true);
+ $event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff
@@ -141,7 +141,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->user();
- $event = new Login($user, true);
+ $event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff
@@ -159,7 +159,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->emptyUser();
- $event = new Login($user, true);
+ $event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff