Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Replace version with build time.
James Colecaf9a31bc482
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.phpindex 1f39963a53..3a148e0168 100644--- a/app/Http/Controllers/Controller.php+++ b/app/Http/Controllers/Controller.php@@ -77,6 +77,7 @@ abstract class Controller extends BaseControllerView::share('DEMO_USERNAME', config('firefly.demo_username'));View::share('DEMO_PASSWORD', config('firefly.demo_password'));View::share('FF_VERSION', config('firefly.version'));+ View::share('FF_BUILD_TIME', config('firefly.build_time'));// is webhooks enabled?View::share('featuringWebhooks', true === config('firefly.feature_flags.webhooks') && true === config('firefly.allow_webhooks'));diff --git a/resources/views/accounts/create.twig b/resources/views/accounts/create.twigindex c52e127687..36ddda0c9a 100644--- a/resources/views/accounts/create.twig+++ b/resources/views/accounts/create.twig@@ -90,15 +90,15 @@var iAmOwed = '{{ 'i_am_owed_amount'|_|escape('js') }}';var iOwe = '{{ 'i_owe_amount'|_|escape('js') }}';</script>- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/accounts/create.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/accounts/create.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/accounts/edit.twig b/resources/views/accounts/edit.twigindex e5cbdb0266..d8a9b5226f 100644--- a/resources/views/accounts/edit.twig+++ b/resources/views/accounts/edit.twig@@ -122,15 +122,15 @@var iAmOwed = '{{ 'i_am_owed_amount'|_|escape('js') }}';var iOwe = '{{ 'i_owe_amount'|_|escape('js') }}';</script>- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/accounts/edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/accounts/edit.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/accounts/index.twig b/resources/views/accounts/index.twigindex e8e12dd7a8..213aacf9be 100644--- a/resources/views/accounts/index.twig+++ b/resources/views/accounts/index.twig@@ -90,6 +90,6 @@<script type="text/javascript" nonce="{{ JS_NONCE }}">var objectType = '{{ objectType|escape }}';</script>- <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" nonce="{{ JS_NONCE }}" src="v1/js/ff/accounts/index.js?v={{ FF_VERSION }}"></script>+ <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" nonce="{{ JS_NONCE }}" src="v1/js/ff/accounts/index.js?v={{ FF_BUILD_TIME }}"></script>{% endblock %}diff --git a/resources/views/accounts/reconcile/index.twig b/resources/views/accounts/reconcile/index.twigindex 5cef87c7af..4ed4a2ae88 100644--- a/resources/views/accounts/reconcile/index.twig+++ b/resources/views/accounts/reconcile/index.twig@@ -133,5 +133,5 @@var indexUrl = '{{ indexUrl }}';var selectRangeAndBalance = '{{ 'select_range_and_balance'|_|escape('js') }}';</script>- <script src="v1/js/ff/accounts/reconcile.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/ff/accounts/reconcile.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twigindex 6a79e5fbbc..190d0f630b 100644--- a/resources/views/accounts/show.twig+++ b/resources/views/accounts/show.twig@@ -219,25 +219,25 @@</script>{% if location %}- <script src="v1/lib/leaflet/leaflet.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/lib/leaflet/leaflet.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endif %}- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>- <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>- <script src="v1/js/lib/jquery.color-2.1.2.min.js?v={{ FF_VERSION }}" type="text/javascript"+ <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/lib/jquery.color-2.1.2.min.js?v={{ FF_BUILD_TIME }}" type="text/javascript"nonce="{{ JS_NONCE }}"></script>- <script src="v1/js/ff/accounts/show.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/ff/accounts/show.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>{# required for groups.twig #}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}{% if location %}- <link rel="stylesheet" href="v1/lib/leaflet/leaflet.css?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}">+ <link rel="stylesheet" href="v1/lib/leaflet/leaflet.css?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}">{% endif %}{% endblock %}diff --git a/resources/views/attachments/index.twig b/resources/views/attachments/index.twigindex 307c3f1823..28e67eb014 100644--- a/resources/views/attachments/index.twig+++ b/resources/views/attachments/index.twig@@ -68,10 +68,10 @@</div>{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twigindex cdab3ccef1..46342c9120 100644--- a/resources/views/bills/create.twig+++ b/resources/views/bills/create.twig@@ -68,17 +68,17 @@{% endblock %}{% block styles %}- <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">+ <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/bills/create.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/bills/create.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{# auto complete for object groups #}- <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/bills/edit.twig b/resources/views/bills/edit.twigindex 4620647039..9e2c3e33a5 100644--- a/resources/views/bills/edit.twig+++ b/resources/views/bills/edit.twig@@ -74,24 +74,24 @@{% endblock %}{% block styles %}- <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all"+ <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all"nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/accounts/edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/accounts/edit.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{# auto complete for object groups #}- <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twigindex 49a2905d5d..abb3a8f454 100644--- a/resources/views/bills/index.twig+++ b/resources/views/bills/index.twig@@ -41,6 +41,6 @@{% endblock %}{% block scripts %}- <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/bills/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/bills/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twigindex ec55e97220..84b4c347bb 100644--- a/resources/views/bills/show.twig+++ b/resources/views/bills/show.twig@@ -188,10 +188,10 @@var billCurrencySymbol = "{{ convertToPrimary ? primaryCurrency.symbol : object.data.currency.symbol }}";var billUrl = '{{ route('chart.bill.single', [object.data.id]) }}';</script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/bills/show.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/bills/show.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{# required for groups.twig #}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/budgets/create.twig b/resources/views/budgets/create.twigindex fd1e014b48..576eca9665 100644--- a/resources/views/budgets/create.twig+++ b/resources/views/budgets/create.twig@@ -60,5 +60,5 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/ff/budgets/create.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/budgets/create.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/budgets/edit.twig b/resources/views/budgets/edit.twigindex ebe8d604b7..5f78e91ebc 100644--- a/resources/views/budgets/edit.twig+++ b/resources/views/budgets/edit.twig@@ -61,5 +61,5 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/ff/budgets/edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/budgets/edit.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twigindex 4ee60e68a4..014742cc74 100644--- a/resources/views/budgets/index.twig+++ b/resources/views/budgets/index.twig@@ -465,11 +465,11 @@{% endblock %}{% block styles %}- <link href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">+ <link href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">{% endblock %}{% block scripts %}- <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">// index route.@@ -488,6 +488,6 @@var periodStart = "{{ start.format('Y-m-d') }}";var periodEnd = "{{ end.format('Y-m-d') }}";</script>- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/budgets/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/budgets/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twigindex ac5fcf44cc..3b48d8ed79 100644--- a/resources/views/budgets/no-budget.twig+++ b/resources/views/budgets/no-budget.twig@@ -60,5 +60,5 @@{% endblock %}{% block scripts %}{# required for groups.twig #}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twigindex 8f3c53aefa..5b2915d575 100644--- a/resources/views/budgets/show.twig+++ b/resources/views/budgets/show.twig@@ -230,10 +230,10 @@{% endif %}</script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/budgets/show.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/budgets/show.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{# required for groups.twig #}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/categories/create.twig b/resources/views/categories/create.twigindex 0556ac39ba..1301ef0f45 100644--- a/resources/views/categories/create.twig+++ b/resources/views/categories/create.twig@@ -53,5 +53,5 @@</form>{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/ff/budgets/create.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/budgets/create.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/categories/edit.twig b/resources/views/categories/edit.twigindex aa9b6263d6..8d9e7b863a 100644--- a/resources/views/categories/edit.twig+++ b/resources/views/categories/edit.twig@@ -59,5 +59,5 @@</form>{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/ff/categories/edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/categories/edit.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/categories/index.twig b/resources/views/categories/index.twigindex cefb5c0df2..e4e19944ac 100644--- a/resources/views/categories/index.twig+++ b/resources/views/categories/index.twig@@ -40,10 +40,10 @@{% endblock %}{% block styles %}- <link href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">+ <link href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/categories/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/categories/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twigindex 7dde51d679..e616ae72cb 100644--- a/resources/views/categories/no-category.twig+++ b/resources/views/categories/no-category.twig@@ -60,5 +60,5 @@{% endblock %}{% block scripts %}{# required for groups.twig #}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twigindex 5a8563356e..b0b0788130 100644--- a/resources/views/categories/show.twig+++ b/resources/views/categories/show.twig@@ -113,10 +113,10 @@var everything = '{{ route('chart.category.all', [category.id]) }}';var specific = '{{ route('chart.category.specific', [category.id, start.format('Ymd')]) }}';</script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/categories/show.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/categories/show.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{# required for groups.twig #}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/currencies/index.twig b/resources/views/currencies/index.twigindex c05c82ea20..abe1ea20e5 100644--- a/resources/views/currencies/index.twig+++ b/resources/views/currencies/index.twig@@ -98,5 +98,5 @@var redirectUrl = "{{ route('currencies.index') }}";var updateCurrencyUrl = "{{ route('api.v1.currencies.update', ['']) }}";</script>- <script type="text/javascript" src="v1/js/ff/currencies/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/currencies/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/index.twig b/resources/views/index.twigindex ec0655f809..58ad2587cb 100644--- a/resources/views/index.twig+++ b/resources/views/index.twig@@ -211,14 +211,14 @@{% endif %}</script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}{% endblock %}diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twigindex db253c4ec8..11112c6e64 100644--- a/resources/views/layout/default.twig+++ b/resources/views/layout/default.twig@@ -29,14 +29,14 @@</title><meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>{# CSS things #}- <link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}">- <link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}">{# the theme #}- <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}">{% if 'browser' == darkMode %}<script nonce="{{ JS_NONCE }}">@@ -46,43 +46,43 @@document.documentElement.style.display = 'none';document.head.insertAdjacentHTML('beforeend',- '<link rel="stylesheet" href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}" onload="document.documentElement.style.display = \'\'">',+ '<link rel="stylesheet" href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}" onload="document.documentElement.style.display = \'\'">',);}</script>- <link href="v1/css/daterangepicker-default.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/css/daterangepicker-default.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}">- <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: dark)">- <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: light)">{% endif %}{% if 'dark' == darkMode %}- <link href="v1/css/daterangepicker-dark.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/css/daterangepicker-dark.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}">- <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}">{% endif %}{% if 'light' == darkMode %}- <link href="v1/css/daterangepicker-light.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/css/daterangepicker-light.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}">- <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}">{% endif %}{# Firefly III customisations #}- <link href="v1/css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/css/firefly.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">{# Extra CSS for the demo: #}{% if not shownDemo %}- <link href="v1/lib/intro/introjs.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/lib/intro/introjs.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}">{% endif %}{# Any local custom CSS. #}{% block styles %}{% endblock %}<!--[if lt IE 9]>- <script src="v1/js/lib/html5shiv.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script src="v1/js/lib/respond.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/lib/html5shiv.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/lib/respond.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><![endif]-->{# this entry is in the header so it's loaded early #}@@ -228,8 +228,8 @@{% block definitions %}{% endblock %}{# Moment JS #}-<script src="v1/js/lib/moment.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>-<script src="v1/js/lib/moment/{{ language|replace({'-':'_'}) }}.js?v={{ FF_VERSION }}" type="text/javascript"+<script src="v1/js/lib/moment.min.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+<script src="v1/js/lib/moment/{{ language|replace({'-':'_'}) }}.js?v={{ FF_BUILD_TIME }}" type="text/javascript"nonce="{{ JS_NONCE }}"></script>{# All kinds of variables. #}@@ -238,32 +238,32 @@type="text/javascript" nonce="{{ JS_NONCE }}"></script>{# Base script: jquery and bootstrap #}-<script src="v1/js/app.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+<script src="v1/js/app.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>{# Vue scripts and components. Only loaded when needed #}{% if VUE_SCRIPT_NAME %}- <script src="v1/js/app_vue.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>- <script src="v1/js/{{ VUE_SCRIPT_NAME }}.js?v={{ FF_VERSION }}" type="text/javascript"+ <script src="v1/js/app_vue.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/{{ VUE_SCRIPT_NAME }}.js?v={{ FF_BUILD_TIME }}" type="text/javascript"nonce="{{ JS_NONCE }}"></script>{% endif %}{# date range picker, current template, etc. #}-<script src="v1/js/lib/daterangepicker.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>-<script src="v1/lib/adminlte/js/adminlte.min.js?v={{ FF_VERSION }}" type="text/javascript"+<script src="v1/js/lib/daterangepicker.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+<script src="v1/lib/adminlte/js/adminlte.min.js?v={{ FF_BUILD_TIME }}" type="text/javascript"nonce="{{ JS_NONCE }}"></script>-<script type="text/javascript" src="v1/js/lib/accounting.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+<script type="text/javascript" src="v1/js/lib/accounting.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{# Firefly III code #}-<script type="text/javascript" src="v1/js/ff/firefly.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>-<script type="text/javascript" src="v1/js/ff/help.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+<script type="text/javascript" src="v1/js/ff/firefly.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+<script type="text/javascript" src="v1/js/ff/help.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% if not shownDemo %}<script type="text/javascript" nonce="{{ JS_NONCE }}">var routeForTour = "{{ current_route_name }}";var routeStepsUrl = "{{ route('json.intro', [current_route_name, objectType|default("")]) }}";var routeForFinishedTour = "{{ route('json.intro.finished', [current_route_name, objectType|default("")]) }}";</script>- <script type="text/javascript" src="v1/lib/intro/intro.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/intro/intro.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/lib/intro/intro.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/intro/intro.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endif %}{% block scripts %}{% endblock %}diff --git a/resources/views/layout/empty.twig b/resources/views/layout/empty.twigindex 444a336971..4b28679032 100644--- a/resources/views/layout/empty.twig+++ b/resources/views/layout/empty.twig@@ -14,11 +14,11 @@{# CSS things #}{# libraries #}- <link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">- <link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">{# the theme #}- <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">{% if 'browser' == darkMode %}<script nonce="{{ JS_NONCE }}">// If `prefers-color-scheme` is not supported, fall back to light mode.@@ -27,26 +27,26 @@document.documentElement.style.display = 'none';document.head.insertAdjacentHTML('beforeend',- '<link rel="stylesheet" href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}" onload="document.documentElement.style.display = \'\'">',+ '<link rel="stylesheet" href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}" onload="document.documentElement.style.display = \'\'">',);}</script>- <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: dark)">- <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: light)">+ <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: dark)">+ <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: light)">{% endif %}{% if 'dark' == darkMode %}- <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">{% endif %}{% if 'light' == darkMode %}- <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">{% endif %}{# Firefly III customisations #}- <link href="v1/css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/css/firefly.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}"><!--[if lt IE 9]>- <script src="v1/js/lib/html5shiv.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script src="v1/js/lib/respond.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/lib/html5shiv.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/lib/respond.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><![endif]-->{# favicons #}@@ -61,7 +61,7 @@{% block content %}{% endblock %}</div>-<script src="v1/js/app.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+<script src="v1/js/app.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>{% if config('firefly.tracker_site_id') != '' and config('firefly.tracker_url') != '' %}<!-- This tracker tag is only here because this instance of Firefly III was purposefully configured to include it -->diff --git a/resources/views/layout/guest.twig b/resources/views/layout/guest.twigindex 889a241aa5..87717a72ba 100644--- a/resources/views/layout/guest.twig+++ b/resources/views/layout/guest.twig@@ -24,11 +24,11 @@{# CSS things #}{# libraries #}- <link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">- <link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">{# the theme #}- <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">{% if 'browser' == darkMode %}<script nonce="{{ JS_NONCE }}">// If `prefers-color-scheme` is not supported, fall back to light mode.@@ -37,26 +37,26 @@document.documentElement.style.display = 'none';document.head.insertAdjacentHTML('beforeend',- '<link rel="stylesheet" href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}" onload="document.documentElement.style.display = \'\'">',+ '<link rel="stylesheet" href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}" onload="document.documentElement.style.display = \'\'">',);}</script>- <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: dark)">- <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: light)">+ <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: dark)">+ <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: light)">{% endif %}{% if 'dark' == darkMode %}- <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">{% endif %}{% if 'light' == darkMode %}- <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">{% endif %}{# Firefly III customisations #}- <link href="v1/css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/css/firefly.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}"><!--[if lt IE 9]>- <script src="v1/js/lib/html5shiv.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script src="v1/js/lib/respond.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/lib/html5shiv.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/lib/respond.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><![endif]-->{# favicons #}@@ -75,8 +75,8 @@Developed by James Cole, the source code is licensed under the <a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL-3.0-or-later</a>.</small></div>-<script src="v1/js/app.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>-<script type="text/javascript" src="v1/js/ff/guest.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+<script src="v1/js/app.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+<script type="text/javascript" src="v1/js/ff/guest.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% if config('firefly.tracker_site_id') != '' and config('firefly.tracker_url') != '' %}<!-- This tracker tag is only here because this instance of Firefly III was purposefully configured to include it -->diff --git a/resources/views/layout/install.twig b/resources/views/layout/install.twigindex 29e7bc88a8..7693e2265d 100644--- a/resources/views/layout/install.twig+++ b/resources/views/layout/install.twig@@ -35,8 +35,8 @@Developed by James Cole, the source code is licensed under the <a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL-3.0-or-later</a>.</small></div>-<script src="v1/js/app.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>-<script type="text/javascript" src="v1/js/ff/guest.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+<script src="v1/js/app.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+<script type="text/javascript" src="v1/js/ff/guest.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% block scripts %}{% endblock %}{% if config('firefly.tracker_site_id') != '' and config('firefly.tracker_url') != '' %}<!-- This tracker tag is only here because this instance of Firefly III was purposefully configured to include it -->diff --git a/resources/views/layout/v3/session.twig b/resources/views/layout/v3/session.twigindex 33d893678e..87f52d5937 100644--- a/resources/views/layout/v3/session.twig+++ b/resources/views/layout/v3/session.twig@@ -7,10 +7,10 @@<title>{{ 'login_page_title'|_ }}</title><!-- fonts and styles -->- <link rel="stylesheet" href="v3-local/css/fonts.css?v={{ FF_VERSION }}">- <link rel="stylesheet" href="v3-local/lib/fontawesome-free/css/all.min.css?v={{ FF_VERSION }}">- <link rel="stylesheet" href="v3-local/lib/icheck-bootstrap/icheck-bootstrap.min.css?v={{ FF_VERSION }}">- <link rel="stylesheet" href="v3-local/dist/css/adminlte.min.css?v={{ FF_VERSION }}">+ <link rel="stylesheet" href="v3-local/css/fonts.css?v={{ FF_BUILD_TIME }}">+ <link rel="stylesheet" href="v3-local/lib/fontawesome-free/css/all.min.css?v={{ FF_BUILD_TIME }}">+ <link rel="stylesheet" href="v3-local/lib/icheck-bootstrap/icheck-bootstrap.min.css?v={{ FF_BUILD_TIME }}">+ <link rel="stylesheet" href="v3-local/dist/css/adminlte.min.css?v={{ FF_BUILD_TIME }}">{# favicons #}{% include 'partials.favicons' %}@@ -19,11 +19,11 @@{% block content %}{% endblock %}<!-- jQuery -->-<script src="v3-local/lib/jquery/jquery.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+<script src="v3-local/lib/jquery/jquery.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><!-- Bootstrap 4 -->-<script src="v3-local/lib/bootstrap/js/bootstrap.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+<script src="v3-local/lib/bootstrap/js/bootstrap.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><!-- AdminLTE App -->-<script src="v3-local/dist/js/adminlte.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+<script src="v3-local/dist/js/adminlte.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% block scripts %}{% endblock %}</body>diff --git a/resources/views/object-groups/edit.twig b/resources/views/object-groups/edit.twigindex d6d52e29c6..d64e4645a0 100644--- a/resources/views/object-groups/edit.twig+++ b/resources/views/object-groups/edit.twig@@ -47,21 +47,21 @@</form>{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/piggy-banks/create.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/piggy-banks/create.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>{# auto complete for object groups #}- <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/object-groups/index.twig b/resources/views/object-groups/index.twigindex 80402c7423..aee4a9d578 100644--- a/resources/views/object-groups/index.twig+++ b/resources/views/object-groups/index.twig@@ -70,8 +70,8 @@</div>{% endblock %}{% block scripts %}- <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/object-groups/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/object-groups/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}{% endblock %}diff --git a/resources/views/piggy-banks/create.twig b/resources/views/piggy-banks/create.twigindex 851efe5f2b..9171a49fc7 100644--- a/resources/views/piggy-banks/create.twig+++ b/resources/views/piggy-banks/create.twig@@ -59,16 +59,16 @@</form>{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/piggy-banks/create.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/piggy-banks/create.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{# auto complete for object groups #}- <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twigindex 8489ca8064..2a1e8a8600 100644--- a/resources/views/piggy-banks/edit.twig+++ b/resources/views/piggy-banks/edit.twig@@ -67,21 +67,21 @@</form>{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/piggy-banks/create.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/piggy-banks/create.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>{# auto complete for object groups #}- <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/ff/object-groups/create-edit.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/piggy-banks/index.twig b/resources/views/piggy-banks/index.twigindex 7a25c002d4..29b0acb320 100644--- a/resources/views/piggy-banks/index.twig+++ b/resources/views/piggy-banks/index.twig@@ -75,6 +75,6 @@{% endif %}{% endblock %}{% block scripts %}- <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/piggy-banks/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/piggy-banks/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twigindex 6a5e58f3da..c36632fed5 100644--- a/resources/views/piggy-banks/show.twig+++ b/resources/views/piggy-banks/show.twig@@ -162,8 +162,8 @@var piggyBankID = {{ piggyBank.id }};</script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/piggy-banks/show.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/piggy-banks/show.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/preferences/index.twig b/resources/views/preferences/index.twigindex 13984278d3..2e7895d29d 100644--- a/resources/views/preferences/index.twig+++ b/resources/views/preferences/index.twig@@ -402,16 +402,16 @@<script type="text/javascript" nonce="{{ JS_NONCE }}">var postUrl = "{{ route('preferences.test-notification') }}";</script>- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/preferences/index.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/preferences/index.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/recurring/create.twig b/resources/views/recurring/create.twigindex 2ae827973d..818093fb44 100644--- a/resources/views/recurring/create.twig+++ b/resources/views/recurring/create.twig@@ -205,16 +205,16 @@</div>{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/common/autocomplete.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/ff/common/autocomplete.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/lib/fc/fullcalendar.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/lib/fc/fullcalendar.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">var transactionType = "{{ preFilled.transaction_type }}";@@ -222,17 +222,17 @@var eventsUrl = "{{ route('recurring.events') }}";var oldRepetitionType = "{{ oldRepetitionType }}";</script>- <script type="text/javascript" src="v1/js/ff/recurring/create.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/ff/recurring/create.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all"+ <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all"nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">- <link href="v1/lib/fc/fullcalendar.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all"+ <link href="v1/lib/fc/fullcalendar.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all"nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/recurring/edit.twig b/resources/views/recurring/edit.twigindex 37df0d26b6..eac5847c19 100644--- a/resources/views/recurring/edit.twig+++ b/resources/views/recurring/edit.twig@@ -204,16 +204,16 @@</div>{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/common/autocomplete.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/ff/common/autocomplete.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/lib/fc/fullcalendar.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/lib/fc/fullcalendar.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">var transactionType = "{{ preFilled.transaction_type }}";@@ -221,16 +221,16 @@var eventsUrl = "{{ route('recurring.events') }}";var currentRepType = "{{ currentRepType }}";</script>- <script type="text/javascript" src="v1/js/ff/recurring/edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/recurring/edit.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all"+ <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all"nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">- <link href="v1/lib/fc/fullcalendar.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all"+ <link href="v1/lib/fc/fullcalendar.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all"nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/recurring/index.twig b/resources/views/recurring/index.twigindex a484df4d03..0937b0e2f9 100644--- a/resources/views/recurring/index.twig+++ b/resources/views/recurring/index.twig@@ -158,9 +158,9 @@{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/recurring/show.twig b/resources/views/recurring/show.twigindex b9e2f0893c..ca2d49ee2e 100644--- a/resources/views/recurring/show.twig+++ b/resources/views/recurring/show.twig@@ -213,13 +213,13 @@{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all"+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" media="all"nonce="{{ JS_NONCE }}">{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>{# required for groups.twig #}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twigindex 024f3e6638..4589488ea5 100644--- a/resources/views/reports/audit/report.twig+++ b/resources/views/reports/audit/report.twig@@ -87,6 +87,6 @@<script type="text/javascript" nonce="{{ JS_NONCE }}">var hideable = {{ hideable|json_encode|raw }};</script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/audit/all.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/audit/all.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twigindex faf3a113b5..4ac028ac98 100644--- a/resources/views/reports/budget/month.twig+++ b/resources/views/reports/budget/month.twig@@ -149,10 +149,10 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">// to report another URL:@@ -175,11 +175,11 @@</script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/budget/month.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/budget/month.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twigindex c6a02692f2..99631ead05 100644--- a/resources/views/reports/category/month.twig+++ b/resources/views/reports/category/month.twig@@ -214,12 +214,12 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">// to report another URL:var startDate = '{{ start.format('Ymd') }}';@@ -247,10 +247,10 @@var topIncomeUrl = '{{ route('report-data.category.top-income', [accountIds, categoryIds, start.format('Ymd'), end.format('Ymd')]) }}';</script>- <script type="text/javascript" src="v1/js/ff/reports/category/month.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/category/month.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twigindex 687c45a1d4..346f20d521 100644--- a/resources/views/reports/default/month.twig+++ b/resources/views/reports/default/month.twig@@ -142,14 +142,14 @@</div>{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">var year = {{ start.year }};var month = {{ start.month }};@@ -172,7 +172,7 @@var accountChartUrl = '{{ route('chart.account.report', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';</script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/default/all.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/default/month.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/default/all.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/default/month.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twigindex be76587ad0..fc2e5a00b5 100644--- a/resources/views/reports/default/multi-year.twig+++ b/resources/views/reports/default/multi-year.twig@@ -185,14 +185,14 @@{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">var year = {{ start.year }};var month = {{ start.month }};@@ -216,7 +216,7 @@var billReportUrl = '';</script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/default/all.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/default/multi-year.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/default/all.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/default/multi-year.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twigindex a11196ffb5..eb7198d562 100644--- a/resources/views/reports/default/year.twig+++ b/resources/views/reports/default/year.twig@@ -184,10 +184,10 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">var year = '{{ start.year }}';@@ -210,11 +210,11 @@var billReportUrl = '';</script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/default/all.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/default/year.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/default/all.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/default/year.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/reports/double/report.twig b/resources/views/reports/double/report.twigindex 602d2b1de2..ca6016fef2 100644--- a/resources/views/reports/double/report.twig+++ b/resources/views/reports/double/report.twig@@ -192,10 +192,10 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">// to report another URL:@@ -222,11 +222,11 @@var topIncomeUrl = '{{ route('report-data.double.top-income', [accountIds, doubleIds, start.format('Ymd'), end.format('Ymd')]) }}';</script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/double/month.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/double/month.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twigindex 15acad7e56..e8970f3e53 100644--- a/resources/views/reports/index.twig+++ b/resources/views/reports/index.twig@@ -189,7 +189,7 @@{% endblock %}{% block styles %}- <link href="v1/css/bootstrap-multiselect.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/css/bootstrap-multiselect.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">{% endblock %}{% block scripts %}@@ -202,7 +202,7 @@var allSelectedText = "{{ trans('firefly.multi_select_all_selected')|escape('js') }}";var filterPlaceholder = "{{ trans('firefly.multi_select_filter_placeholder')|escape('js') }}";</script>- <script type="text/javascript" src="v1/js/lib/bootstrap-multiselect.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-multiselect.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/reports/tag/month.twig b/resources/views/reports/tag/month.twigindex 56ffbf775b..9e06bcb200 100644--- a/resources/views/reports/tag/month.twig+++ b/resources/views/reports/tag/month.twig@@ -245,12 +245,12 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">// to report another URL:var startDate = '{{ start.format('Ymd') }}';@@ -280,10 +280,10 @@var topIncomeUrl = '{{ route('report-data.tag.top-income', [accountIds, tagIds, start.format('Ymd'), end.format('Ymd')]) }}';</script>- <script type="text/javascript" src="v1/js/ff/reports/tag/month.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/reports/tag/month.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twigindex 62adc40fd3..6082d40141 100644--- a/resources/views/rules/index.twig+++ b/resources/views/rules/index.twig@@ -212,6 +212,6 @@var moveRuleGroupUrl = '{{ route('rule-groups.move') }}';var duplicateRuleUrl = '{{ route('rules.duplicate') }}';</script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/rules/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/rules/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/rules/rule-group/create.twig b/resources/views/rules/rule-group/create.twigindex dd4d212683..69c4311765 100644--- a/resources/views/rules/rule-group/create.twig+++ b/resources/views/rules/rule-group/create.twig@@ -52,5 +52,5 @@</form>{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/ff/rule-groups/create.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/rule-groups/create.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/rules/rule-group/edit.twig b/resources/views/rules/rule-group/edit.twigindex 4f42533ba0..9707b4bc0b 100644--- a/resources/views/rules/rule-group/edit.twig+++ b/resources/views/rules/rule-group/edit.twig@@ -60,6 +60,6 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/ff/rule-groups/edit.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/ff/rule-groups/edit.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twigindex 4988fc45ed..b941c19bbd 100644--- a/resources/views/rules/rule-group/select-transactions.twig+++ b/resources/views/rules/rule-group/select-transactions.twig@@ -41,16 +41,16 @@</form>{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/rules/select-transactions.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/rules/select-transactions.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twigindex e8a134ee7c..3e48b4da33 100644--- a/resources/views/rules/rule/create.twig+++ b/resources/views/rules/rule/create.twig@@ -146,13 +146,13 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">var triggerCount = {{ triggerCount }};var actionCount = {{ actionCount }};var testRuleTriggersText = '{{ 'test_rule_triggers'|_|escape('js') }}';</script>- <script type="text/javascript" src="v1/js/ff/rules/create-edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/rules/create-edit.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twigindex 7d1805cb3e..ceb9b0dad1 100644--- a/resources/views/rules/rule/edit.twig+++ b/resources/views/rules/rule/edit.twig@@ -133,14 +133,14 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">var triggerCount = {{ triggerCount }};var actionCount = {{ actionCount }};var testRuleTriggersText = '{{ 'test_rule_triggers'|_|escape('js') }}';</script>- <script type="text/javascript" src="v1/js/ff/rules/create-edit.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/ff/rules/create-edit.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/rules/rule/select-transactions.twig b/resources/views/rules/rule/select-transactions.twigindex 1338ce3c39..ca7f8d565c 100644--- a/resources/views/rules/rule/select-transactions.twig+++ b/resources/views/rules/rule/select-transactions.twig@@ -39,12 +39,12 @@</form>{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/rules/select-transactions.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/rules/select-transactions.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/search/index.twig b/resources/views/search/index.twigindex 92bb453811..203c31ce6d 100644--- a/resources/views/search/index.twig+++ b/resources/views/search/index.twig@@ -167,7 +167,7 @@var cloneAndEditUrl = '{{ route('transactions.clone') }}?redirect=edit';</script>{# required for groups.twig #}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/search/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/search/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/settings/link/index.twig b/resources/views/settings/link/index.twigindex 8c85b09c19..c4b7dc5d42 100644--- a/resources/views/settings/link/index.twig+++ b/resources/views/settings/link/index.twig@@ -60,9 +60,9 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/settings/link/show.twig b/resources/views/settings/link/show.twigindex c45689b656..870f5115b2 100644--- a/resources/views/settings/link/show.twig+++ b/resources/views/settings/link/show.twig@@ -57,7 +57,7 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><script nonce="{{ JS_NONCE }}">$('.switch-link').on('click', switchLink);var switchLinkUrl = '{{ route('transactions.link.switch') }}';@@ -84,5 +84,5 @@{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/settings/update/index.twig b/resources/views/settings/update/index.twigindex 460434c05a..75fd76f769 100644--- a/resources/views/settings/update/index.twig+++ b/resources/views/settings/update/index.twig@@ -71,5 +71,5 @@<script type="text/javascript" nonce="{{ JS_NONCE }}">var updateCheckUrl = '{{ route('settings.update-check.manual') }}';</script>- <script type="text/javascript" src="v1/js/ff/admin/update/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/admin/update/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/settings/users/index.twig b/resources/views/settings/users/index.twigindex 52a0d07fc7..93d58184a7 100644--- a/resources/views/settings/users/index.twig+++ b/resources/views/settings/users/index.twig@@ -174,10 +174,10 @@{% endif %}{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" media="all"+ <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ FF_BUILD_TIME }}" type="text/css" media="all"nonce="{{ JS_NONCE }}">{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/admin/users.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/admin/users.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twigindex c334cb93d2..c1b390348f 100644--- a/resources/views/tags/create.twig+++ b/resources/views/tags/create.twig@@ -61,14 +61,14 @@</form>{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script src="v1/js/ff/tags/create-edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/ff/tags/create-edit.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/tags/edit.twig b/resources/views/tags/edit.twigindex c07494a04d..032e8677e4 100644--- a/resources/views/tags/edit.twig+++ b/resources/views/tags/edit.twig@@ -67,14 +67,14 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script src="v1/js/ff/tags/create-edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/jquery-ui.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/ff/tags/create-edit.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.structure.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">- <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet"+ <link href="v1/css/jquery-ui/jquery-ui.theme.min.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet"media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/tags/index.twig b/resources/views/tags/index.twigindex de15b4db18..f823d7c23a 100644--- a/resources/views/tags/index.twig+++ b/resources/views/tags/index.twig@@ -72,5 +72,5 @@{% endblock %}{% block scripts %}- <script src="v1/js/ff/tags/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/ff/tags/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twigindex 885c5f6716..98e5696b1d 100644--- a/resources/views/tags/show.twig+++ b/resources/views/tags/show.twig@@ -288,7 +288,7 @@{% endblock %}{% block styles %}- <link rel="stylesheet" href="v1/lib/leaflet/leaflet.css?v={{ FF_VERSION }}"/>+ <link rel="stylesheet" href="v1/lib/leaflet/leaflet.css?v={{ FF_BUILD_TIME }}"/>{% endblock %}{% block scripts %}<script type="text/javascript" nonce="{{ JS_NONCE }}">@@ -299,7 +299,7 @@var zoomLevel = {{ location.zoom_level|default("6") }};{% endif %}</script>- <script src="v1/lib/leaflet/leaflet.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script src="v1/js/ff/tags/show.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/lib/leaflet/leaflet.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script src="v1/js/ff/tags/show.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/test/api-test.twig b/resources/views/test/api-test.twigindex 3c780d57f5..acda74c6c3 100644--- a/resources/views/test/api-test.twig+++ b/resources/views/test/api-test.twig@@ -13,7 +13,7 @@<p>This page is created to do some basic API testing. It's not very exciting, is it?</p>-<script src="v1/js/app.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>+<script src="v1/js/app.js?v={{ FF_BUILD_TIME }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">$(function () {"use strict";diff --git a/resources/views/transactions/bulk/edit.twig b/resources/views/transactions/bulk/edit.twigindex fdcc89863b..f58e5660af 100644--- a/resources/views/transactions/bulk/edit.twig+++ b/resources/views/transactions/bulk/edit.twig@@ -189,11 +189,11 @@<script type="text/javascript" nonce="{{ JS_NONCE }}">var what = "";</script>- <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/common/autocomplete.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/transactions/mass/edit-bulk.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/common/autocomplete.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/bootstrap-tagsinput.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/transactions/mass/edit-bulk.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}{% block styles %}- <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">+ <link href="v1/css/bootstrap-tagsinput.css?v={{ FF_BUILD_TIME }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">{% endblock %}diff --git a/resources/views/transactions/convert.twig b/resources/views/transactions/convert.twigindex ebf89c4ca9..92c1d4ac72 100644--- a/resources/views/transactions/convert.twig+++ b/resources/views/transactions/convert.twig@@ -293,8 +293,8 @@{% endblock %}{% block scripts %}- <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/transactions/convert.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/ff/transactions/convert.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/transactions/index.twig b/resources/views/transactions/index.twigindex fd0fef5ff2..7f6017a33e 100644--- a/resources/views/transactions/index.twig+++ b/resources/views/transactions/index.twig@@ -121,7 +121,7 @@{% endblock %}{% block scripts %}{# required for groups.twig #}- <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script><script type="text/javascript" nonce="{{ JS_NONCE }}">var showAll = {% if periods|length > 0 %}false{% else %}true{% endif %};@@ -131,10 +131,10 @@var sourceChartUrl = '{{ route('chart.transactions.sourceAccounts', [objectType, start.format('Y-m-d'), end.format('Y-m-d')]) }}';</script>- <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/transactions/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/transactions/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/transactions/mass/edit.twig b/resources/views/transactions/mass/edit.twigindex cc47fd9ecf..f5bbb6fb20 100644--- a/resources/views/transactions/mass/edit.twig+++ b/resources/views/transactions/mass/edit.twig@@ -184,7 +184,7 @@<script type="text/javascript" nonce="{{ JS_NONCE }}">var what = "";</script>- <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/common/autocomplete.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/transactions/mass/edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/common/autocomplete.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>+ <script type="text/javascript" src="v1/js/ff/transactions/mass/edit.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twigindex 1b9463fc83..0f49eab7f9 100644--- a/resources/views/transactions/show.twig+++ b/resources/views/transactions/show.twig@@ -589,9 +589,9 @@return false}</script>- <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/lib/typeahead/typeahead.bundle.min.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>- <script type="text/javascript" src="v1/js/ff/transactions/show.js?v={{ FF_VERSION }}"+ <script type="text/javascript" src="v1/js/ff/transactions/show.js?v={{ FF_BUILD_TIME }}"nonce="{{ JS_NONCE }}"></script>{% endblock %}diff --git a/resources/views/vendor/passport/authorize.twig b/resources/views/vendor/passport/authorize.twigindex f11f627c91..5bca7b50f0 100644--- a/resources/views/vendor/passport/authorize.twig+++ b/resources/views/vendor/passport/authorize.twig@@ -10,17 +10,17 @@{# CSS things #}{# libraries #}- <link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}">- <link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}">{# the theme #}- <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"+ <link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css"nonce="{{ JS_NONCE }}">{# Firefly III customisations #}- <link href="v1/css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">+ <link href="v1/css/firefly.css?v={{ FF_BUILD_TIME }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}"><style>.passport-authorize .container {