kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into feature/credit_calc

Browse Source 
# Conflicts:
#	app/Factory/TransactionJournalMetaFactory.php
#	app/Repositories/Account/AccountRepository.php
#	app/Transformers/AccountTransformer.php
#	config/firefly.php
#	frontend/src/components/accounts/Create.vue
This commit is contained in:
James Cole
2021-04-27 06:54:38 +02:00
parent 8ef6595ced f03b0569cf
commit 65c49c7a71
259 changed files with 3163 additions and 2520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/debug.twig
View File

@@ -57,7 +57,7 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
{% endfor %}
| User agent | {{ userAgent }} |
</textarea>
<script type="text/javascript">
<script type="text/javascript" nonce="{{ JS_NONCE }}">
var textArea = document.getElementById('debug_info');
var text = textArea.value;
var timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;

2
resources/views/v1/accounts/reconcile/show.twig
View File

@@ -69,10 +69,12 @@
<div class="box-body no-padding">
<table class="table table-responsive table-hover">
<tbody>
{#
<tr>
<td>{{ 'categories'|_ }}</td>
<td>{{ journalCategories(journal)|raw }}</td>
</tr>
#}
{% if journal.tags|length > 0 %}
<tr>
<td>{{ 'tags'|_ }}</td>

4
resources/views/v1/transactions/bulk/edit.twig
View File

@@ -76,10 +76,12 @@
</td>
<td>
{% for tag in journal.tags %}
<span style="display: inline;"><a class="label label-success" href="{{ route('tags.show', [tag.name]) }}">
{% if 0 != tag.id %}
<span style="display: inline;"><a class="label label-success" href="{{ route('tags.show', [tag.id]) }}">
<i class="fa fa-fw fa-tag"></i>
{{ tag.name }}</a>
</span>
{% endif %}
{% endfor %}
</td>
<td>

2
resources/views/v2/accounts/create.twig
View File

@@ -10,5 +10,5 @@
// this is a terrible hack.
var previousURL = '{{ Session.get('accounts.create.uri') }}';
</script>
<script src="v2/js/accounts/create.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/accounts/create.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/accounts/delete.twig
View File

@@ -10,5 +10,5 @@
// this is a terrible hack.
var previousURL = '{{ Session.get('accounts.delete.uri') }}';
</script>
<script src="v2/js/accounts/delete.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/accounts/delete.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/accounts/index.twig
View File

@@ -22,5 +22,5 @@
{% block scripts %}
<script src="v2/js/accounts/index.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/accounts/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/accounts/showx.twig
View File

@@ -11,5 +11,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/accounts/show.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/accounts/show.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/admin/index_new.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

6
resources/views/v2/auth/register.twig
View File

@@ -107,7 +107,7 @@
<!-- /.login-box -->
{% endblock %}
{% block scripts %}
<script src="v2/js/manifest.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/vendor.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/register.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/manifest.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/vendor.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/register.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/bills/index_x.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/budgets/indexx.twig
View File

@@ -18,5 +18,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/categories/indexx.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/currencies/indexx.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/export/indexx.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/index.twig
View File

@@ -26,5 +26,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/dashboard.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/dashboard.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

4
resources/views/v2/layout/default.twig
View File

@@ -87,8 +87,8 @@
</div>
<!-- ./wrapper -->
<script src="v2/js/manifest.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/vendor.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/manifest.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/vendor.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% block scripts %}{% endblock %}
</body>

2
resources/views/v2/new-user/indexx.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/new-user/index.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/new-user/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/object-groups/indexx.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

10
resources/views/v2/partials/layout/favicons.twig
View File

@@ -1,8 +1,8 @@
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/manifest.webmanifest">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#1e6581">
<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">
<link rel="manifest" href="manifest.webmanifest">
<link rel="mask-icon" href="safari-pinned-tab.svg" color="#1e6581">
<meta name="msapplication-TileColor" content="#1e6581">
<meta name="theme-color" content="#1e6581">

2
resources/views/v2/piggy-banks/indexx.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.jsv" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/preferences/indexx.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/profile/indexx.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/recurring/indexx.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/reports/indexx.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/rules/indexx.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/tags/indexx.twig
View File

@@ -15,5 +15,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/empty.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/empty.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/transactions/create.twig
View File

@@ -19,5 +19,5 @@
// this is a terrible hack.
var previousURL = '{{ previousUri }}';
</script>
<script src="v2/js/transactions/create.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/transactions/create.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/transactions/edit.twig
View File

@@ -19,5 +19,5 @@
// this is a terrible hack.
var previousURL = '{{ previousUri }}';
</script>
<script src="v2/js/transactions/edit.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/transactions/edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}

2
resources/views/v2/transactions/indexx.twig
View File

@@ -13,5 +13,5 @@
{% endblock %}
{% block scripts %}
<script src="v2/js/transactions/index.js" nonce="{{ JS_NONCE }}"></script>
<script src="v2/js/transactions/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}