From 089214709fe77be33c05b4d599e7936927e98016 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 10 Dec 2017 08:56:11 +0100 Subject: [PATCH] Remove wrong copyright blocks [skip ci] --- app/Console/Commands/UseEncryption.php | 8 -- app/Console/Kernel.php | 9 -- app/Exceptions/Handler.php | 9 -- .../Auth/ForgotPasswordController.php | 9 -- app/Http/Controllers/Auth/LoginController.php | 9 -- .../Controllers/Auth/RegisterController.php | 9 -- .../Auth/ResetPasswordController.php | 9 -- app/Http/Kernel.php | 9 -- app/Http/Middleware/EncryptCookies.php | 9 -- .../Middleware/RedirectIfAuthenticated.php | 9 -- app/Http/Middleware/TrimStrings.php | 9 -- app/Http/Middleware/TrustProxies.php | 9 -- app/Http/Middleware/VerifyCsrfToken.php | 9 -- app/Import/Specifics/SnsDescription.php | 11 +-- app/Mail/RegisteredUser.php | 9 -- app/Mail/RequestedNewPassword.php | 9 -- app/Providers/AuthServiceProvider.php | 9 -- app/Providers/BroadcastServiceProvider.php | 9 -- app/Providers/RouteServiceProvider.php | 9 -- composer.json | 2 +- database/factories/ModelFactory.php | 9 -- ...016_06_16_000000_create_support_tables.php | 9 -- .../2016_06_16_000001_create_users_table.php | 9 -- .../2016_06_16_000002_create_main_tables.php | 9 -- .../2016_08_25_091522_changes_for_3101.php | 9 -- .../2016_09_12_121359_fix_nullables.php | 9 -- ...10_09_150037_expand_transactions_table.php | 9 -- .../2016_10_22_075804_changes_for_v410.php | 9 -- .../2016_11_24_210552_changes_for_v420.php | 9 -- .../2016_12_22_150431_changes_for_v430.php | 9 -- .../2016_12_28_203205_changes_for_v431.php | 9 -- .../2017_04_13_163623_changes_for_v440.php | 9 -- .../2017_06_02_105232_changes_for_v450.php | 9 -- database/seeds/AccountTypeSeeder.php | 9 -- database/seeds/DatabaseSeeder.php | 9 -- database/seeds/LinkTypeSeeder.php | 8 -- database/seeds/PermissionSeeder.php | 9 -- database/seeds/TransactionCurrencySeeder.php | 9 -- database/seeds/TransactionTypeSeeder.php | 9 -- phpunit.coverage.xml | 9 -- resources/lang/en_US/auth.php | 11 --- resources/lang/en_US/breadcrumbs.php | 12 --- resources/lang/en_US/config.php | 11 --- resources/lang/en_US/csv.php | 10 -- resources/lang/en_US/demo.php | 9 -- resources/lang/en_US/firefly.php | 99 +++++++++---------- resources/lang/en_US/form.php | 11 --- resources/lang/en_US/intro.php | 9 -- resources/lang/en_US/list.php | 11 --- resources/lang/en_US/pagination.php | 11 --- resources/lang/en_US/passwords.php | 11 --- resources/lang/en_US/validation.php | 11 --- 52 files changed, 47 insertions(+), 522 deletions(-) diff --git a/app/Console/Commands/UseEncryption.php b/app/Console/Commands/UseEncryption.php index 648533fa20..fcb5d2babe 100644 --- a/app/Console/Commands/UseEncryption.php +++ b/app/Console/Commands/UseEncryption.php @@ -21,14 +21,6 @@ */ declare(strict_types=1); -/** - * UseEncryption.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Console\Commands; use Illuminate\Console\Command; diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index b444bbef42..7ef7eade7c 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * Kernel.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Console; use Illuminate\Console\Scheduling\Schedule; diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 02e1670b03..788b5f8731 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * Handler.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Exceptions; use ErrorException; diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index e969737770..9a475eefd3 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * ForgotPasswordController.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Http\Controllers\Auth; use FireflyIII\Http\Controllers\Controller; diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 829915e5ef..57f16dfef1 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * LoginController.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Http\Controllers\Auth; use FireflyConfig; diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 7125a0de68..d6f961f685 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * RegisterController.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Http\Controllers\Auth; use FireflyConfig; diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 9009af2485..db288d8d3f 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * ResetPasswordController.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Http\Controllers\Auth; use FireflyIII\Http\Controllers\Controller; diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index d1e66021d3..dc9ae702cc 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * Kernel.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Http; use FireflyIII\Http\Middleware\Authenticate; diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php index ef7bcceca5..c54f9920c4 100644 --- a/app/Http/Middleware/EncryptCookies.php +++ b/app/Http/Middleware/EncryptCookies.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * EncryptCookies.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Http\Middleware; use Illuminate\Cookie\Middleware\EncryptCookies as Middleware; diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 8b6e5232fb..174fe612cb 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * RedirectIfAuthenticated.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Http\Middleware; use Closure; diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php index 21d5495130..5cf7ccd723 100644 --- a/app/Http/Middleware/TrimStrings.php +++ b/app/Http/Middleware/TrimStrings.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * TrimStrings.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Http\Middleware; use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware; diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 62ef14a3f3..b66bca8c09 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * TrustProxies.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Http\Middleware; use Fideloper\Proxy\TrustProxies as Middleware; diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 838f340dcc..82e05ffddd 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * VerifyCsrfToken.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Http\Middleware; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware; diff --git a/app/Import/Specifics/SnsDescription.php b/app/Import/Specifics/SnsDescription.php index 3f52171846..c4fa347421 100644 --- a/app/Import/Specifics/SnsDescription.php +++ b/app/Import/Specifics/SnsDescription.php @@ -1,7 +1,7 @@ . */ -/** - * snsDescription.php - * Author 2017 hugovanduijn@gmail.com. - * - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ declare(strict_types=1); namespace FireflyIII\Import\Specifics; diff --git a/app/Mail/RegisteredUser.php b/app/Mail/RegisteredUser.php index 1e01647930..c8a6be8920 100644 --- a/app/Mail/RegisteredUser.php +++ b/app/Mail/RegisteredUser.php @@ -21,15 +21,6 @@ */ declare(strict_types=1); -/** - * RegisteredUser.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Mail; use Illuminate\Bus\Queueable; diff --git a/app/Mail/RequestedNewPassword.php b/app/Mail/RequestedNewPassword.php index 6041424d62..4545095120 100644 --- a/app/Mail/RequestedNewPassword.php +++ b/app/Mail/RequestedNewPassword.php @@ -21,15 +21,6 @@ */ declare(strict_types=1); -/** - * RequestedNewPassword.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Mail; use Illuminate\Bus\Queueable; diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index b70d194202..bee943223f 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * AuthServiceProvider.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Providers; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 0d6648fe02..674ed8dbda 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * BroadcastServiceProvider.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Providers; use Illuminate\Support\Facades\Broadcast; diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 1be7d7c064..5637e53681 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -20,15 +20,6 @@ */ declare(strict_types=1); -/** - * RouteServiceProvider.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * This software may be modified and distributed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International License. - * - * See the LICENSE file for details. - */ - namespace FireflyIII\Providers; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; diff --git a/composer.json b/composer.json index 4308b846be..36f451efe8 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "transfers", "management" ], - "license": "Creative Commons Attribution-ShareAlike 4.0 International License", + "license": "GPLv3", "homepage": "https://github.com/firefly-iii/firefly-iii", "type": "project", "authors": [ diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index 85bedc97cf..cd2bbb02a3 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -1,13 +1,4 @@ - - 'Home', 'edit_currency' => 'Edit currency ":name"', diff --git a/resources/lang/en_US/config.php b/resources/lang/en_US/config.php index 9fe187d98c..0579902b74 100644 --- a/resources/lang/en_US/config.php +++ b/resources/lang/en_US/config.php @@ -1,16 +1,5 @@ 'en, English, en_US, en_US.utf8, en_US.UTF-8', 'month' => '%B %Y', diff --git a/resources/lang/en_US/csv.php b/resources/lang/en_US/csv.php index 4586dd6ac5..6043bf1e0c 100644 --- a/resources/lang/en_US/csv.php +++ b/resources/lang/en_US/csv.php @@ -1,14 +1,4 @@ 'Sorry, there is no extra demo-explanation text for this page.', 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 78058c3f35..06497d765f 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -1,16 +1,5 @@ 'Close', @@ -874,53 +863,55 @@ return [ 'account_role_ccAsset' => 'Credit card', 'budget_chart_click' => 'Please click on a budget name in the table above to see a chart.', 'category_chart_click' => 'Please click on a category name in the table above to see a chart.', - - 'in_out_accounts' => 'Earned and spent per combined account', - 'in_out_accounts_period' => 'Earned and spent, grouped by :period', - 'in_out_per_category' => 'Earned and spent per category', - 'out_per_budget' => 'Spent per budget', + 'in_out_accounts' => 'Earned and spent per combined account', + 'in_out_accounts_period_day' => 'Earned and spent, grouped by day', + 'in_out_accounts_period_month' => 'Earned and spent, grouped by month', + 'in_out_accounts_period_year' => 'Earned and spent, grouped by year', + 'in_out_per_category' => 'Earned and spent per category', + 'out_per_budget' => 'Spent per budget', + 'select_expense_revenue' => 'Select expense/revenue account', // charts: - 'chart' => 'Chart', - 'month' => 'Month', - 'budget' => 'Budget', - 'spent' => 'Spent', - 'spent_in_budget' => 'Spent in budget', - 'left_to_spend' => 'Left to spend', - 'earned' => 'Earned', - 'overspent' => 'Overspent', - 'left' => 'Left', - 'max-amount' => 'Maximum amount', - 'min-amount' => 'Minumum amount', - 'journal-amount' => 'Current bill entry', - 'name' => 'Name', - 'date' => 'Date', - 'paid' => 'Paid', - 'unpaid' => 'Unpaid', - 'day' => 'Day', - 'budgeted' => 'Budgeted', - 'period' => 'Period', - 'balance' => 'Balance', - 'sum' => 'Sum', - 'average' => 'Average', - 'balanceFor' => 'Balance for :name', + 'chart' => 'Chart', + 'month' => 'Month', + 'budget' => 'Budget', + 'spent' => 'Spent', + 'spent_in_budget' => 'Spent in budget', + 'left_to_spend' => 'Left to spend', + 'earned' => 'Earned', + 'overspent' => 'Overspent', + 'left' => 'Left', + 'max-amount' => 'Maximum amount', + 'min-amount' => 'Minumum amount', + 'journal-amount' => 'Current bill entry', + 'name' => 'Name', + 'date' => 'Date', + 'paid' => 'Paid', + 'unpaid' => 'Unpaid', + 'day' => 'Day', + 'budgeted' => 'Budgeted', + 'period' => 'Period', + 'balance' => 'Balance', + 'sum' => 'Sum', + 'average' => 'Average', + 'balanceFor' => 'Balance for :name', // piggy banks: - 'add_money_to_piggy' => 'Add money to piggy bank ":name"', - 'piggy_bank' => 'Piggy bank', - 'new_piggy_bank' => 'New piggy bank', - 'store_piggy_bank' => 'Store new piggy bank', - 'stored_piggy_bank' => 'Store new piggy bank ":name"', - 'account_status' => 'Account status', - 'left_for_piggy_banks' => 'Left for piggy banks', - 'sum_of_piggy_banks' => 'Sum of piggy banks', - 'saved_so_far' => 'Saved so far', - 'left_to_save' => 'Left to save', - 'suggested_amount' => 'Suggested monthly amount to save', - 'add_money_to_piggy_title' => 'Add money to piggy bank ":name"', - 'remove_money_from_piggy_title' => 'Remove money from piggy bank ":name"', - 'add' => 'Add', - 'no_money_for_piggy' => 'You have no money to put in this piggy bank.', + 'add_money_to_piggy' => 'Add money to piggy bank ":name"', + 'piggy_bank' => 'Piggy bank', + 'new_piggy_bank' => 'New piggy bank', + 'store_piggy_bank' => 'Store new piggy bank', + 'stored_piggy_bank' => 'Store new piggy bank ":name"', + 'account_status' => 'Account status', + 'left_for_piggy_banks' => 'Left for piggy banks', + 'sum_of_piggy_banks' => 'Sum of piggy banks', + 'saved_so_far' => 'Saved so far', + 'left_to_save' => 'Left to save', + 'suggested_amount' => 'Suggested monthly amount to save', + 'add_money_to_piggy_title' => 'Add money to piggy bank ":name"', + 'remove_money_from_piggy_title' => 'Remove money from piggy bank ":name"', + 'add' => 'Add', + 'no_money_for_piggy' => 'You have no money to put in this piggy bank.', 'remove' => 'Remove', 'max_amount_add' => 'The maximum amount you can add is', diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php index 6d7a98c2fe..20c76d5daa 100644 --- a/resources/lang/en_US/form.php +++ b/resources/lang/en_US/form.php @@ -1,16 +1,5 @@ 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.', diff --git a/resources/lang/en_US/list.php b/resources/lang/en_US/list.php index 8129b082fc..55e73e3e43 100644 --- a/resources/lang/en_US/list.php +++ b/resources/lang/en_US/list.php @@ -1,16 +1,5 @@ 'Buttons', 'icon' => 'Icon', diff --git a/resources/lang/en_US/pagination.php b/resources/lang/en_US/pagination.php index 6e1c86af46..d3016a093a 100644 --- a/resources/lang/en_US/pagination.php +++ b/resources/lang/en_US/pagination.php @@ -1,16 +1,5 @@ '« Previous', diff --git a/resources/lang/en_US/passwords.php b/resources/lang/en_US/passwords.php index aae1d74962..515a252b46 100644 --- a/resources/lang/en_US/passwords.php +++ b/resources/lang/en_US/passwords.php @@ -1,16 +1,5 @@ 'Passwords must be at least six characters and match the confirmation.', 'user' => 'We can\'t find a user with that e-mail address.', diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.php index 9ea55191b5..569840b794 100644 --- a/resources/lang/en_US/validation.php +++ b/resources/lang/en_US/validation.php @@ -1,16 +1,5 @@ 'This is not a valid IBAN.', 'unique_account_number_for_user' => 'It looks like this account number is already in use.',