kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	resources/views/auth/login.twig
#	resources/views/auth/mfa.twig
#	resources/views/auth/passwords/email.twig
#	resources/views/auth/passwords/reset.twig
#	resources/views/auth/register.twig
This commit is contained in:
James Cole
2022-10-24 19:35:47 +02:00
parent f4af19e121 d4738b21ab
commit b21461c824
22 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/transactions/bulk/edit.twig
View File

@@ -60,8 +60,8 @@
({{ formatAmountBySymbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
{% endif %}
{% endif %}
</td>
<td>{{ journal.date.isoFormat(monthAndDayFormat) }}</td>
<td>
@@ -104,7 +104,7 @@
<tr>
<th style="width:25%;">{{ trans('list.category') }}</th>
<td>
<input class="form-control" placeholder="" name="category" autocomplete="off" type="text" value="">
<input class="form-control" placeholder="" name="category" autocomplete="off" type="text" value="" spellcheck="false">
</td>
<td>
<div class="checkbox">
@@ -136,7 +136,7 @@
<tr>
<th>{{ trans('list.tags') }}</th>
<td>
<input class="form-control" placeholder="" name="tags" autocomplete="off" type="text" value="">
<input class="form-control" placeholder="" name="tags" autocomplete="off" type="text" value="" spellcheck="false">
</td>
<td>
<div class="radio">

6
resources/views/transactions/mass/edit.twig
View File

@@ -111,7 +111,7 @@
{# SOURCE ACCOUNT NAME FOR DEPOSIT #}
{% if journal.transaction_type_type == 'Deposit' %}
<input class="form-control input-sm"
<input class="form-control input-sm" spellcheck="false"
placeholder="{% if journal.source_type != 'Cash account' %}{{ journal.source_account_name }}{% endif %}"
autocomplete="off"
name="source_name[{{ journal.transaction_journal_id }}]" type="text"
@@ -133,7 +133,7 @@
{# DESTINATION ACCOUNT NAME FOR WITHDRAWAL #}
{% if journal.transaction_type_type == 'Withdrawal' %}
<input class="form-control input-sm"
<input class="form-control input-sm" spellcheck="false"
placeholder="{% if journal.destination_type != 'Cash account' %}{{ journal.destination_account_name }}{% endif %}"
name="destination_name[{{ journal.transaction_journal_id }}]" type="text" autocomplete="off"
value="{% if journal.destination_type != 'Cash account' %}{{ journal.destination_account_name }}{% endif %}">
@@ -141,7 +141,7 @@
</td>
{# category #}
<td style="position: relative;">
<input class="form-control input-sm" placeholder="{{ journal.category_name }}" autocomplete="off"
<input class="form-control input-sm" placeholder="{{ journal.category_name }}" autocomplete="off" spellcheck="false"
name="category[{{ journal.transaction_journal_id }}]" type="text" value="{{ journal.category_name }}">
</td>
{# budget #}