IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag '4.7.17.5' into develop

Browse Source 
4.7.17.5

# Conflicts:
#	resources/views/v1/transactions/convert.twig
This commit is contained in:
James Cole 2019-08-02 20:59:57 +02:00
commit ca9f8b56f7
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
6 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.sandstorm/changelog.md
View File

@ -1,6 +1,10 @@
# 4.7.17.5 (API 0.9.2)
- Several XSS issues, found by [@0x2500](https://github.com/0x2500).
# 4.7.17.4 (API 0.9.2) # 4.7.17.4 (API 0.9.2)
- Several XSS issues, found by [@dayn1ne](https://github.com/dayn1ne). - Several XSS issues, found by [@0x2500](https://github.com/0x2500).
# 4.7.17.3 (API 0.9.2) # 4.7.17.3 (API 0.9.2)

4
.sandstorm/sandstorm-pkgdef.capnp
View File

@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = (
manifest = ( manifest = (
appTitle = (defaultText = "Firefly III"), appTitle = (defaultText = "Firefly III"),
appVersion = 30, appVersion = 31,
appMarketingVersion = (defaultText = "4.7.17.4"), appMarketingVersion = (defaultText = "4.7.17.5"),
actions = [ actions = [
# Define your "new document" handlers here. # Define your "new document" handlers here.

2
.travis.yml
View File

@ -1,7 +1,7 @@
sudo: required sudo: required
language: bash language: bash
env: env:
- VERSION=4.7.17.4 - VERSION=4.7.17.5
dist: xenial dist: xenial

7
changelog.md
View File

@ -2,10 +2,15 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## [4.7.17.5 (API 0.9.2)] - 2019-08-02
### Security
- Several XSS issues, found by [@0x2500](https://github.com/0x2500).
## [4.7.17.4 (API 0.9.2)] - 2019-08-02 ## [4.7.17.4 (API 0.9.2)] - 2019-08-02
### Security ### Security
- Several XSS issues, found by [@dayn1ne](https://github.com/dayn1ne). - Several XSS issues, found by [@0x2500](https://github.com/0x2500).
## [4.7.17.3 (API 0.9.2)] - 2019-07-16 ## [4.7.17.3 (API 0.9.2)] - 2019-07-16

2
config/firefly.php
View File

@ -125,7 +125,7 @@ return [
'is_demo_site' => false, 'is_demo_site' => false,
], ],
'encryption' => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true, 'encryption' => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true,
'version' => '4.7.17.4', 'version' => '4.7.17.5',
'api_version' => '0.9.2', 'api_version' => '0.9.2',
'db_version' => 10, 'db_version' => 10,
'maxUploadSize' => 15242880, 'maxUploadSize' => 15242880,

1
resources/views/v1/transactions/convert.twig
View File

@ -16,7 +16,6 @@
<h3 class="box-title">{{ ('convert_options_'~sourceType.type~destinationType.type)|_ }}</h3> <h3 class="box-title">{{ ('convert_options_'~sourceType.type~destinationType.type)|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<p> <p>
{# ONE: WITHDRAWAL TO DEPOSIT #} {# ONE: WITHDRAWAL TO DEPOSIT #}
{% if sourceType.type == 'Withdrawal' and destinationType.type == 'Deposit' %} {% if sourceType.type == 'Withdrawal' and destinationType.type == 'Deposit' %}