From bf0744e03a7b47c5f6930d1b2cd679fad74602c3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 07:02:45 +0100 Subject: [PATCH] Updated some copyright notices [skip ci] --- app/Console/Commands/Import.php | 4 +- app/Http/Controllers/Auth/LoginController.php | 4 +- .../Controllers/Auth/PasswordController.php | 4 +- .../Controllers/Report/CategoryController.php | 1 - app/Http/Requests/RuleGroupFormRequest.php | 7 --- app/Models/RuleAction.php | 7 --- app/Repositories/User/UserRepository.php | 5 +- app/Rules/Factory/ActionFactory.php | 7 --- config/upgrade.php | 10 --- ...10_09_150037_expand_transactions_table.php | 1 - .../2016_10_22_075804_changes_for_v410.php | 2 +- .../2016_11_24_210552_changes_for_v420.php | 1 - .../2016_12_22_150431_changes_for_v430.php | 1 - database/seeds/TestDataSeeder.php | 6 +- public/css/firefly.css | 10 +++ public/index.php | 13 ++-- public/js/ff/bills/show.js | 10 +++ public/js/ff/budgets/index.js | 10 +++ public/js/ff/budgets/show.js | 10 +++ public/js/ff/categories/index.js | 11 +++- public/js/ff/categories/show-by-date.js | 10 +++ public/js/ff/categories/show.js | 10 +++ public/js/ff/charts.defaults.js | 10 +++ public/js/ff/charts.js | 61 +++++++++++++++++-- public/js/ff/export/index.js | 8 +-- public/js/ff/firefly.js | 11 +++- public/js/ff/guest.js | 10 +++ public/js/ff/help.js | 10 +++ public/js/ff/import/status.js | 8 +-- public/js/ff/index.js | 10 ++- public/js/ff/piggy-banks/index.js | 9 ++- public/js/ff/piggy-banks/show.js | 8 +-- public/js/ff/reports/audit/all.js | 8 +-- public/js/ff/reports/default/all.js | 7 ++- public/js/ff/reports/default/month.js | 11 +++- public/js/ff/reports/default/multi-year.js | 10 +++ public/js/ff/reports/default/year.js | 10 ++- public/js/ff/reports/index.js | 11 +++- public/js/ff/rules/create-edit.js | 6 +- public/js/ff/rules/create.js | 11 ++-- public/js/ff/rules/edit.js | 6 +- public/js/ff/rules/index.js | 8 +-- public/js/ff/split/journal/from-store.js | 8 +-- public/js/ff/tags/create.js | 11 +++- public/js/ff/tags/edit.js | 11 +++- public/js/ff/tags/index.js | 11 +++- public/js/ff/transactions/create-edit.js | 8 ++- public/js/ff/transactions/create.js | 7 ++- public/js/ff/transactions/edit.js | 7 ++- public/js/ff/transactions/list.js | 10 ++- routes/api.php | 7 ++- routes/console.php | 7 ++- 52 files changed, 338 insertions(+), 126 deletions(-) diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php index 2e36d3d417..c339958641 100644 --- a/app/Console/Commands/Import.php +++ b/app/Console/Commands/Import.php @@ -70,7 +70,9 @@ class Import extends Command $handler = new CommandHandler($this); $monolog->pushHandler($handler); - $result = ImportProcedure::runImport($job); + $importProcedure = new ImportProcedure; + + $result = $importProcedure->runImport($job); /** diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 06faf92d07..4eb2782162 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -53,9 +53,9 @@ class LoginController extends Controller /** * Handle a login request to the application. * - * @param \Illuminate\Http\Request $request + * @param Request $request * - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response */ public function login(Request $request) { diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 02a4757bc2..f49857ba67 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -26,8 +26,8 @@ use Illuminate\Support\Facades\Password; * * @package FireflyIII\Http\Controllers\Auth * @method getEmailSubject() - * @method getSendResetLinkEmailSuccessResponse() - * @method getSendResetLinkEmailFailureResponse() + * @method getSendResetLinkEmailSuccessResponse(string $response) + * @method getSendResetLinkEmailFailureResponse(string $response) */ class PasswordController extends Controller { diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php index 3222083051..730deeaece 100644 --- a/app/Http/Controllers/Report/CategoryController.php +++ b/app/Http/Controllers/Report/CategoryController.php @@ -15,7 +15,6 @@ namespace FireflyIII\Http\Controllers\Report; use Carbon\Carbon; -use FireflyIII\Helpers\Report\ReportHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php index 9fa09fdefa..b5420c5ce5 100644 --- a/app/Http/Requests/RuleGroupFormRequest.php +++ b/app/Http/Requests/RuleGroupFormRequest.php @@ -10,13 +10,6 @@ */ declare(strict_types = 1); -/** - * RuleGroupFormRequest.php - * Copyright (C) 2016 thegrumpydictator@gmail.com - * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. - */ namespace FireflyIII\Http\Requests; diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index 11a40ef6a6..6a5cc3a45b 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -10,13 +10,6 @@ */ declare(strict_types = 1); -/** - * RuleAction.php - * Copyright (C) 2016 thegrumpydictator@gmail.com - * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. - */ namespace FireflyIII\Models; diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php index 1f206f89a7..6e38137f9c 100644 --- a/app/Repositories/User/UserRepository.php +++ b/app/Repositories/User/UserRepository.php @@ -153,11 +153,12 @@ class UserRepository implements UserRepositoryInterface * @param User $user * @param string $password * - * @return mixed + * @return bool */ - public function changePassword(User $user, string $password) + public function changePassword(User $user, string $password): bool { $user->password = bcrypt($password); $user->save(); + return true; } } diff --git a/app/Rules/Factory/ActionFactory.php b/app/Rules/Factory/ActionFactory.php index a73c1c23b2..9bbdb7468d 100644 --- a/app/Rules/Factory/ActionFactory.php +++ b/app/Rules/Factory/ActionFactory.php @@ -10,13 +10,6 @@ */ declare(strict_types = 1); -/** - * ActionFactory.php - * Copyright (C) 2016 Robert Horlings - * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. - */ namespace FireflyIII\Rules\Factory; diff --git a/config/upgrade.php b/config/upgrade.php index 82a97f50a0..a36422fe29 100644 --- a/config/upgrade.php +++ b/config/upgrade.php @@ -11,16 +11,6 @@ declare(strict_types = 1); - -/** - * upgrade.php - * Copyright (C) 2016 thegrumpydictator@gmail.com - * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. - */ - - return [ 'text' => [ '3.7' => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' . diff --git a/database/migrations/2016_10_09_150037_expand_transactions_table.php b/database/migrations/2016_10_09_150037_expand_transactions_table.php index 933bca5545..e8dddca676 100644 --- a/database/migrations/2016_10_09_150037_expand_transactions_table.php +++ b/database/migrations/2016_10_09_150037_expand_transactions_table.php @@ -11,7 +11,6 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Schema; /** * Class ExpandTransactionsTable diff --git a/database/migrations/2016_10_22_075804_changes_for_v410.php b/database/migrations/2016_10_22_075804_changes_for_v410.php index eee0d11372..ce56932066 100644 --- a/database/migrations/2016_10_22_075804_changes_for_v410.php +++ b/database/migrations/2016_10_22_075804_changes_for_v410.php @@ -11,7 +11,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Schema; + /** * Class ChangesForV410 diff --git a/database/migrations/2016_11_24_210552_changes_for_v420.php b/database/migrations/2016_11_24_210552_changes_for_v420.php index 14d8b6d7a9..a2ebc4c2ee 100644 --- a/database/migrations/2016_11_24_210552_changes_for_v420.php +++ b/database/migrations/2016_11_24_210552_changes_for_v420.php @@ -11,7 +11,6 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Schema; /** * Class ChangesForV420 diff --git a/database/migrations/2016_12_22_150431_changes_for_v430.php b/database/migrations/2016_12_22_150431_changes_for_v430.php index bf98ad68dc..d019dd0d8e 100644 --- a/database/migrations/2016_12_22_150431_changes_for_v430.php +++ b/database/migrations/2016_12_22_150431_changes_for_v430.php @@ -1,6 +1,5 @@ - */ - /* |-------------------------------------------------------------------------- | Register The Auto Loader diff --git a/public/js/ff/bills/show.js b/public/js/ff/bills/show.js index ba12284cd3..3964f90dcb 100644 --- a/public/js/ff/bills/show.js +++ b/public/js/ff/bills/show.js @@ -1,3 +1,13 @@ +/* + * show.js + * Copyright (C) 2016 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. + */ + /* global comboChart, billID */ $(function () { diff --git a/public/js/ff/budgets/index.js b/public/js/ff/budgets/index.js index ce0103ef1a..95a4eca219 100644 --- a/public/js/ff/budgets/index.js +++ b/public/js/ff/budgets/index.js @@ -1,3 +1,13 @@ +/* + * index.js + * Copyright (C) 2016 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. + */ + function drawSpentBar() { "use strict"; if ($('.spentBar').length > 0) { diff --git a/public/js/ff/budgets/show.js b/public/js/ff/budgets/show.js index 8a538bfbcd..1e7fb668dc 100644 --- a/public/js/ff/budgets/show.js +++ b/public/js/ff/budgets/show.js @@ -1,3 +1,13 @@ +/* + * show.js + * Copyright (C) 2016 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. + */ + $(function () { "use strict"; diff --git a/public/js/ff/categories/index.js b/public/js/ff/categories/index.js index 6bfe805c1f..ca8ef07e42 100644 --- a/public/js/ff/categories/index.js +++ b/public/js/ff/categories/index.js @@ -1,4 +1,13 @@ -/* globals $, categoryID, columnChart, categoryDate */ +/* + * index.js + * Copyright (C) 2016 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. + */ + $(function () { "use strict"; }); \ No newline at end of file diff --git a/public/js/ff/categories/show-by-date.js b/public/js/ff/categories/show-by-date.js index 931316b0d7..6b5ee6b775 100644 --- a/public/js/ff/categories/show-by-date.js +++ b/public/js/ff/categories/show-by-date.js @@ -1,3 +1,13 @@ +/* + * show-by-date.js + * Copyright (C) 2016 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. + */ + $(function () { "use strict"; columnChart(specific, 'period-specific-period'); diff --git a/public/js/ff/categories/show.js b/public/js/ff/categories/show.js index 4d668bad25..9d14bc1377 100644 --- a/public/js/ff/categories/show.js +++ b/public/js/ff/categories/show.js @@ -1,3 +1,13 @@ +/* + * show.js + * Copyright (C) 2016 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. + */ + $(function () { "use strict"; columnChart(all, 'all'); diff --git a/public/js/ff/charts.defaults.js b/public/js/ff/charts.defaults.js index f763bb6c15..bbcce69ccb 100644 --- a/public/js/ff/charts.defaults.js +++ b/public/js/ff/charts.defaults.js @@ -1,3 +1,13 @@ +/* + * charts.defaults.js + * Copyright (C) 2016 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. + */ + var defaultChartOptions = { scales: { xAxes: [ diff --git a/public/js/ff/charts.js b/public/js/ff/charts.js index 080ac4c93f..e8e3afd674 100644 --- a/public/js/ff/charts.js +++ b/public/js/ff/charts.js @@ -2,12 +2,12 @@ * charts.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ -/* globals $, Chart, currencySymbol,mon_decimal_point ,accounting, mon_thousands_sep, frac_digits, noDataForChart */ - var allCharts = {}; /* @@ -81,6 +81,58 @@ function lineChart(URI, container) { drawAChart(URI, container, chartType, options, colorData); } +/** + * Function to draw a chart with double Y Axes and stacked columns. + * + * @param URI + * @param container + */ +function doubleYChart(URI, container) { + "use strict"; + + var colorData = true; + var options = defaultChartOptions; + options.scales.yAxes = [ + // y axis 0: + { + display: true, + ticks: { + callback: function (tickValue, index, ticks) { + "use strict"; + return accounting.formatMoney(tickValue); + + }, + beginAtZero: true + }, + position: "left", + "id": "y-axis-0" + }, + // and y axis 1: + { + display: true, + ticks: { + callback: function (tickValue, index, ticks) { + "use strict"; + return accounting.formatMoney(tickValue); + + }, + beginAtZero: true + }, + position: "right", + "id": "y-axis-1" + } + + ]; + options.stacked = true; + options.scales.xAxes[0].stacked = true; + console.log(options); + + var chartType = 'line'; + + drawAChart(URI, container, chartType, options, colorData); +} + + /** * * @param URI @@ -107,7 +159,6 @@ function stackedColumnChart(URI, container) { var colorData = true; var options = defaultChartOptions; - options.stacked = true; options.scales.xAxes[0].stacked = true; diff --git a/public/js/ff/export/index.js b/public/js/ff/export/index.js index f4ae67a6b4..eeed44981f 100644 --- a/public/js/ff/export/index.js +++ b/public/js/ff/export/index.js @@ -1,11 +1,11 @@ -/* globals token, jobKey */ - /* * index.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ var intervalId = 0; diff --git a/public/js/ff/firefly.js b/public/js/ff/firefly.js index e57052381a..2b105d4386 100644 --- a/public/js/ff/firefly.js +++ b/public/js/ff/firefly.js @@ -1,4 +1,13 @@ -/* globals token, dateRangeConfig, $, */ +/* + * firefly.js + * Copyright (C) 2016 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. + */ + $(function () { "use strict"; diff --git a/public/js/ff/guest.js b/public/js/ff/guest.js index 7ba3e6bed9..886d5a1a51 100644 --- a/public/js/ff/guest.js +++ b/public/js/ff/guest.js @@ -1,3 +1,13 @@ +/* + * guest.js + * Copyright (C) 2016 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. + */ + $(function () { "use strict"; diff --git a/public/js/ff/help.js b/public/js/ff/help.js index 1d6e14e477..536a4c5c2e 100644 --- a/public/js/ff/help.js +++ b/public/js/ff/help.js @@ -1,3 +1,13 @@ +/* + * help.js + * Copyright (C) 2016 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. + */ + $(function () { "use strict"; $('#help').click(showHelp); diff --git a/public/js/ff/import/status.js b/public/js/ff/import/status.js index 2084858131..0b24c0c7f5 100644 --- a/public/js/ff/import/status.js +++ b/public/js/ff/import/status.js @@ -2,11 +2,11 @@ * status.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ -/* globals $, jobImportUrl, jobStartUrl, token, langImportMultiError, langImportSingleError, langImportFatalError, langImportTimeOutError */ - var startedImport = false; var startInterval = 2000; diff --git a/public/js/ff/index.js b/public/js/ff/index.js index b0cc90b70f..27d69d5bc0 100644 --- a/public/js/ff/index.js +++ b/public/js/ff/index.js @@ -1,4 +1,12 @@ -/* globals $, columnChart,showTour, Tour, google, pieChart, stackedColumnChart, billCount */ +/* + * index.js + * Copyright (C) 2016 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. + */ $(function () { "use strict"; diff --git a/public/js/ff/piggy-banks/index.js b/public/js/ff/piggy-banks/index.js index 39f516b01b..92b64b0af9 100644 --- a/public/js/ff/piggy-banks/index.js +++ b/public/js/ff/piggy-banks/index.js @@ -2,13 +2,12 @@ * index.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ -/* globals $, lineChart, token, piggyBankID */ - -// Return a helper with preserved width of cells var fixHelper = function (e, tr) { "use strict"; var $originals = tr.children(); diff --git a/public/js/ff/piggy-banks/show.js b/public/js/ff/piggy-banks/show.js index 72cebea8ff..4c02df137c 100644 --- a/public/js/ff/piggy-banks/show.js +++ b/public/js/ff/piggy-banks/show.js @@ -2,12 +2,12 @@ * show.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ -/* globals $, lineChart, piggyBankID */ - $(function () { "use strict"; if (typeof(lineChart) === 'function' && typeof(piggyBankID) !== 'undefined') { diff --git a/public/js/ff/reports/audit/all.js b/public/js/ff/reports/audit/all.js index f9f5a79f41..2c58e0ac54 100644 --- a/public/js/ff/reports/audit/all.js +++ b/public/js/ff/reports/audit/all.js @@ -2,12 +2,12 @@ * all.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ -/* globals hideable */ - $(function () { "use strict"; diff --git a/public/js/ff/reports/default/all.js b/public/js/ff/reports/default/all.js index b19187497b..b5e4bf970e 100644 --- a/public/js/ff/reports/default/all.js +++ b/public/js/ff/reports/default/all.js @@ -1,10 +1,11 @@ -/* globals startDate, showOnlyTop, showFullList, endDate, expenseReportUri, accountIds, incExpReportUri,accountReportUri, incomeReportUri */ /* * all.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ $(function () { diff --git a/public/js/ff/reports/default/month.js b/public/js/ff/reports/default/month.js index a150da25cc..2052997a9b 100644 --- a/public/js/ff/reports/default/month.js +++ b/public/js/ff/reports/default/month.js @@ -1,5 +1,12 @@ -/* globals google, categoryReportUri, budgetReportUri, balanceReportUri */ - +/* + * month.js + * Copyright (C) 2016 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. + */ $(function () { "use strict"; diff --git a/public/js/ff/reports/default/multi-year.js b/public/js/ff/reports/default/multi-year.js index b1f755a8f1..a6a63a1d3d 100644 --- a/public/js/ff/reports/default/multi-year.js +++ b/public/js/ff/reports/default/multi-year.js @@ -1,3 +1,13 @@ +/* + * multi-year.js + * Copyright (C) 2016 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. + */ + $(function () { "use strict"; drawChart(); diff --git a/public/js/ff/reports/default/year.js b/public/js/ff/reports/default/year.js index 259b9fa18a..9e521ab4fb 100644 --- a/public/js/ff/reports/default/year.js +++ b/public/js/ff/reports/default/year.js @@ -1,4 +1,12 @@ -/* globals google, accountIds, budgetPeriodReportUri, categoryPeriodReportUri */ +/* + * year.js + * Copyright (C) 2016 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. + */ $(function () { "use strict"; diff --git a/public/js/ff/reports/index.js b/public/js/ff/reports/index.js index 9de3f79b50..f146d78bf3 100644 --- a/public/js/ff/reports/index.js +++ b/public/js/ff/reports/index.js @@ -1,5 +1,12 @@ -/* globals google, startDate ,reportURL, endDate , reportType ,accountIds , picker:true, minDate, year, month, columnChart, lineChart, stackedColumnChart */ - +/* + * index.js + * Copyright (C) 2016 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. + */ $(function () { "use strict"; diff --git a/public/js/ff/rules/create-edit.js b/public/js/ff/rules/create-edit.js index 9e836eb3d6..98b77e9b4d 100644 --- a/public/js/ff/rules/create-edit.js +++ b/public/js/ff/rules/create-edit.js @@ -2,8 +2,10 @@ * create-edit.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ var triggerCount = 0; diff --git a/public/js/ff/rules/create.js b/public/js/ff/rules/create.js index 857f5b2617..1ad133f9d7 100644 --- a/public/js/ff/rules/create.js +++ b/public/js/ff/rules/create.js @@ -1,14 +1,13 @@ -/* global $, addNewTrigger, addNewAction, actionCount, triggerCount */ /* - * edit.js + * create.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ -// make a line. - $(function () { "use strict"; console.log("create"); diff --git a/public/js/ff/rules/edit.js b/public/js/ff/rules/edit.js index c66a905d0c..16191e2ae8 100644 --- a/public/js/ff/rules/edit.js +++ b/public/js/ff/rules/edit.js @@ -2,8 +2,10 @@ * edit.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ $(function () { diff --git a/public/js/ff/rules/index.js b/public/js/ff/rules/index.js index 133f770a98..c8642209e2 100644 --- a/public/js/ff/rules/index.js +++ b/public/js/ff/rules/index.js @@ -1,13 +1,13 @@ -/* global comboChart,token, billID */ /* * index.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ -// Return a helper with preserved width of cells var fixHelper = function (e, tr) { "use strict"; var $originals = tr.children(); diff --git a/public/js/ff/split/journal/from-store.js b/public/js/ff/split/journal/from-store.js index 2c5ef2c40c..f0c9d83f62 100644 --- a/public/js/ff/split/journal/from-store.js +++ b/public/js/ff/split/journal/from-store.js @@ -2,12 +2,12 @@ * from-store.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ -/* globals globalSum */ - var destAccounts = {}; var srcAccounts = {}; var categories = {}; diff --git a/public/js/ff/tags/create.js b/public/js/ff/tags/create.js index 6ea5731733..77e8224238 100644 --- a/public/js/ff/tags/create.js +++ b/public/js/ff/tags/create.js @@ -1,4 +1,13 @@ -/* globals zoomLevel, token, google, latitude, longitude, doPlaceMarker */ +/* + * create.js + * Copyright (C) 2016 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. + */ + $(function () { "use strict"; diff --git a/public/js/ff/tags/edit.js b/public/js/ff/tags/edit.js index 6ea5731733..c4f9cd0cfb 100644 --- a/public/js/ff/tags/edit.js +++ b/public/js/ff/tags/edit.js @@ -1,4 +1,13 @@ -/* globals zoomLevel, token, google, latitude, longitude, doPlaceMarker */ +/* + * edit.js + * Copyright (C) 2016 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. + */ + $(function () { "use strict"; diff --git a/public/js/ff/tags/index.js b/public/js/ff/tags/index.js index 6ea5731733..a24180b4e0 100644 --- a/public/js/ff/tags/index.js +++ b/public/js/ff/tags/index.js @@ -1,4 +1,13 @@ -/* globals zoomLevel, token, google, latitude, longitude, doPlaceMarker */ +/* + * index.js + * Copyright (C) 2016 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. + */ + $(function () { "use strict"; diff --git a/public/js/ff/transactions/create-edit.js b/public/js/ff/transactions/create-edit.js index 8a83c9968d..ae827d8983 100644 --- a/public/js/ff/transactions/create-edit.js +++ b/public/js/ff/transactions/create-edit.js @@ -2,10 +2,12 @@ * create-edit.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ -/* globals what:true, $, doSwitch, txt, middleCrumbName, title,button, middleCrumbUrl, piggiesLength, breadcrumbs */ + $(document).ready(function () { "use strict"; diff --git a/public/js/ff/transactions/create.js b/public/js/ff/transactions/create.js index f3fc98a09c..e059fdf127 100644 --- a/public/js/ff/transactions/create.js +++ b/public/js/ff/transactions/create.js @@ -2,11 +2,12 @@ * create.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ -/* globals what:true, $, doSwitch, txt, middleCrumbName, title,button, middleCrumbUrl, piggiesLength, breadcrumbs */ $(document).ready(function () { "use strict"; diff --git a/public/js/ff/transactions/edit.js b/public/js/ff/transactions/edit.js index 62a2b4db14..63390bc3e6 100644 --- a/public/js/ff/transactions/edit.js +++ b/public/js/ff/transactions/edit.js @@ -2,11 +2,12 @@ * edit.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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. */ -/* globals $ */ $(document).ready(function () { "use strict"; // no special JS for edit transaction. diff --git a/public/js/ff/transactions/list.js b/public/js/ff/transactions/list.js index 42786654a3..7e87446a48 100644 --- a/public/js/ff/transactions/list.js +++ b/public/js/ff/transactions/list.js @@ -1,4 +1,12 @@ -/* globals $, edit_selected_txt, delete_selected_txt */ +/* + * list.js + * Copyright (C) 2016 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. + */ $(document).ready(function () { "use strict"; diff --git a/routes/api.php b/routes/api.php index 5f4cc3f27e..f5c5fdb62b 100755 --- a/routes/api.php +++ b/routes/api.php @@ -3,9 +3,12 @@ * api.php * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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); use Illuminate\Http\Request; diff --git a/routes/console.php b/routes/console.php index 6cfd0b721d..f0c08dc0c1 100755 --- a/routes/console.php +++ b/routes/console.php @@ -3,9 +3,12 @@ * console.php * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * 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); /*