IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-23 15:40:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add copyright statements and newlines.

Browse Source
This commit is contained in:
James Cole 2019-02-09 10:36:59 +01:00
parent 492c11784b
commit 1774bcbabe
28 changed files with 516 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -24,4 +24,4 @@ script:
- docker version -f '{{.Server.Experimental}}'
- docker version
- .deploy/docker/build-generic.sh
- .deploy/docker/manifest.sh
- .deploy/docker/manifest.sh

23
app/Api/V1/Controllers/Chart/AccountController.php
View File

@ -1,4 +1,25 @@
<?php
/**
* AccountController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Chart;
@ -324,4 +345,4 @@ class AccountController extends Controller
return $return;
}
}
}

23
app/Api/V1/Controllers/Chart/AvailableBudgetController.php
View File

@ -1,4 +1,25 @@
<?php
/**
* AvailableBudgetController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Chart;
@ -90,4 +111,4 @@ class AvailableBudgetController extends Controller
return response()->json($chartData);
}
}
}

23
app/Api/V1/Controllers/Chart/CategoryController.php
View File

@ -1,4 +1,25 @@
<?php
/**
* CategoryController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Chart;
@ -185,4 +206,4 @@ class CategoryController extends Controller
return response()->json($chartData);
}
}
}

23
app/Api/V1/Controllers/SummaryController.php
View File

@ -1,4 +1,25 @@
<?php
/**
* SummaryController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers;
@ -389,4 +410,4 @@ class SummaryController extends Controller
return $return;
}
}
}

22
app/Console/Commands/DecryptDatabase.php
View File

@ -1,5 +1,27 @@
<?php
/**
* DecryptDatabase.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Console\Commands;
use Crypt;

2
app/Import/Converter/BankDebitCredit.php
View File

@ -55,4 +55,4 @@ class BankDebitCredit implements ConverterInterface
return 1;
}
}
}

2
app/Import/Specifics/RabobankDescription.php
View File

@ -38,7 +38,7 @@ class RabobankDescription implements SpecificInterface
*/
public static function getDescription(): string
{
return 'import.specific_pres_descr';
return 'import.specific_rabo_descr';
}
/**

23
app/Rules/IsDateOrTime.php
View File

@ -1,4 +1,25 @@
<?php
/**
* IsDateOrTime.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Rules;
@ -58,4 +79,4 @@ class IsDateOrTime implements Rule
return true;
}
}
}

2
app/Support/Http/Controllers/ChartGeneration.php
View File

@ -259,4 +259,4 @@ trait ChartGeneration
return $data;
}
}
}

23
app/Support/Logging/AuditLogger.php
View File

@ -1,4 +1,25 @@
<?php
/**
* AuditLogger.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Support\Logging;
@ -20,4 +41,4 @@ class AuditLogger
$processor = new AuditProcessor;
$logger->pushProcessor($processor);
}
}
}

23
app/Support/Logging/AuditProcessor.php
View File

@ -1,4 +1,25 @@
<?php
/**
* AuditProcessor.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Support\Logging;
@ -25,4 +46,4 @@ class AuditProcessor
return $record;
}
}
}

23
app/Support/Repositories/Recurring/CalculateRangeOccurrences.php
View File

@ -1,4 +1,25 @@
<?php
/**
* CalculateRangeOccurrences.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Support\Repositories\Recurring;
@ -200,4 +221,4 @@ trait CalculateRangeOccurrences
return $return;
}
}
}

23
app/Support/Repositories/Recurring/CalculateXOccurrences.php
View File

@ -1,4 +1,25 @@
<?php
/**
* CalculateXOccurrences.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Support\Repositories\Recurring;
@ -199,4 +220,4 @@ trait CalculateXOccurrences
return $return;
}
}
}

23
app/Support/Repositories/Recurring/FiltersWeekends.php
View File

@ -1,4 +1,25 @@
<?php
/**
* FiltersWeekends.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Support\Repositories\Recurring;
@ -75,4 +96,4 @@ trait FiltersWeekends
return $return;
}
}
}

12
changelog.md
View File

@ -7,16 +7,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Experimental audit logging channel to track important events (separate from debug logging).
### Changed
- #2003, #2006 Transactions can be stored with a timestamp. The user-interface does not support this yet. But the API does.
- [Issue 2003](https://github.com/firefly-iii/firefly-iii/issues/2003), [issue 2006](https://github.com/firefly-iii/firefly-iii/issues/2006) Transactions can be stored with a timestamp. The user-interface does not support this yet. But the API does.
- Docker image tags a new manifest for arm and amd64.
### Removed
- @skuzzle removed an annoying console.log statement.
- [skuzzle](https://github.com/skuzzle) removed an annoying console.log statement.
### Fixed
- #2048 Fix "Are you sure?" popup, thanks to @nescafe2002!
- #2049 Empty preferences would crash Firefly III.
- #2052 Rules could not auto-covert to liabilities.
- [Issue 2048](https://github.com/firefly-iii/firefly-iii/issues/2048) Fix "Are you sure?" popup, thanks to @nescafe2002!
- [Issue 2049](https://github.com/firefly-iii/firefly-iii/issues/2049) Empty preferences would crash Firefly III.
- [Issue 2052](https://github.com/firefly-iii/firefly-iii/issues/2052) Rules could not auto-covert to liabilities.
- Webbased upgrade routine will also decrypt the database.
- Last use date for categories was off.
@ -64,7 +64,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- [Issue 2009](https://github.com/firefly-iii/firefly-iii/issues/2009) Could not change recurrence back to "forever".
- [Issue 2033](https://github.com/firefly-iii/firefly-iii/issues/2033) Longitude can go from -180 to 180.
- [Issue 2034](https://github.com/firefly-iii/firefly-iii/issues/2034) Rules were not being triggered in mass-edit.
- #2043 In rare instances the repetition of a recurring transaction was displayed incorrectly.
- [Issue 2043](https://github.com/firefly-iii/firefly-iii/issues/2043) In rare instances the repetition of a recurring transaction was displayed incorrectly.
- Fixed broken translations in the recurring transactions overview.
- When you create a recurring transfer you make make it fill (or empty) a piggy bank. This was not working, despite a fix in 4.7.8.
- Fixed a bug where the importer would not be capable of creating new currencies.

223
composer.lock generated
View File

@ -1303,16 +1303,16 @@
},
{
"name": "laravel/framework",
"version": "v5.7.24",
"version": "v5.7.25",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "2ede55db4b8201ed0450fa7e7a4d7220aa29bc34"
"reference": "f8fb354878064b94a3ff09a6ffd48ee9a8d712cf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/2ede55db4b8201ed0450fa7e7a4d7220aa29bc34",
"reference": "2ede55db4b8201ed0450fa7e7a4d7220aa29bc34",
"url": "https://api.github.com/repos/laravel/framework/zipball/f8fb354878064b94a3ff09a6ffd48ee9a8d712cf",
"reference": "f8fb354878064b94a3ff09a6ffd48ee9a8d712cf",
"shasum": ""
},
"require": {
@ -1445,7 +1445,7 @@
"framework",
"laravel"
],
"time": "2019-01-29T22:13:46+00:00"
"time": "2019-02-05T14:28:43+00:00"
},
{
"name": "laravel/nexmo-notification-channel",
@ -2470,16 +2470,16 @@
},
{
"name": "nexmo/client",
"version": "1.6.1",
"version": "1.6.2",
"source": {
"type": "git",
"url": "https://github.com/Nexmo/nexmo-php.git",
"reference": "3dc03ca1dab726a23b757110897740e54304fc65"
"reference": "2f79f67f24225ea627ee14578e98c96276cdd4c5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Nexmo/nexmo-php/zipball/3dc03ca1dab726a23b757110897740e54304fc65",
"reference": "3dc03ca1dab726a23b757110897740e54304fc65",
"url": "https://api.github.com/repos/Nexmo/nexmo-php/zipball/2f79f67f24225ea627ee14578e98c96276cdd4c5",
"reference": "2f79f67f24225ea627ee14578e98c96276cdd4c5",
"shasum": ""
},
"require": {
@ -2514,7 +2514,7 @@
}
],
"description": "PHP Client for using Nexmo's API.",
"time": "2019-01-02T09:06:47+00:00"
"time": "2019-02-07T11:14:34+00:00"
},
{
"name": "opis/closure",
@ -3523,16 +3523,16 @@
},
{
"name": "symfony/console",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522"
"reference": "1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522",
"reference": "b0a03c1bb0fcbe288629956cf2f1dd3f1dc97522",
"url": "https://api.github.com/repos/symfony/console/zipball/1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4",
"reference": "1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4",
"shasum": ""
},
"require": {
@ -3544,6 +3544,9 @@
"symfony/dependency-injection": "<3.4",
"symfony/process": "<3.3"
},
"provide": {
"psr/log-implementation": "1.0"
},
"require-dev": {
"psr/log": "~1.0",
"symfony/config": "~3.4|~4.0",
@ -3553,7 +3556,7 @@
"symfony/process": "~3.4|~4.0"
},
"suggest": {
"psr/log-implementation": "For using the console logger",
"psr/log": "For using the console logger",
"symfony/event-dispatcher": "",
"symfony/lock": "",
"symfony/process": ""
@ -3588,7 +3591,7 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2019-01-04T15:13:53+00:00"
"time": "2019-01-25T14:35:16+00:00"
},
{
"name": "symfony/contracts",
@ -3660,16 +3663,16 @@
},
{
"name": "symfony/css-selector",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4"
"reference": "48eddf66950fa57996e1be4a55916d65c10c604a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/76dac1dbe2830213e95892c7c2ec1edd74113ea4",
"reference": "76dac1dbe2830213e95892c7c2ec1edd74113ea4",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/48eddf66950fa57996e1be4a55916d65c10c604a",
"reference": "48eddf66950fa57996e1be4a55916d65c10c604a",
"shasum": ""
},
"require": {
@ -3709,20 +3712,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
"time": "2019-01-03T09:07:35+00:00"
"time": "2019-01-16T20:31:39+00:00"
},
{
"name": "symfony/debug",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd"
"reference": "cf9b2e33f757deb884ce474e06d2647c1c769b65"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
"reference": "64cb33c81e37d19b7715d4a6a4d49c1c382066dd",
"url": "https://api.github.com/repos/symfony/debug/zipball/cf9b2e33f757deb884ce474e06d2647c1c769b65",
"reference": "cf9b2e33f757deb884ce474e06d2647c1c769b65",
"shasum": ""
},
"require": {
@ -3765,20 +3768,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2019-01-03T09:07:35+00:00"
"time": "2019-01-25T14:35:16+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e"
"reference": "bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/887de6d34c86cf0cb6cbf910afb170cdb743cb5e",
"reference": "887de6d34c86cf0cb6cbf910afb170cdb743cb5e",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1",
"reference": "bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1",
"shasum": ""
},
"require": {
@ -3829,20 +3832,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2019-01-05T16:37:49+00:00"
"time": "2019-01-16T20:35:37+00:00"
},
{
"name": "symfony/finder",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce"
"reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/9094d69e8c6ee3fe186a0ec5a4f1401e506071ce",
"reference": "9094d69e8c6ee3fe186a0ec5a4f1401e506071ce",
"url": "https://api.github.com/repos/symfony/finder/zipball/ef71816cbb264988bb57fe6a73f610888b9aa70c",
"reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c",
"shasum": ""
},
"require": {
@ -3878,20 +3881,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2019-01-03T09:07:35+00:00"
"time": "2019-01-16T20:35:37+00:00"
},
{
"name": "symfony/http-foundation",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "a633d422a09242064ba24e44a6e1494c5126de86"
"reference": "8d2318b73e0a1bc75baa699d00ebe2ae8b595a39"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/a633d422a09242064ba24e44a6e1494c5126de86",
"reference": "a633d422a09242064ba24e44a6e1494c5126de86",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/8d2318b73e0a1bc75baa699d00ebe2ae8b595a39",
"reference": "8d2318b73e0a1bc75baa699d00ebe2ae8b595a39",
"shasum": ""
},
"require": {
@ -3932,20 +3935,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2019-01-05T16:37:49+00:00"
"time": "2019-01-29T09:49:29+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b"
"reference": "d56b1706abaa771eb6acd894c6787cb88f1dc97d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/83de6543328917c18d5498eeb6bb6d36f7aab31b",
"reference": "83de6543328917c18d5498eeb6bb6d36f7aab31b",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/d56b1706abaa771eb6acd894c6787cb88f1dc97d",
"reference": "d56b1706abaa771eb6acd894c6787cb88f1dc97d",
"shasum": ""
},
"require": {
@ -4021,7 +4024,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2019-01-06T16:19:23+00:00"
"time": "2019-02-03T12:47:33+00:00"
},
{
"name": "symfony/polyfill-ctype",
@ -4305,16 +4308,16 @@
},
{
"name": "symfony/process",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a"
"reference": "6c05edb11fbeff9e2b324b4270ecb17911a8b7ad"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/ea043ab5d8ed13b467a9087d81cb876aee7f689a",
"reference": "ea043ab5d8ed13b467a9087d81cb876aee7f689a",
"url": "https://api.github.com/repos/symfony/process/zipball/6c05edb11fbeff9e2b324b4270ecb17911a8b7ad",
"reference": "6c05edb11fbeff9e2b324b4270ecb17911a8b7ad",
"shasum": ""
},
"require": {
@ -4350,7 +4353,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2019-01-03T14:48:52+00:00"
"time": "2019-01-24T22:05:03+00:00"
},
{
"name": "symfony/psr-http-message-bridge",
@ -4415,16 +4418,16 @@
},
{
"name": "symfony/routing",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "e69b7a13a0b58af378a49b49dd7084462de16cee"
"reference": "7f8e44fc498972466f0841c3e48dc555f23bdf53"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/e69b7a13a0b58af378a49b49dd7084462de16cee",
"reference": "e69b7a13a0b58af378a49b49dd7084462de16cee",
"url": "https://api.github.com/repos/symfony/routing/zipball/7f8e44fc498972466f0841c3e48dc555f23bdf53",
"reference": "7f8e44fc498972466f0841c3e48dc555f23bdf53",
"shasum": ""
},
"require": {
@ -4488,20 +4491,20 @@
"uri",
"url"
],
"time": "2019-01-03T09:07:35+00:00"
"time": "2019-01-29T09:49:29+00:00"
},
{
"name": "symfony/translation",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0"
"reference": "23fd7aac70d99a17a8e6473a41fec8fab3331050"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/939fb792d73f2ce80e6ae9019d205fc480f1c9a0",
"reference": "939fb792d73f2ce80e6ae9019d205fc480f1c9a0",
"url": "https://api.github.com/repos/symfony/translation/zipball/23fd7aac70d99a17a8e6473a41fec8fab3331050",
"reference": "23fd7aac70d99a17a8e6473a41fec8fab3331050",
"shasum": ""
},
"require": {
@ -4561,20 +4564,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"time": "2019-01-03T09:07:35+00:00"
"time": "2019-01-27T23:11:39+00:00"
},
{
"name": "symfony/var-dumper",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2"
"reference": "223bda89f9be41cf7033eeaf11bc61a280489c17"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/85bde661b178173d85c6f11ea9d03b61d1212bb2",
"reference": "85bde661b178173d85c6f11ea9d03b61d1212bb2",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/223bda89f9be41cf7033eeaf11bc61a280489c17",
"reference": "223bda89f9be41cf7033eeaf11bc61a280489c17",
"shasum": ""
},
"require": {
@ -4637,7 +4640,7 @@
"debug",
"dump"
],
"time": "2019-01-03T09:07:35+00:00"
"time": "2019-01-30T11:44:30+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@ -5624,16 +5627,16 @@
},
{
"name": "mockery/mockery",
"version": "1.2.0",
"version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
"reference": "100633629bf76d57430b86b7098cd6beb996a35a"
"reference": "dc4f10b6b1148744facb784015e4b339d7feec23"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a",
"reference": "100633629bf76d57430b86b7098cd6beb996a35a",
"url": "https://api.github.com/repos/mockery/mockery/zipball/dc4f10b6b1148744facb784015e4b339d7feec23",
"reference": "dc4f10b6b1148744facb784015e4b339d7feec23",
"shasum": ""
},
"require": {
@ -5642,7 +5645,7 @@
"php": ">=5.6.0"
},
"require-dev": {
"phpunit/phpunit": "~5.7.10|~6.5|~7.0"
"phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0"
},
"type": "library",
"extra": {
@ -5685,7 +5688,7 @@
"test double",
"testing"
],
"time": "2018-10-02T21:52:37+00:00"
"time": "2019-02-08T14:43:54+00:00"
},
{
"name": "myclabs/deep-copy",
@ -6389,16 +6392,16 @@
},
{
"name": "phpunit/phpunit",
"version": "7.5.3",
"version": "7.5.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "2cb759721e53bc05f56487f628c6b9fbb6c18746"
"reference": "2896657da5fb237bc316bdfc18c2650efeee0dc0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2cb759721e53bc05f56487f628c6b9fbb6c18746",
"reference": "2cb759721e53bc05f56487f628c6b9fbb6c18746",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2896657da5fb237bc316bdfc18c2650efeee0dc0",
"reference": "2896657da5fb237bc316bdfc18c2650efeee0dc0",
"shasum": ""
},
"require": {
@ -6469,7 +6472,7 @@
"testing",
"xunit"
],
"time": "2019-02-01T05:24:07+00:00"
"time": "2019-02-07T14:15:04+00:00"
},
{
"name": "roave/security-advisories",
@ -6477,12 +6480,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "db876706aacd4ffbd1c253358d19a651e50e65c2"
"reference": "344bf4ed1263c75e7f96b87b80c52e8373561e19"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/db876706aacd4ffbd1c253358d19a651e50e65c2",
"reference": "db876706aacd4ffbd1c253358d19a651e50e65c2",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/344bf4ed1263c75e7f96b87b80c52e8373561e19",
"reference": "344bf4ed1263c75e7f96b87b80c52e8373561e19",
"shasum": ""
},
"conflict": {
@ -6517,8 +6520,8 @@
"doctrine/mongodb-odm-bundle": ">=2,<3.0.1",
"doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1",
"dompdf/dompdf": ">=0.6,<0.6.2",
"drupal/core": ">=7,<7.60|>=8,<8.5.8|>=8.6,<8.6.2",
"drupal/drupal": ">=7,<7.60|>=8,<8.5.8|>=8.6,<8.6.2",
"drupal/core": ">=7,<7.62|>=8,<8.5.9|>=8.6,<8.6.6",
"drupal/drupal": ">=7,<7.62|>=8,<8.5.9|>=8.6,<8.6.6",
"erusev/parsedown": "<1.7",
"ezsystems/ezpublish-kernel": ">=5.3,<5.3.12.1|>=5.4,<5.4.13.1|>=6,<6.7.9.1|>=6.8,<6.13.5.1|>=7,<7.2.4.1|>=7.3,<7.3.2.1",
"ezsystems/ezpublish-legacy": ">=5.3,<5.3.12.6|>=5.4,<5.4.12.3|>=2011,<2017.12.4.3|>=2018.6,<2018.6.1.4|>=2018.9,<2018.9.1.3",
@ -6615,7 +6618,7 @@
"symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7",
"tecnickcom/tcpdf": "<6.2.22",
"thelia/backoffice-default-template": ">=2.1,<2.1.2",
"thelia/thelia": ">=2.1.0-beta1,<2.1.3|>=2.1,<2.1.2",
"thelia/thelia": ">=2.1,<2.1.2|>=2.1.0-beta1,<2.1.3",
"theonedemon/phpwhois": "<=4.2.5",
"titon/framework": ">=0,<9.9.99",
"truckersmp/phpwhois": "<=4.3.1",
@ -6673,7 +6676,7 @@
}
],
"description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
"time": "2019-01-22T18:37:22+00:00"
"time": "2019-02-05T19:58:17+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@ -6786,23 +6789,23 @@
},
{
"name": "sebastian/diff",
"version": "3.0.1",
"version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
"reference": "366541b989927187c4ca70490a35615d3fef2dce"
"reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce",
"reference": "366541b989927187c4ca70490a35615d3fef2dce",
"url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
"reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
"shasum": ""
},
"require": {
"php": "^7.1"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
"phpunit/phpunit": "^7.5 || ^8.0",
"symfony/process": "^2 || ^3.3 || ^4"
},
"type": "library",
@ -6838,7 +6841,7 @@
"unidiff",
"unified diff"
],
"time": "2018-06-10T07:54:39+00:00"
"time": "2019-02-04T06:01:07+00:00"
},
{
"name": "sebastian/environment",
@ -7336,16 +7339,16 @@
},
{
"name": "symfony/config",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
"reference": "a7a7d0a0244cfc82f040729ccf769e6cf55a78fb"
"reference": "25a2e7abe0d97e70282537292e3df45cf6da7b98"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/a7a7d0a0244cfc82f040729ccf769e6cf55a78fb",
"reference": "a7a7d0a0244cfc82f040729ccf769e6cf55a78fb",
"url": "https://api.github.com/repos/symfony/config/zipball/25a2e7abe0d97e70282537292e3df45cf6da7b98",
"reference": "25a2e7abe0d97e70282537292e3df45cf6da7b98",
"shasum": ""
},
"require": {
@ -7395,20 +7398,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
"time": "2019-01-03T09:07:35+00:00"
"time": "2019-01-30T11:44:30+00:00"
},
{
"name": "symfony/filesystem",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "c2ffd9a93f2d6c5be2f68a0aa7953cc229f871f8"
"reference": "7c16ebc2629827d4ec915a52ac809768d060a4ee"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/c2ffd9a93f2d6c5be2f68a0aa7953cc229f871f8",
"reference": "c2ffd9a93f2d6c5be2f68a0aa7953cc229f871f8",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/7c16ebc2629827d4ec915a52ac809768d060a4ee",
"reference": "7c16ebc2629827d4ec915a52ac809768d060a4ee",
"shasum": ""
},
"require": {
@ -7445,20 +7448,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"time": "2019-01-03T09:07:35+00:00"
"time": "2019-01-16T20:35:37+00:00"
},
{
"name": "symfony/stopwatch",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
"reference": "af62b35760fc92c8dbdce659b4eebdfe0e6a0472"
"reference": "b1a5f646d56a3290230dbc8edf2a0d62cda23f67"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/af62b35760fc92c8dbdce659b4eebdfe0e6a0472",
"reference": "af62b35760fc92c8dbdce659b4eebdfe0e6a0472",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/b1a5f646d56a3290230dbc8edf2a0d62cda23f67",
"reference": "b1a5f646d56a3290230dbc8edf2a0d62cda23f67",
"shasum": ""
},
"require": {
@ -7495,20 +7498,20 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
"time": "2019-01-03T09:07:35+00:00"
"time": "2019-01-16T20:31:39+00:00"
},
{
"name": "symfony/yaml",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "d0aa6c0ea484087927b49fd513383a7d36190ca6"
"reference": "d461670ee145092b7e2a56c1da7118f19cadadb0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/d0aa6c0ea484087927b49fd513383a7d36190ca6",
"reference": "d0aa6c0ea484087927b49fd513383a7d36190ca6",
"url": "https://api.github.com/repos/symfony/yaml/zipball/d461670ee145092b7e2a56c1da7118f19cadadb0",
"reference": "d461670ee145092b7e2a56c1da7118f19cadadb0",
"shasum": ""
},
"require": {
@ -7554,7 +7557,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2019-01-03T09:07:35+00:00"
"time": "2019-01-16T20:35:37+00:00"
},
{
"name": "theseer/tokenizer",

22
database/migrations/2019_01_28_193833_changes_for_v4710.php
View File

@ -1,5 +1,27 @@
<?php
/**
* 2019_01_28_193833_changes_for_v4710.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

22
database/migrations/2019_02_05_055516_changes_for_v4711.php
View File

@ -1,5 +1,27 @@
<?php
/**
* 2019_02_05_055516_changes_for_v4711.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

21
index.php
View File

@ -1,4 +1,25 @@
<?php
/**
* index.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
/**
* index.php

17
resources/lang/en_US/import.php
View File

@ -31,11 +31,9 @@ return [
'prerequisites_breadcrumb_ynab' => 'Prerequisites for YNAB',
'job_configuration_breadcrumb' => 'Configuration for ":key"',
'job_status_breadcrumb' => 'Import status for ":key"',
'cannot_create_for_provider' => 'Firefly III cannot create a job for the ":provider"-provider.',
'disabled_for_demo_user' => 'disabled in demo',
// index page:
'general_index_title' => 'Import a file',
'general_index_intro' => 'Welcome to Firefly III\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.',
// import provider strings (index):
@ -50,9 +48,6 @@ return [
'button_fints' => 'Import using FinTS',
// global config box (index)
'global_config_title' => 'Global import configuration',
'global_config_text' => 'In the future, this box will feature preferences that apply to ALL import providers above.',
// prerequisites box (index)
'need_prereq_title' => 'Import prerequisites',
'need_prereq_intro' => 'Some import methods need your attention before they can be used. For example, they might require special API keys or application secrets. You can configure them here. The icon indicates if these prerequisites have been met.',
@ -65,17 +60,6 @@ return [
'do_prereq_quovo' => 'Prerequisites for imports using Quovo',
'do_prereq_ynab' => 'Prerequisites for imports from YNAB',
// provider config box (index)
'can_config_title' => 'Import configuration',
'can_config_intro' => 'Some import methods can be configured to your liking. They have extra settings you can tweak.',
'do_config_fake' => 'Configuration for the fake provider',
'do_config_file' => 'Configuration for file imports',
'do_config_bunq' => 'Configuration for bunq imports',
'do_config_spectre' => 'Configuration for imports from Spectre',
'do_config_plaid' => 'Configuration for imports from Plaid',
'do_config_yodlee' => 'Configuration for imports from Yodlee',
'do_config_quovo' => 'Configuration for imports from Quovo',
// prerequisites:
'prereq_fake_title' => 'Prerequisites for an import from the fake import provider',
'prereq_fake_text' => 'This fake provider requires a fake API key. It must be 32 characters long. You can use this one: 123456789012345678901234567890AA',
@ -138,7 +122,6 @@ return [
'spectre_login_new_login' => 'Login with another bank, or one of these banks with different credentials.',
'job_config_spectre_accounts_title' => 'Select accounts to import from',
'job_config_spectre_accounts_text' => 'You have selected ":name" (:country). You have :count account(s) available from this provider. Please select the Firefly III asset account(s) where the transactions from these accounts should be stored. Remember, in order to import data both the Firefly III account and the ":name"-account must have the same currency.',
'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.',
'spectre_do_not_import' => '(do not import)',
'spectre_no_mapping' => 'It seems you have not selected any accounts to import from.',
'imported_from_account' => 'Imported from ":account"',

67
resources/views/v1/import/index.twig
View File

@ -38,20 +38,6 @@
</div>
<div class="row">
{#
<div class="col-lg-4 col-md-12 col-sm-12 col-xs-12">
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">{{ trans('import.global_config_title') }}</h3>
</div>
<div class="box-body">
<p>
{{ trans('import.global_config_text') }}
</p>
</div>
</div>
</div>
#}
<div class="col-lg-4 col-md-12 col-sm-12 col-xs-12">
<div class="box box-default">
<div class="box-header with-border">
@ -78,60 +64,7 @@
</div>
</div>
</div>
{#
<div class="col-lg-4 col-md-12 col-sm-12 col-xs-12">
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">{{ trans('import.can_config_title') }}</h3>
</div>
<div class="box-body">
<p>
{{ trans('import.can_config_title') }}
</p>
<ul>
{% for name, provider in providers %}
{% if provider.has_config %}
<li><i class="fa fa-fw fa-wrench"></i> <a href="#">{{ trans('import.do_config_'~name) }}</a></li>
{% endif %}
{% endfor %}
</ul>
</div>
</div>
</div>
#}
</div>
<!--
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">{{ 'reset_import_settings_title'|_ }}</h3>
</div>
<div class="box-body">
<p>
{{ 'reset_import_settings_text'|_ }}
</p>
<ul>
{# bunq import #}
{% if routines.bunq == true %}
<li><a href="{{ route('import.reset', ['bunq']) }}">{{ 'reset_settings_bunq'|_ }}</a></li>
{% endif %}
{# import from Spectre #}
{% if routines.spectre == true %}
<li><a href="{{ route('import.reset', ['spectre']) }}">{{ 'reset_settings_spectre'|_ }}</a></li>
{% endif %}
{# import from Plaid #}
{% if routines.plaid == true %}
<li><a href="{{ route('import.reset', ['plaid']) }}">{{ 'reset_settings_plaid'|_ }}</a></li>
{% endif %}
</ul>
</div>
</div>
</div>
</div>
-->
{% endblock %}
{% block scripts %}
{% endblock %}

2
resources/views/v2/auth/passwords/email.twig
View File

@ -5,7 +5,7 @@
<div class="row">
<div class="col col-login mx-auto">
<div class="text-center mb-6">
<img src="v2/assets/images/firefly-iii-48.png" class="h-6" alt="Firefly III v{{ FF_VERSION }}" title="Firefly III v{{ FF_VERSION }}">
<img src="v2/images/basic-logo-square.png" class="h-6" alt="Firefly III v{{ FF_VERSION }}" title="Firefly III v{{ FF_VERSION }}">
</div>
{# ERRORS FOR RESET LOGIN STUFF #}

2
resources/views/v2/auth/passwords/reset.twig
View File

@ -5,7 +5,7 @@
<div class="row">
<div class="col col-login mx-auto">
<div class="text-center mb-6">
<img src="v2/assets/images/firefly-iii-48.png" class="h-6" alt="Firefly III v{{ FF_VERSION }}" title="Firefly III v{{ FF_VERSION }}">
<img src="v2/images/basic-logo-square.png" class="h-6" alt="Firefly III v{{ FF_VERSION }}" title="Firefly III v{{ FF_VERSION }}">
</div>
<form class="card" action="{{ route('password.reset.request') }}" method="post">

21
routes/api.php
View File

@ -1,4 +1,25 @@
<?php
/**
* api.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
/**
* api.php

21
routes/channels.php
View File

@ -1,4 +1,25 @@
<?php
/**
* channels.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
/**
* channels.php

21
routes/console.php
View File

@ -1,4 +1,25 @@
<?php
/**
* console.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
/**
* console.php

21
server.php
View File

@ -1,4 +1,25 @@
<?php
/**
* server.php
* Copyright (c) 2019 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
/**