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

Merge branch 'release/5.5.11' into main

Browse Source
This commit is contained in:
James Cole 2021-05-08 21:35:16 +02:00
commit 13b96bb3b6
54 changed files with 656 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/Upgrade/BackToJournals.php
View File

@ -64,7 +64,7 @@ class BackToJournals extends Command
$this->error('Please run firefly-iii:migrate-to-groups first.'); $this->error('Please run firefly-iii:migrate-to-groups first.');
} }
if ($this->isExecuted() && true !== $this->option('force')) { if ($this->isExecuted() && true !== $this->option('force')) {
$this->info('This command has already been executed.'); $this->warn('This command has already been executed.');
return 0; return 0;
} }

2
app/Generator/Webhook/StandardMessageGenerator.php
View File

@ -101,7 +101,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
*/ */
private function getWebhooks(): Collection private function getWebhooks(): Collection
{ {
return $this->user->webhooks()->where('active', 1)->where('trigger', $this->trigger)->get(['webhooks.*']); return $this->user->webhooks()->where('active', true)->where('trigger', $this->trigger)->get(['webhooks.*']);
} }
/** /**

2
app/Helpers/Collector/GroupCollector.php
View File

@ -497,7 +497,7 @@ class GroupCollector implements GroupCollectorInterface
->where( ->where(
static function (EloquentBuilder $q1) { static function (EloquentBuilder $q1) {
$q1->where('attachments.attachable_type', TransactionJournal::class); $q1->where('attachments.attachable_type', TransactionJournal::class);
$q1->where('attachments.uploaded', 1); $q1->where('attachments.uploaded', true);
$q1->orWhereNull('attachments.attachable_type'); $q1->orWhereNull('attachments.attachable_type');
} }
); );

2
app/Http/Controllers/ProfileController.php
View File

@ -354,7 +354,7 @@ class ProfileController extends Controller
$user = auth()->user(); $user = auth()->user();
$isInternalAuth = $this->internalAuth; $isInternalAuth = $this->internalAuth;
$isInternalIdentity = $this->internalIdentity; $isInternalIdentity = $this->internalIdentity;
$count = DB::table('oauth_clients')->where('personal_access_client', 1)->whereNull('user_id')->count(); $count = DB::table('oauth_clients')->where('personal_access_client', true)->whereNull('user_id')->count();
$subTitle = $user->email; $subTitle = $user->email;
$userId = $user->id; $userId = $user->id;
$enabled2FA = null !== $user->mfa_secret; $enabled2FA = null !== $user->mfa_secret;

1
app/Http/Controllers/Rule/SelectController.php
View File

@ -158,6 +158,7 @@ class SelectController extends Controller
$rule->ruleTriggers = $triggers; $rule->ruleTriggers = $triggers;
// create new rule engine: // create new rule engine:
/** @var RuleEngineInterface $newRuleEngine */
$newRuleEngine = app(RuleEngineInterface::class); $newRuleEngine = app(RuleEngineInterface::class);
// set rules: // set rules:

6
app/Repositories/Account/AccountRepository.php
View File

@ -259,7 +259,7 @@ class AccountRepository implements AccountRepositoryInterface
if (0 !== count($types)) { if (0 !== count($types)) {
$query->accountTypeIn($types); $query->accountTypeIn($types);
} }
$query->where('active', 1); $query->where('active', true);
$query->orderBy('accounts.account_type_id', 'ASC'); $query->orderBy('accounts.account_type_id', 'ASC');
$query->orderBy('accounts.order', 'ASC'); $query->orderBy('accounts.order', 'ASC');
$query->orderBy('accounts.name', 'ASC'); $query->orderBy('accounts.name', 'ASC');
@ -640,7 +640,7 @@ class AccountRepository implements AccountRepositoryInterface
public function searchAccount(string $query, array $types, int $limit): Collection public function searchAccount(string $query, array $types, int $limit): Collection
{ {
$dbQuery = $this->user->accounts() $dbQuery = $this->user->accounts()
->where('active', 1) ->where('active', true)
->orderBy('accounts.order', 'ASC') ->orderBy('accounts.order', 'ASC')
->orderBy('accounts.account_type_id', 'ASC') ->orderBy('accounts.account_type_id', 'ASC')
->orderBy('accounts.name', 'ASC') ->orderBy('accounts.name', 'ASC')
@ -669,7 +669,7 @@ class AccountRepository implements AccountRepositoryInterface
{ {
$dbQuery = $this->user->accounts()->distinct() $dbQuery = $this->user->accounts()->distinct()
->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id') ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
->where('accounts.active', 1) ->where('accounts.active', true)
->orderBy('accounts.order', 'ASC') ->orderBy('accounts.order', 'ASC')
->orderBy('accounts.account_type_id', 'ASC') ->orderBy('accounts.account_type_id', 'ASC')
->orderBy('accounts.name', 'ASC') ->orderBy('accounts.name', 'ASC')

6
app/Repositories/Account/OperationsRepository.php
View File

@ -261,6 +261,12 @@ class OperationsRepository implements OperationsRepositoryInterface
$collector->setSourceAccounts($opposing); $collector->setSourceAccounts($opposing);
} }
} }
if(TransactionType::TRANSFER === $type) {
// supports only accounts, not opposing.
if(null !== $accounts) {
$collector->setAccounts($accounts);
}
}
if (null !== $currency) { if (null !== $currency) {
$collector->setCurrency($currency); $collector->setCurrency($currency);

2
app/Repositories/Bill/BillRepository.php
View File

@ -166,7 +166,7 @@ class BillRepository implements BillRepositoryInterface
public function getActiveBills(): Collection public function getActiveBills(): Collection
{ {
return $this->user->bills() return $this->user->bills()
->where('active', 1) ->where('active', true)
->orderBy('bills.name', 'ASC') ->orderBy('bills.name', 'ASC')
->get(['bills.*', DB::raw('((bills.amount_min + bills.amount_max) / 2) AS expectedAmount'),]); ->get(['bills.*', DB::raw('((bills.amount_min + bills.amount_max) / 2) AS expectedAmount'),]);
} }

4
app/Repositories/Budget/BudgetRepository.php
View File

@ -197,7 +197,7 @@ class BudgetRepository implements BudgetRepositoryInterface
*/ */
public function getActiveBudgets(): Collection public function getActiveBudgets(): Collection
{ {
return $this->user->budgets()->where('active', 1) return $this->user->budgets()->where('active', true)
->orderBy('order', 'ASC') ->orderBy('order', 'ASC')
->orderBy('name', 'ASC') ->orderBy('name', 'ASC')
->get(); ->get();
@ -282,7 +282,7 @@ class BudgetRepository implements BudgetRepositoryInterface
$search->where('name', 'LIKE', sprintf('%%%s%%', $query)); $search->where('name', 'LIKE', sprintf('%%%s%%', $query));
} }
$search->orderBy('order', 'ASC') $search->orderBy('order', 'ASC')
->orderBy('name', 'ASC')->where('active', 1); ->orderBy('name', 'ASC')->where('active', true);
return $search->take($limit)->get(); return $search->take($limit)->get();
} }

2
app/Repositories/Currency/CurrencyRepository.php
View File

@ -448,7 +448,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface
*/ */
public function searchCurrency(string $search, int $limit): Collection public function searchCurrency(string $search, int $limit): Collection
{ {
$query = TransactionCurrency::where('enabled', 1); $query = TransactionCurrency::where('enabled', true);
if ('' !== $search) { if ('' !== $search) {
$query->where('name', 'LIKE', sprintf('%%%s%%', $search)); $query->where('name', 'LIKE', sprintf('%%%s%%', $search));
} }

8
app/Repositories/Rule/RuleRepository.php
View File

@ -211,8 +211,8 @@ class RuleRepository implements RuleRepositoryInterface
{ {
$collection = $this->user->rules() $collection = $this->user->rules()
->leftJoin('rule_groups', 'rule_groups.id', '=', 'rules.rule_group_id') ->leftJoin('rule_groups', 'rule_groups.id', '=', 'rules.rule_group_id')
->where('rules.active', 1) ->where('rules.active', true)
->where('rule_groups.active', 1) ->where('rule_groups.active', true)
->orderBy('rule_groups.order', 'ASC') ->orderBy('rule_groups.order', 'ASC')
->orderBy('rules.order', 'ASC') ->orderBy('rules.order', 'ASC')
->orderBy('rules.id', 'ASC') ->orderBy('rules.id', 'ASC')
@ -238,8 +238,8 @@ class RuleRepository implements RuleRepositoryInterface
{ {
$collection = $this->user->rules() $collection = $this->user->rules()
->leftJoin('rule_groups', 'rule_groups.id', '=', 'rules.rule_group_id') ->leftJoin('rule_groups', 'rule_groups.id', '=', 'rules.rule_group_id')
->where('rules.active', 1) ->where('rules.active', true)
->where('rule_groups.active', 1) ->where('rule_groups.active', true)
->orderBy('rule_groups.order', 'ASC') ->orderBy('rule_groups.order', 'ASC')
->orderBy('rules.order', 'ASC') ->orderBy('rules.order', 'ASC')
->orderBy('rules.id', 'ASC') ->orderBy('rules.id', 'ASC')

12
app/Repositories/RuleGroup/RuleGroupRepository.php
View File

@ -150,7 +150,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
*/ */
public function getActiveGroups(): Collection public function getActiveGroups(): Collection
{ {
return $this->user->ruleGroups()->with(['rules'])->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get(['rule_groups.*']); return $this->user->ruleGroups()->with(['rules'])->where('rule_groups.active', true)->orderBy('order', 'ASC')->get(['rule_groups.*']);
} }
/** /**
@ -161,7 +161,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
public function getActiveRules(RuleGroup $group): Collection public function getActiveRules(RuleGroup $group): Collection
{ {
return $group->rules() return $group->rules()
->where('rules.active', 1) ->where('rules.active', true)
->get(['rules.*']); ->get(['rules.*']);
} }
@ -176,7 +176,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id') ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
->where('rule_triggers.trigger_type', 'user_action') ->where('rule_triggers.trigger_type', 'user_action')
->where('rule_triggers.trigger_value', 'store-journal') ->where('rule_triggers.trigger_value', 'store-journal')
->where('rules.active', 1) ->where('rules.active', true)
->get(['rules.*']); ->get(['rules.*']);
} }
@ -191,7 +191,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id') ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
->where('rule_triggers.trigger_type', 'user_action') ->where('rule_triggers.trigger_type', 'user_action')
->where('rule_triggers.trigger_value', 'update-journal') ->where('rule_triggers.trigger_value', 'update-journal')
->where('rules.active', 1) ->where('rules.active', true)
->get(['rules.*']); ->get(['rules.*']);
} }
@ -326,7 +326,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
*/ */
public function maxOrder(): int public function maxOrder(): int
{ {
return (int)$this->user->ruleGroups()->where('active', 1)->max('order'); return (int)$this->user->ruleGroups()->where('active', true)->max('order');
} }
/** /**
@ -337,7 +337,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
$this->user->ruleGroups()->where('active', false)->update(['order' => 0]); $this->user->ruleGroups()->where('active', false)->update(['order' => 0]);
$set = $this->user $set = $this->user
->ruleGroups() ->ruleGroups()
->where('active', 1) ->where('active', true)
->whereNull('deleted_at') ->whereNull('deleted_at')
->orderBy('order', 'ASC') ->orderBy('order', 'ASC')
->orderBy('title', 'DESC') ->orderBy('title', 'DESC')

2
app/Repositories/TransactionGroup/TransactionGroupRepository.php
View File

@ -102,7 +102,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
$journals = $group->transactionJournals->pluck('id')->toArray(); $journals = $group->transactionJournals->pluck('id')->toArray();
$set = Attachment::whereIn('attachable_id', $journals) $set = Attachment::whereIn('attachable_id', $journals)
->where('attachable_type', TransactionJournal::class) ->where('attachable_type', TransactionJournal::class)
->where('uploaded', 1) ->where('uploaded', true)
->whereNull('deleted_at')->get(); ->whereNull('deleted_at')->get();
$result = []; $result = [];

9
app/Services/Internal/Update/AccountUpdateService.php
View File

@ -136,6 +136,15 @@ class AccountUpdateService
$account->account_type_id = $type->id; $account->account_type_id = $type->id;
} }
} }
// set liability, alternative method used in v1 layout:
if ($this->isLiability($account) && array_key_exists('account_type_id', $data)) {
$type = AccountType::find((int)$data['account_type_id']);
if (null !== $type && in_array($type->type, config('firefly.valid_liabilities'), true)) {
$account->account_type_id = $type->id;
}
}
// update virtual balance (could be set to zero if empty string). // update virtual balance (could be set to zero if empty string).
if (array_key_exists('virtual_balance', $data) && null !== $data['virtual_balance']) { if (array_key_exists('virtual_balance', $data) && null !== $data['virtual_balance']) {

4
app/Support/Binder/BudgetList.php
View File

@ -46,7 +46,7 @@ class BudgetList implements BinderInterface
if (auth()->check()) { if (auth()->check()) {
if ('allBudgets' === $value) { if ('allBudgets' === $value) {
return auth()->user()->budgets()->where('active', 1) return auth()->user()->budgets()->where('active', true)
->orderBy('order', 'ASC') ->orderBy('order', 'ASC')
->orderBy('name', 'ASC') ->orderBy('name', 'ASC')
->get(); ->get();
@ -63,7 +63,7 @@ class BudgetList implements BinderInterface
/** @var Collection $collection */ /** @var Collection $collection */
$collection = auth()->user()->budgets() $collection = auth()->user()->budgets()
->where('active', 1) ->where('active', true)
->whereIn('id', $list) ->whereIn('id', $list)
->get(); ->get();

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

@ -61,7 +61,7 @@ trait RuleManagement
], ],
[ [
'type' => 'from_account_is', 'type' => 'from_account_is',
'value' => (string)trans('firefly.default_rule_trigger_from_account'), 'value' => (string)trans('firefly.default_rule_trigger_source_account'),
'stop_processing' => false, 'stop_processing' => false,
], ],

23
app/TransactionRules/Engine/SearchRuleEngine.php
View File

@ -145,6 +145,7 @@ class SearchRuleEngine implements RuleEngineInterface
*/ */
public function setRules(Collection $rules): void public function setRules(Collection $rules): void
{ {
Log::debug(__METHOD__); Log::debug(__METHOD__);
foreach ($rules as $rule) { foreach ($rules as $rule) {
if ($rule instanceof Rule) { if ($rule instanceof Rule) {
@ -227,8 +228,16 @@ class SearchRuleEngine implements RuleEngineInterface
{ {
Log::debug(sprintf('Now in findStrictRule(#%d)', $rule->id ?? 0)); Log::debug(sprintf('Now in findStrictRule(#%d)', $rule->id ?? 0));
$searchArray = []; $searchArray = [];
/** @var Collection $triggers */
$triggers = $rule->ruleTriggers;
/** @var RuleTrigger $ruleTrigger */ /** @var RuleTrigger $ruleTrigger */
foreach ($rule->ruleTriggers()->where('active', 1)->get() as $ruleTrigger) { foreach ($triggers as $ruleTrigger) {
if (false === $ruleTrigger->active) {
continue;
}
// if needs no context, value is different: // if needs no context, value is different:
$needsContext = config(sprintf('firefly.search.operators.%s.needs_context', $ruleTrigger->trigger_type)) ?? true; $needsContext = config(sprintf('firefly.search.operators.%s.needs_context', $ruleTrigger->trigger_type)) ?? true;
if (false === $needsContext) { if (false === $needsContext) {
@ -241,6 +250,7 @@ class SearchRuleEngine implements RuleEngineInterface
} }
} }
// add local operators: // add local operators:
foreach ($this->operators as $operator) { foreach ($this->operators as $operator) {
Log::debug(sprintf('SearchRuleEngine:: add local added operator: %s:"%s"', $operator['type'], $operator['value'])); Log::debug(sprintf('SearchRuleEngine:: add local added operator: %s:"%s"', $operator['type'], $operator['value']));
@ -373,7 +383,7 @@ class SearchRuleEngine implements RuleEngineInterface
{ {
Log::debug(sprintf('SearchRuleEngine:: Will now execute actions on transaction journal #%d', $transaction['transaction_journal_id'])); Log::debug(sprintf('SearchRuleEngine:: Will now execute actions on transaction journal #%d', $transaction['transaction_journal_id']));
/** @var RuleAction $ruleAction */ /** @var RuleAction $ruleAction */
foreach ($rule->ruleActions()->where('active', 1)->get() as $ruleAction) { foreach ($rule->ruleActions()->where('active', true)->get() as $ruleAction) {
$break = $this->processRuleAction($ruleAction, $transaction); $break = $this->processRuleAction($ruleAction, $transaction);
if (true === $break) { if (true === $break) {
break; break;
@ -448,8 +458,15 @@ class SearchRuleEngine implements RuleEngineInterface
// start a search query for individual each trigger: // start a search query for individual each trigger:
$total = new Collection; $total = new Collection;
$count = 0; $count = 0;
/** @var Collection $triggers */
$triggers = $rule->ruleTriggers;
/** @var RuleTrigger $ruleTrigger */ /** @var RuleTrigger $ruleTrigger */
foreach ($rule->ruleTriggers()->where('active', 1)->get() as $ruleTrigger) { foreach ($triggers as $ruleTrigger) {
if (false === $ruleTrigger->active) {
continue;
}
if ('user_action' === $ruleTrigger->trigger_type) { if ('user_action' === $ruleTrigger->trigger_type) {
Log::debug('Skip trigger type.'); Log::debug('Skip trigger type.');
continue; continue;

10
changelog.md
View File

@ -2,6 +2,16 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## 5.5.11 - 2021-05-08
⚠️ On July 1st 2021 the Docker tag will change to `fireflyiii/core`. You can already start using the new tag.
### Fixed
- [Issue 4707](https://github.com/firefly-iii/firefly-iii/issues/4707) [issue 4732](https://github.com/firefly-iii/firefly-iii/issues/4732) Rule tests were broken, and matching transactions were not visible.
- [Issue 4729](https://github.com/firefly-iii/firefly-iii/issues/4729) Top boxes were no longer visible.
- [Issue 4730](https://github.com/firefly-iii/firefly-iii/issues/4730) Second split transaction had today's date
- [Issue 4734](https://github.com/firefly-iii/firefly-iii/issues/4734) Potential fixes for PostgreSQL and PHP 7.4.18.
- [Issue 4739](https://github.com/firefly-iii/firefly-iii/issues/4739) Was not possible to change liability type.
## 5.5.10 - 2021-05-01 ## 5.5.10 - 2021-05-01

226
composer.lock generated
View File

@ -2192,16 +2192,16 @@
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
"version": "1.5.8", "version": "1.6.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/commonmark.git", "url": "https://github.com/thephpleague/commonmark.git",
"reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf" "reference": "2651c497f005de305c7ba3f232cbd87b8c00ee8c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf", "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2651c497f005de305c7ba3f232cbd87b8c00ee8c",
"reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf", "reference": "2651c497f005de305c7ba3f232cbd87b8c00ee8c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2289,7 +2289,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-28T18:51:39+00:00" "time": "2021-05-08T16:08:00+00:00"
}, },
{ {
"name": "league/csv", "name": "league/csv",
@ -2833,16 +2833,16 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "2.46.0", "version": "2.47.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4" "reference": "606262fd8888b75317ba9461825a24fc34001e1e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/606262fd8888b75317ba9461825a24fc34001e1e",
"reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4", "reference": "606262fd8888b75317ba9461825a24fc34001e1e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2922,7 +2922,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-02-24T17:30:44+00:00" "time": "2021-04-13T21:54:02+00:00"
}, },
{ {
"name": "nyholm/psr7", "name": "nyholm/psr7",
@ -3924,16 +3924,16 @@
}, },
{ {
"name": "psr/log", "name": "psr/log",
"version": "1.1.3", "version": "1.1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/log.git", "url": "https://github.com/php-fig/log.git",
"reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
"reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3957,7 +3957,7 @@
"authors": [ "authors": [
{ {
"name": "PHP-FIG", "name": "PHP-FIG",
"homepage": "http://www.php-fig.org/" "homepage": "https://www.php-fig.org/"
} }
], ],
"description": "Common interface for logging libraries", "description": "Common interface for logging libraries",
@ -3968,9 +3968,9 @@
"psr-3" "psr-3"
], ],
"support": { "support": {
"source": "https://github.com/php-fig/log/tree/1.1.3" "source": "https://github.com/php-fig/log/tree/1.1.4"
}, },
"time": "2020-03-23T09:12:05+00:00" "time": "2021-05-03T11:20:27+00:00"
}, },
{ {
"name": "psr/simple-cache", "name": "psr/simple-cache",
@ -4449,16 +4449,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v5.2.6", "version": "v5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d" "reference": "90374b8ed059325b49a29b55b3f8bb4062c87629"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/35f039df40a3b335ebf310f244cb242b3a83ac8d", "url": "https://api.github.com/repos/symfony/console/zipball/90374b8ed059325b49a29b55b3f8bb4062c87629",
"reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d", "reference": "90374b8ed059325b49a29b55b3f8bb4062c87629",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4526,7 +4526,7 @@
"terminal" "terminal"
], ],
"support": { "support": {
"source": "https://github.com/symfony/console/tree/v5.2.6" "source": "https://github.com/symfony/console/tree/v5.2.7"
}, },
"funding": [ "funding": [
{ {
@ -4542,20 +4542,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-28T09:42:18+00:00" "time": "2021-04-19T14:07:32+00:00"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v5.2.4", "version": "v5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/css-selector.git", "url": "https://github.com/symfony/css-selector.git",
"reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f" "reference": "59a684f5ac454f066ecbe6daecce6719aed283fb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/f65f217b3314504a1ec99c2d6ef69016bb13490f", "url": "https://api.github.com/repos/symfony/css-selector/zipball/59a684f5ac454f066ecbe6daecce6719aed283fb",
"reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f", "reference": "59a684f5ac454f066ecbe6daecce6719aed283fb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4591,7 +4591,7 @@
"description": "Converts CSS selectors to XPath expressions", "description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/css-selector/tree/v5.2.4" "source": "https://github.com/symfony/css-selector/tree/v5.3.0-BETA1"
}, },
"funding": [ "funding": [
{ {
@ -4607,7 +4607,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-01-27T10:01:46+00:00" "time": "2021-04-07T16:07:52+00:00"
}, },
{ {
"name": "symfony/deprecation-contracts", "name": "symfony/deprecation-contracts",
@ -4678,16 +4678,16 @@
}, },
{ {
"name": "symfony/error-handler", "name": "symfony/error-handler",
"version": "v5.2.6", "version": "v5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/error-handler.git", "url": "https://github.com/symfony/error-handler.git",
"reference": "bdb7fb4188da7f4211e4b88350ba0dfdad002b03" "reference": "ea3ddbf67615e883ca7c33a4de61213789846782"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/bdb7fb4188da7f4211e4b88350ba0dfdad002b03", "url": "https://api.github.com/repos/symfony/error-handler/zipball/ea3ddbf67615e883ca7c33a4de61213789846782",
"reference": "bdb7fb4188da7f4211e4b88350ba0dfdad002b03", "reference": "ea3ddbf67615e883ca7c33a4de61213789846782",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4727,7 +4727,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code", "description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/error-handler/tree/v5.2.6" "source": "https://github.com/symfony/error-handler/tree/v5.2.7"
}, },
"funding": [ "funding": [
{ {
@ -4743,7 +4743,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-16T09:07:47+00:00" "time": "2021-04-07T15:57:33+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
@ -5050,16 +5050,16 @@
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v5.2.4", "version": "v5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "54499baea7f7418bce7b5ec92770fd0799e8e9bf" "reference": "a416487a73bb9c9d120e9ba3a60547f4a3fb7a1f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/54499baea7f7418bce7b5ec92770fd0799e8e9bf", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a416487a73bb9c9d120e9ba3a60547f4a3fb7a1f",
"reference": "54499baea7f7418bce7b5ec92770fd0799e8e9bf", "reference": "a416487a73bb9c9d120e9ba3a60547f4a3fb7a1f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5103,7 +5103,7 @@
"description": "Defines an object-oriented layer for the HTTP specification", "description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-foundation/tree/v5.2.4" "source": "https://github.com/symfony/http-foundation/tree/v5.2.7"
}, },
"funding": [ "funding": [
{ {
@ -5119,20 +5119,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-02-25T17:16:57+00:00" "time": "2021-05-01T13:46:24+00:00"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v5.2.6", "version": "v5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "f34de4c61ca46df73857f7f36b9a3805bdd7e3b2" "reference": "1e9f6879f070f718e0055fbac232a56f67b8b6bd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/f34de4c61ca46df73857f7f36b9a3805bdd7e3b2", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1e9f6879f070f718e0055fbac232a56f67b8b6bd",
"reference": "f34de4c61ca46df73857f7f36b9a3805bdd7e3b2", "reference": "1e9f6879f070f718e0055fbac232a56f67b8b6bd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5215,7 +5215,7 @@
"description": "Provides a structured process for converting a Request into a Response", "description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-kernel/tree/v5.2.6" "source": "https://github.com/symfony/http-kernel/tree/v5.2.7"
}, },
"funding": [ "funding": [
{ {
@ -5231,20 +5231,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-29T05:16:58+00:00" "time": "2021-05-01T14:53:15+00:00"
}, },
{ {
"name": "symfony/mime", "name": "symfony/mime",
"version": "v5.2.6", "version": "v5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/mime.git", "url": "https://github.com/symfony/mime.git",
"reference": "1b2092244374cbe48ae733673f2ca0818b37197b" "reference": "7af452bf51c46f18da00feb32e1ad36db9426515"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/1b2092244374cbe48ae733673f2ca0818b37197b", "url": "https://api.github.com/repos/symfony/mime/zipball/7af452bf51c46f18da00feb32e1ad36db9426515",
"reference": "1b2092244374cbe48ae733673f2ca0818b37197b", "reference": "7af452bf51c46f18da00feb32e1ad36db9426515",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5298,7 +5298,7 @@
"mime-type" "mime-type"
], ],
"support": { "support": {
"source": "https://github.com/symfony/mime/tree/v5.2.6" "source": "https://github.com/symfony/mime/tree/v5.2.7"
}, },
"funding": [ "funding": [
{ {
@ -5314,7 +5314,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-12T13:18:39+00:00" "time": "2021-04-29T20:47:09+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
@ -6047,16 +6047,16 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v5.2.4", "version": "v5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f" "reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f", "url": "https://api.github.com/repos/symfony/process/zipball/98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e",
"reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f", "reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6089,7 +6089,7 @@
"description": "Executes commands in sub-processes", "description": "Executes commands in sub-processes",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/process/tree/v5.2.4" "source": "https://github.com/symfony/process/tree/v5.3.0-BETA1"
}, },
"funding": [ "funding": [
{ {
@ -6105,7 +6105,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-01-27T10:15:41+00:00" "time": "2021-04-08T10:27:02+00:00"
}, },
{ {
"name": "symfony/psr-http-message-bridge", "name": "symfony/psr-http-message-bridge",
@ -6197,16 +6197,16 @@
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v5.2.6", "version": "v5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/routing.git", "url": "https://github.com/symfony/routing.git",
"reference": "31fba555f178afd04d54fd26953501b2c3f0c6e6" "reference": "3f0cab2e95b5e92226f34c2c1aa969d3fc41f48c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/31fba555f178afd04d54fd26953501b2c3f0c6e6", "url": "https://api.github.com/repos/symfony/routing/zipball/3f0cab2e95b5e92226f34c2c1aa969d3fc41f48c",
"reference": "31fba555f178afd04d54fd26953501b2c3f0c6e6", "reference": "3f0cab2e95b5e92226f34c2c1aa969d3fc41f48c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6229,7 +6229,6 @@
"symfony/yaml": "^4.4|^5.0" "symfony/yaml": "^4.4|^5.0"
}, },
"suggest": { "suggest": {
"doctrine/annotations": "For using the annotation loader",
"symfony/config": "For using the all-in-one router or any loader", "symfony/config": "For using the all-in-one router or any loader",
"symfony/expression-language": "For using expression matching", "symfony/expression-language": "For using expression matching",
"symfony/http-foundation": "For using a Symfony Request object", "symfony/http-foundation": "For using a Symfony Request object",
@ -6267,7 +6266,7 @@
"url" "url"
], ],
"support": { "support": {
"source": "https://github.com/symfony/routing/tree/v5.2.6" "source": "https://github.com/symfony/routing/tree/v5.2.7"
}, },
"funding": [ "funding": [
{ {
@ -6283,7 +6282,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-14T13:53:33+00:00" "time": "2021-04-11T22:55:21+00:00"
}, },
{ {
"name": "symfony/service-contracts", "name": "symfony/service-contracts",
@ -6449,16 +6448,16 @@
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v5.2.6", "version": "v5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1" "reference": "e37ece5242564bceea54d709eafc948377ec9749"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/2cc7f45d96db9adfcf89adf4401d9dfed509f4e1", "url": "https://api.github.com/repos/symfony/translation/zipball/e37ece5242564bceea54d709eafc948377ec9749",
"reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1", "reference": "e37ece5242564bceea54d709eafc948377ec9749",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6522,7 +6521,7 @@
"description": "Provides tools to internationalize your application", "description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/translation/tree/v5.2.6" "source": "https://github.com/symfony/translation/tree/v5.2.7"
}, },
"funding": [ "funding": [
{ {
@ -6538,7 +6537,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-23T19:33:48+00:00" "time": "2021-04-01T08:15:21+00:00"
}, },
{ {
"name": "symfony/translation-contracts", "name": "symfony/translation-contracts",
@ -6620,16 +6619,16 @@
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v5.2.6", "version": "v5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "89412a68ea2e675b4e44f260a5666729f77f668e" "reference": "27cb9f7cfa3853c736425c7233a8f68814b19636"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/89412a68ea2e675b4e44f260a5666729f77f668e", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/27cb9f7cfa3853c736425c7233a8f68814b19636",
"reference": "89412a68ea2e675b4e44f260a5666729f77f668e", "reference": "27cb9f7cfa3853c736425c7233a8f68814b19636",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -6688,7 +6687,7 @@
"dump" "dump"
], ],
"support": { "support": {
"source": "https://github.com/symfony/var-dumper/tree/v5.2.6" "source": "https://github.com/symfony/var-dumper/tree/v5.2.7"
}, },
"funding": [ "funding": [
{ {
@ -6704,7 +6703,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-28T09:42:18+00:00" "time": "2021-04-19T14:07:32+00:00"
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
@ -8342,16 +8341,16 @@
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v4.10.4", "version": "v4.10.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e" "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
"reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e", "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -8392,9 +8391,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/nikic/PHP-Parser/issues", "issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4" "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5"
}, },
"time": "2020-12-20T10:01:03+00:00" "time": "2021-05-03T19:11:20+00:00"
}, },
{ {
"name": "nunomaduro/larastan", "name": "nunomaduro/larastan",
@ -8831,16 +8830,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.12.85", "version": "0.12.86",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "20e6333c0067875ad7697cd8acdf245c6ef69d03" "reference": "a84fdc53ecca7643dbc89ef8880d8b393a6c155a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/20e6333c0067875ad7697cd8acdf245c6ef69d03", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a84fdc53ecca7643dbc89ef8880d8b393a6c155a",
"reference": "20e6333c0067875ad7697cd8acdf245c6ef69d03", "reference": "a84fdc53ecca7643dbc89ef8880d8b393a6c155a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -8871,7 +8870,7 @@
"description": "PHPStan - PHP Static Analysis Tool", "description": "PHPStan - PHP Static Analysis Tool",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.85" "source": "https://github.com/phpstan/phpstan/tree/0.12.86"
}, },
"funding": [ "funding": [
{ {
@ -8887,7 +8886,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-04-27T14:13:16+00:00" "time": "2021-05-08T11:29:01+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",
@ -9417,12 +9416,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git", "url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "2da463d475b13cf8c519d862f1a6423ab7a515e3" "reference": "07314cf15422b2e162d591fe8ef2b850612b808f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2da463d475b13cf8c519d862f1a6423ab7a515e3", "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/07314cf15422b2e162d591fe8ef2b850612b808f",
"reference": "2da463d475b13cf8c519d862f1a6423ab7a515e3", "reference": "07314cf15422b2e162d591fe8ef2b850612b808f",
"shasum": "" "shasum": ""
}, },
"conflict": { "conflict": {
@ -9440,7 +9439,7 @@
"barrelstrength/sprout-forms": "<3.9", "barrelstrength/sprout-forms": "<3.9",
"baserproject/basercms": ">=4,<=4.3.6|>=4.4,<4.4.1", "baserproject/basercms": ">=4,<=4.3.6|>=4.4,<4.4.1",
"bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3",
"bolt/bolt": "<3.7.1", "bolt/bolt": "<3.7.2",
"bolt/core": "<4.1.13", "bolt/core": "<4.1.13",
"brightlocal/phpwhois": "<=4.2.5", "brightlocal/phpwhois": "<=4.2.5",
"buddypress/buddypress": "<5.1.2", "buddypress/buddypress": "<5.1.2",
@ -9472,6 +9471,7 @@
"dompdf/dompdf": ">=0.6,<0.6.2", "dompdf/dompdf": ">=0.6,<0.6.2",
"drupal/core": ">=7,<7.74|>=8,<8.8.11|>=8.9,<8.9.9|>=9,<9.0.8", "drupal/core": ">=7,<7.74|>=8,<8.8.11|>=8.9,<8.9.9|>=9,<9.0.8",
"drupal/drupal": ">=7,<7.74|>=8,<8.8.11|>=8.9,<8.9.9|>=9,<9.0.8", "drupal/drupal": ">=7,<7.74|>=8,<8.8.11|>=8.9,<8.9.9|>=9,<9.0.8",
"dweeves/magmi": "<=0.7.24",
"endroid/qr-code-bundle": "<3.4.2", "endroid/qr-code-bundle": "<3.4.2",
"enshrined/svg-sanitize": "<0.13.1", "enshrined/svg-sanitize": "<0.13.1",
"erusev/parsedown": "<1.7.2", "erusev/parsedown": "<1.7.2",
@ -9496,7 +9496,9 @@
"flarum/tags": "<=0.1-beta.13", "flarum/tags": "<=0.1-beta.13",
"fluidtypo3/vhs": "<5.1.1", "fluidtypo3/vhs": "<5.1.1",
"fooman/tcpdf": "<6.2.22", "fooman/tcpdf": "<6.2.22",
"forkcms/forkcms": "<5.8.3",
"fossar/tcpdf-parser": "<6.2.22", "fossar/tcpdf-parser": "<6.2.22",
"francoisjacquet/rosariosis": "<6.5.1",
"friendsofsymfony/oauth2-php": "<1.3", "friendsofsymfony/oauth2-php": "<1.3",
"friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2",
"friendsofsymfony/user-bundle": ">=1.2,<1.3.5", "friendsofsymfony/user-bundle": ">=1.2,<1.3.5",
@ -9527,7 +9529,7 @@
"laravel/framework": "<6.20.26|>=7,<8.40", "laravel/framework": "<6.20.26|>=7,<8.40",
"laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10",
"league/commonmark": "<0.18.3", "league/commonmark": "<0.18.3",
"librenms/librenms": "<1.53", "librenms/librenms": "<21.1",
"livewire/livewire": ">2.2.4,<2.2.6", "livewire/livewire": ">2.2.4,<2.2.6",
"magento/community-edition": ">=2,<2.2.10|>=2.3,<2.3.3", "magento/community-edition": ">=2,<2.2.10|>=2.3,<2.3.3",
"magento/magento1ce": "<1.9.4.3", "magento/magento1ce": "<1.9.4.3",
@ -9548,11 +9550,12 @@
"nystudio107/craft-seomatic": "<3.3", "nystudio107/craft-seomatic": "<3.3",
"nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1", "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1",
"october/backend": "<1.1.2", "october/backend": "<1.1.2",
"october/cms": "= 1.0.469|>=1.0.319,<1.0.469", "october/cms": "= 1.1.1|= 1.0.471|= 1.0.469|>=1.0.319,<1.0.469",
"october/october": ">=1.0.319,<1.0.466", "october/october": ">=1.0.319,<1.0.466",
"october/rain": "<1.0.472|>=1.1,<1.1.2", "october/rain": "<1.0.472|>=1.1,<1.1.2",
"onelogin/php-saml": "<2.10.4", "onelogin/php-saml": "<2.10.4",
"oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5", "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5",
"opencart/opencart": "<=3.0.3.2",
"openid/php-openid": "<2.3", "openid/php-openid": "<2.3",
"openmage/magento-lts": "<=19.4.12|>=20,<=20.0.8", "openmage/magento-lts": "<=19.4.12|>=20,<=20.0.8",
"orchid/platform": ">=9,<9.4.4", "orchid/platform": ">=9,<9.4.4",
@ -9566,7 +9569,7 @@
"pear/archive_tar": "<1.4.12", "pear/archive_tar": "<1.4.12",
"personnummer/personnummer": "<3.0.2", "personnummer/personnummer": "<3.0.2",
"phpfastcache/phpfastcache": ">=5,<5.0.13", "phpfastcache/phpfastcache": ">=5,<5.0.13",
"phpmailer/phpmailer": "<6.1.6", "phpmailer/phpmailer": "<6.1.6|>=6.1.8,<6.4.1",
"phpmussel/phpmussel": ">=1,<1.6", "phpmussel/phpmussel": ">=1,<1.6",
"phpmyadmin/phpmyadmin": "<4.9.6|>=5,<5.0.3", "phpmyadmin/phpmyadmin": "<4.9.6|>=5,<5.0.3",
"phpoffice/phpexcel": "<1.8.2", "phpoffice/phpexcel": "<1.8.2",
@ -9724,7 +9727,8 @@
"zetacomponents/mail": "<1.8.2", "zetacomponents/mail": "<1.8.2",
"zf-commons/zfc-user": "<1.2.2", "zf-commons/zfc-user": "<1.2.2",
"zfcampus/zf-apigility-doctrine": ">=1,<1.0.3", "zfcampus/zf-apigility-doctrine": ">=1,<1.0.3",
"zfr/zfr-oauth2-server-module": "<0.1.2" "zfr/zfr-oauth2-server-module": "<0.1.2",
"zoujingli/thinkadmin": "<6.0.22"
}, },
"type": "metapackage", "type": "metapackage",
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -9758,7 +9762,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-04-30T18:08:49+00:00" "time": "2021-05-06T19:08:33+00:00"
}, },
{ {
"name": "sebastian/cli-parser", "name": "sebastian/cli-parser",
@ -10837,16 +10841,16 @@
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v4.4.20", "version": "v4.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
"reference": "157bbec4fd773bae53c5483c50951a5530a2cc16" "reference": "45b2136377cca5f10af858968d6079a482bca473"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/157bbec4fd773bae53c5483c50951a5530a2cc16", "url": "https://api.github.com/repos/symfony/debug/zipball/45b2136377cca5f10af858968d6079a482bca473",
"reference": "157bbec4fd773bae53c5483c50951a5530a2cc16", "reference": "45b2136377cca5f10af858968d6079a482bca473",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -10886,7 +10890,7 @@
"description": "Provides tools to ease debugging PHP code", "description": "Provides tools to ease debugging PHP code",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/debug/tree/v4.4.20" "source": "https://github.com/symfony/debug/tree/v4.4.22"
}, },
"funding": [ "funding": [
{ {
@ -10902,20 +10906,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-01-28T16:54:48+00:00" "time": "2021-04-02T07:50:12+00:00"
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v5.2.6", "version": "v5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/filesystem.git", "url": "https://github.com/symfony/filesystem.git",
"reference": "8c86a82f51658188119e62cff0a050a12d09836f" "reference": "056e92acc21d977c37e6ea8e97374b2a6c8551b0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/8c86a82f51658188119e62cff0a050a12d09836f", "url": "https://api.github.com/repos/symfony/filesystem/zipball/056e92acc21d977c37e6ea8e97374b2a6c8551b0",
"reference": "8c86a82f51658188119e62cff0a050a12d09836f", "reference": "056e92acc21d977c37e6ea8e97374b2a6c8551b0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -10948,7 +10952,7 @@
"description": "Provides basic utilities for the filesystem", "description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/filesystem/tree/v5.2.6" "source": "https://github.com/symfony/filesystem/tree/v5.2.7"
}, },
"funding": [ "funding": [
{ {
@ -10964,7 +10968,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-28T14:30:26+00:00" "time": "2021-04-01T10:42:13+00:00"
}, },
{ {
"name": "thecodingmachine/phpstan-strict-rules", "name": "thecodingmachine/phpstan-strict-rules",

2
config/firefly.php
View File

@ -100,7 +100,7 @@ return [
'handle_debts' => true, 'handle_debts' => true,
], ],
'version' => '5.5.10', 'version' => '5.5.11',
'api_version' => '1.5.2', 'api_version' => '1.5.2',
'db_version' => 16, 'db_version' => 16,
'maxUploadSize' => 1073741824, // 1 GB 'maxUploadSize' => 1073741824, // 1 GB

1
frontend/mix-manifest.json
View File

@ -4,6 +4,7 @@
"/public/js/accounts/delete.js": "/public/js/accounts/delete.js", "/public/js/accounts/delete.js": "/public/js/accounts/delete.js",
"/public/js/accounts/show.js": "/public/js/accounts/show.js", "/public/js/accounts/show.js": "/public/js/accounts/show.js",
"/public/js/accounts/create.js": "/public/js/accounts/create.js", "/public/js/accounts/create.js": "/public/js/accounts/create.js",
"/public/js/budgets/index.js": "/public/js/budgets/index.js",
"/public/js/transactions/create.js": "/public/js/transactions/create.js", "/public/js/transactions/create.js": "/public/js/transactions/create.js",
"/public/js/transactions/edit.js": "/public/js/transactions/edit.js", "/public/js/transactions/edit.js": "/public/js/transactions/edit.js",
"/public/js/transactions/index.js": "/public/js/transactions/index.js", "/public/js/transactions/index.js": "/public/js/transactions/index.js",

114
frontend/src/components/budgets/Index.vue Normal file
View File

@ -0,0 +1,114 @@
<!--
- Index.vue
- Copyright (c) 2021 james@firefly-iii.org
-
- This file is part of Firefly III (https://github.com/firefly-iii).
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<template>
<div>
<p>
<span class="d-block">(all)</span>
<span class="d-none d-xl-block">xl</span>
<span class="d-none d-lg-block d-xl-none">lg</span>
<span class="d-none d-md-block d-lg-none">md</span>
<span class="d-none d-sm-block d-md-none">sm</span>
<span class="d-block d-sm-none">xs</span>
</p>
<div class="row">
<div class="col-xl-2 col-lg-4 col-md-4 col-sm-4 col-6">
<div class="card card-primary">
<div class="card-header">
<h3 class="card-title">Budgets</h3>
</div>
<div class="card-body">
Budget X<br>
Budget Y<br>
Budget X<br>
Budget Y<br>
Budget X<br>
Budget Y<br>
Budget X<br>
Budget Y<br>
</div>
</div>
</div>
<div class="col-xl-10 col-lg-8 col-md-8 col-sm-8 col-6">
<div class="container-fluid" style="overflow:scroll;">
<div class="d-flex flex-row flex-nowrap">
<div class="card card-body-budget" v-for="n in 5">
<div class="card-header">
<h3 class="card-title">Maand yXz</h3>
</div>
<div class="card-body">
Some text<br>
Some text<br>
Some text<br>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: "Index",
created() {
}
}
</script>
<style scoped>
.card-body-budget {
min-width: 300px;
margin-right: 5px;
}
.holder-titles {
display: flex;
flex-direction: column-reverse;
}
.title-block {
border: 1px red solid;
}
.holder-blocks {
display: flex;
flex-direction: column-reverse;
}
.budget-block {
border: 1px blue solid;
}
.budget-block-unused {
border: 1px green solid;
}
.budget-block-unset {
border: 1px purple solid;
}
</style>

6
frontend/src/components/dashboard/BudgetLimitRow.vue
View File

@ -27,7 +27,7 @@
<td style="vertical-align: middle"> <td style="vertical-align: middle">
<div class="progress progress active"> <div class="progress progress active">
<div :aria-valuenow="budgetLimit.pctGreen" :style="'width: '+ budgetLimit.pctGreen + '%;'" <div :aria-valuenow="budgetLimit.pctGreen" :style="'width: '+ budgetLimit.pctGreen + '%;'"
aria-valuemax="100" aria-valuemin="0" class="progress-bar bg-success progress-bar-striped" role="progressbar"> aria-valuemax="100" aria-valuemin="0" class="progress-bar bg-success" role="progressbar">
<span v-if="budgetLimit.pctGreen > 35"> <span v-if="budgetLimit.pctGreen > 35">
{{ $t('firefly.spent_x_of_y', {amount: Intl.NumberFormat(locale, {style: 'currency', currency: budgetLimit.currency_code}).format(budgetLimit.spent), total: Intl.NumberFormat(locale, {style: 'currency', currency: budgetLimit.currency_code}).format(budgetLimit.amount)}) }} {{ $t('firefly.spent_x_of_y', {amount: Intl.NumberFormat(locale, {style: 'currency', currency: budgetLimit.currency_code}).format(budgetLimit.spent), total: Intl.NumberFormat(locale, {style: 'currency', currency: budgetLimit.currency_code}).format(budgetLimit.amount)}) }}
<!-- --> <!-- -->
@ -37,14 +37,14 @@
</div> </div>
<div :aria-valuenow="budgetLimit.pctOrange" :style="'width: '+ budgetLimit.pctOrange + '%;'" <div :aria-valuenow="budgetLimit.pctOrange" :style="'width: '+ budgetLimit.pctOrange + '%;'"
aria-valuemax="100" aria-valuemin="0" class="progress-bar bg-warning progress-bar-striped" role="progressbar"> aria-valuemax="100" aria-valuemin="0" class="progress-bar bg-warning" role="progressbar">
<span v-if="budgetLimit.pctRed <= 50 && budgetLimit.pctOrange > 35"> <span v-if="budgetLimit.pctRed <= 50 && budgetLimit.pctOrange > 35">
{{ $t('firefly.spent_x_of_y', {amount: Intl.NumberFormat(locale, {style: 'currency', currency: budgetLimit.currency_code}).format(budgetLimit.spent), total: Intl.NumberFormat(locale, {style: 'currency', currency: budgetLimit.currency_code}).format(budgetLimit.amount)}) }} {{ $t('firefly.spent_x_of_y', {amount: Intl.NumberFormat(locale, {style: 'currency', currency: budgetLimit.currency_code}).format(budgetLimit.spent), total: Intl.NumberFormat(locale, {style: 'currency', currency: budgetLimit.currency_code}).format(budgetLimit.amount)}) }}
</span> </span>
</div> </div>
<div :aria-valuenow="budgetLimit.pctRed" :style="'width: '+ budgetLimit.pctRed + '%;'" <div :aria-valuenow="budgetLimit.pctRed" :style="'width: '+ budgetLimit.pctRed + '%;'"
aria-valuemax="100" aria-valuemin="0" class="progress-bar bg-danger progress-bar-striped" role="progressbar"> aria-valuemax="100" aria-valuemin="0" class="progress-bar bg-danger" role="progressbar">
<span v-if="budgetLimit.pctOrange <= 50 && budgetLimit.pctRed > 35" class="text-muted"> <span v-if="budgetLimit.pctOrange <= 50 && budgetLimit.pctRed > 35" class="text-muted">
{{ $t('firefly.spent_x_of_y', {amount: Intl.NumberFormat(locale, {style: 'currency', currency: budgetLimit.currency_code}).format(budgetLimit.spent), total: Intl.NumberFormat(locale, {style: 'currency', currency: budgetLimit.currency_code}).format(budgetLimit.amount)}) }} {{ $t('firefly.spent_x_of_y', {amount: Intl.NumberFormat(locale, {style: 'currency', currency: budgetLimit.currency_code}).format(budgetLimit.spent), total: Intl.NumberFormat(locale, {style: 'currency', currency: budgetLimit.currency_code}).format(budgetLimit.amount)}) }}
</span> </span>

2
frontend/src/components/dashboard/MainCreditList.vue
View File

@ -51,7 +51,7 @@
<td class="align-middle"> <td class="align-middle">
<div v-if="entry.pct > 0" class="progress"> <div v-if="entry.pct > 0" class="progress">
<div :aria-valuenow="entry.pct" :style="{ width: entry.pct + '%'}" aria-valuemax="100" <div :aria-valuenow="entry.pct" :style="{ width: entry.pct + '%'}" aria-valuemax="100"
aria-valuemin="0" class="progress-bar progress-bar-striped bg-success" aria-valuemin="0" class="progress-bar bg-success"
role="progressbar"> role="progressbar">
<span v-if="entry.pct > 20"> <span v-if="entry.pct > 20">
{{ Intl.NumberFormat(locale, {style: 'currency', currency: entry.currency_code}).format(entry.difference_float) }} {{ Intl.NumberFormat(locale, {style: 'currency', currency: entry.currency_code}).format(entry.difference_float) }}

2
frontend/src/components/dashboard/MainDebitList.vue
View File

@ -51,7 +51,7 @@
<td class="align-middle"> <td class="align-middle">
<div v-if="entry.pct > 0" class="progress"> <div v-if="entry.pct > 0" class="progress">
<div :aria-valuenow="entry.pct" :style="{ width: entry.pct + '%'}" aria-valuemax="100" <div :aria-valuenow="entry.pct" :style="{ width: entry.pct + '%'}" aria-valuemax="100"
aria-valuemin="0" class="progress-bar progress-bar-striped bg-danger" aria-valuemin="0" class="progress-bar bg-danger"
role="progressbar"> role="progressbar">
<span v-if="entry.pct > 20"> <span v-if="entry.pct > 20">
{{ Intl.NumberFormat(locale, {style: 'currency', currency: entry.currency_code}).format(entry.difference_float) }} {{ Intl.NumberFormat(locale, {style: 'currency', currency: entry.currency_code}).format(entry.difference_float) }}

2
frontend/src/components/dashboard/MainPiggyList.vue
View File

@ -58,7 +58,7 @@
<td> <td>
<div class="progress-group"> <div class="progress-group">
<div class="progress progress-sm"> <div class="progress progress-sm">
<div v-if="piggy.attributes.pct < 100" :style="{'width': piggy.attributes.pct + '%'}" class="progress-bar progress-bar-striped primary"></div> <div v-if="piggy.attributes.pct < 100" :style="{'width': piggy.attributes.pct + '%'}" class="progress-bar primary"></div>
<div v-if="100 === piggy.attributes.pct" :style="{'width': piggy.attributes.pct + '%'}" <div v-if="100 === piggy.attributes.pct" :style="{'width': piggy.attributes.pct + '%'}"
class="progress-bar progress-bar-striped bg-success"></div> class="progress-bar progress-bar-striped bg-success"></div>
</div> </div>

8
frontend/src/components/dashboard/TopBoxes.vue
View File

@ -20,7 +20,7 @@
<template> <template>
<div class="row"> <div class="row">
<div class="col" v-if="0 !== prefCurrencyBalances.length && 0 !== notPrefCurrencyBalances.length"> <div class="col" v-if="0 !== prefCurrencyBalances.length || 0 !== notPrefCurrencyBalances.length">
<div class="info-box"> <div class="info-box">
<span class="info-box-icon"><i class="far fa-bookmark text-info"></i></span> <span class="info-box-icon"><i class="far fa-bookmark text-info"></i></span>
@ -45,7 +45,7 @@
</div> </div>
</div> </div>
<div class="col" v-if="0!==prefBillsUnpaid.length && 0 !== notPrefBillsUnpaid.length"> <div class="col" v-if="0!==prefBillsUnpaid.length || 0 !== notPrefBillsUnpaid.length">
<div class="info-box"> <div class="info-box">
<span class="info-box-icon"><i class="far fa-calendar-alt text-teal"></i></span> <span class="info-box-icon"><i class="far fa-calendar-alt text-teal"></i></span>
@ -70,7 +70,7 @@
</div> </div>
</div> </div>
<!-- left to spend --> <!-- left to spend -->
<div class="col" v-if="0 !== prefLeftToSpend.length && 0 !== notPrefLeftToSpend.length"> <div class="col" v-if="0 !== prefLeftToSpend.length || 0 !== notPrefLeftToSpend.length">
<div class="info-box"> <div class="info-box">
<span class="info-box-icon"><i class="fas fa-money-bill text-success"></i></span> <span class="info-box-icon"><i class="fas fa-money-bill text-success"></i></span>
@ -97,7 +97,7 @@
</div> </div>
<!-- net worth --> <!-- net worth -->
<div class="col" v-if="0 !== notPrefNetWorth.length && 0 !== prefNetWorth.length"> <div class="col" v-if="0 !== notPrefNetWorth.length || 0 !== prefNetWorth.length">
<div class="info-box"> <div class="info-box">
<span class="info-box-icon"><i class="fas fa-money-bill text-success"></i></span> <span class="info-box-icon"><i class="fas fa-money-bill text-success"></i></span>

48
frontend/src/components/transactions/Edit.vue
View File

@ -223,6 +223,9 @@ export default {
enableSubmit: true, enableSubmit: true,
stayHere: false, stayHere: false,
// force the submission (in case of deletes)
forceTransactionSubmission: false
} }
}, },
components: { components: {
@ -275,7 +278,7 @@ export default {
for (let i in transactions) { for (let i in transactions) {
if (transactions.hasOwnProperty(i) && /^0$|^[1-9]\d*$/.test(i) && i <= 4294967294) { if (transactions.hasOwnProperty(i) && /^0$|^[1-9]\d*$/.test(i) && i <= 4294967294) {
console.log('Parsing transaction nr ' + i); // console.log('Parsing transaction nr ' + i);
let result = this.parseTransaction(parseInt(i), transactions[i]); let result = this.parseTransaction(parseInt(i), transactions[i]);
this.transactions.push(result); this.transactions.push(result);
this.originalTransactions.push(lodashClonedeep(result)); this.originalTransactions.push(lodashClonedeep(result));
@ -489,9 +492,10 @@ export default {
let index = 0; let index = 0;
for (let i in this.transactions) { for (let i in this.transactions) {
if (this.transactions.hasOwnProperty(i) && /^0$|^[1-9]\d*$/.test(i) && i <= 4294967294) { if (this.transactions.hasOwnProperty(i) && /^0$|^[1-9]\d*$/.test(i) && i <= 4294967294) {
console.log('Now at index: ' + i); // console.log('Now at index: ' + i);
if (index === payload.index) { if (index === payload.index) {
console.log('Delete!'); this.forceTransactionSubmission = true;
//console.log('Delete!');
this.transactions.splice(index, 1); this.transactions.splice(index, 1);
//console.log(delete this.transactions[i]); //console.log(delete this.transactions[i]);
} }
@ -499,7 +503,7 @@ export default {
} }
} }
$('#transactionTabs li:first-child a').tab('show'); $('#transactionTabs li:first-child a').tab('show');
// console.log(this.transactions);
// this.transactions.splice(payload.index, 1); // this.transactions.splice(payload.index, 1);
// console.log('length: ' + this.transactions.length); // console.log('length: ' + this.transactions.length);
@ -530,6 +534,7 @@ export default {
this.transactions.push(newTransaction); this.transactions.push(newTransaction);
}, },
submitTransaction: function (event) { submitTransaction: function (event) {
// console.log('submitTransaction()');
event.preventDefault(); event.preventDefault();
this.enableSubmit = false; this.enableSubmit = false;
let submission = {transactions: []}; let submission = {transactions: []};
@ -553,9 +558,11 @@ export default {
} }
// loop each transaction (edited by the user): // loop each transaction (edited by the user):
// console.log('Start of loop submitTransaction');
for (let i in this.transactions) { for (let i in this.transactions) {
// console.log('Index ' + i);
if (this.transactions.hasOwnProperty(i) && /^0$|^[1-9]\d*$/.test(i) && i <= 4294967294) { if (this.transactions.hasOwnProperty(i) && /^0$|^[1-9]\d*$/.test(i) && i <= 4294967294) {
// console.log('Has index ' + i);
// original transaction present: // original transaction present:
let currentTransaction = this.transactions[i]; let currentTransaction = this.transactions[i];
let originalTransaction = this.originalTransactions.hasOwnProperty(i) ? this.originalTransactions[i] : {}; let originalTransaction = this.originalTransactions.hasOwnProperty(i) ? this.originalTransactions[i] : {};
@ -585,19 +592,28 @@ export default {
for (let ii in basicFields) { for (let ii in basicFields) {
if (basicFields.hasOwnProperty(ii) && /^0$|^[1-9]\d*$/.test(ii) && ii <= 4294967294) { if (basicFields.hasOwnProperty(ii) && /^0$|^[1-9]\d*$/.test(ii) && ii <= 4294967294) {
let fieldName = basicFields[ii]; let fieldName = basicFields[ii];
// console.log('Now at field ' + fieldName);
let submissionFieldName = fieldName; let submissionFieldName = fieldName;
// if the original is undefined and the new one is null, just skip it. // if the original is undefined and the new one is null, just skip it.
if (currentTransaction[fieldName] === null && 'undefined' === typeof originalTransaction[fieldName]) { if (currentTransaction[fieldName] === null && 'undefined' === typeof originalTransaction[fieldName]) {
// console.log('Will continue and skip');
continue; continue;
} }
if (currentTransaction[fieldName] !== originalTransaction[fieldName]) { if (currentTransaction[fieldName] !== originalTransaction[fieldName] || true === this.forceTransactionSubmission) {
// console.log('we continue');
// some fields are ignored: // some fields are ignored:
if ('foreign_amount' === submissionFieldName && '' === currentTransaction[fieldName]) { if ('foreign_amount' === submissionFieldName && '' === currentTransaction[fieldName]) {
// console.log('we skip!');
continue; continue;
} }
if ('foreign_currency_id' === submissionFieldName && 0 === currentTransaction[fieldName]) { if ('foreign_currency_id' === submissionFieldName && 0 === currentTransaction[fieldName] ) {
// console.log('we skip!');
continue;
}
if ('foreign_currency_id' === submissionFieldName && '0' === currentTransaction[fieldName] ) {
// console.log('we skip!');
continue; continue;
} }
@ -618,6 +634,7 @@ export default {
// otherwise save them and remember them for submission: // otherwise save them and remember them for submission:
diff[submissionFieldName] = currentTransaction[fieldName]; diff[submissionFieldName] = currentTransaction[fieldName];
shouldSubmit = true; shouldSubmit = true;
//console.log('Should submit is now TRUE');
} }
} }
} }
@ -650,6 +667,10 @@ export default {
if (typeof currentTransaction.selectedAttachments !== 'undefined' && true === currentTransaction.selectedAttachments) { if (typeof currentTransaction.selectedAttachments !== 'undefined' && true === currentTransaction.selectedAttachments) {
shouldUpload = true; shouldUpload = true;
} }
if(true === shouldSubmit) {
// set the date to whatever the date is:
diff.date = this.date;
}
if (this.date !== this.originalDate) { if (this.date !== this.originalDate) {
shouldSubmit = true; shouldSubmit = true;
@ -667,15 +688,18 @@ export default {
submission.transactions.push(lodashClonedeep(diff)); submission.transactions.push(lodashClonedeep(diff));
shouldSubmit = true; shouldSubmit = true;
} }
// console.log('Should submit index ' + i + '?');
// console.log(shouldSubmit);
} }
} }
this.submitUpdate(submission, shouldSubmit, shouldLinks, shouldUpload); this.submitUpdate(submission, shouldSubmit, shouldLinks, shouldUpload);
}, },
submitData: function (shouldSubmit, submission) { submitData: function (shouldSubmit, submission) {
//console.log('submitData'); // console.log('submitData');
// console.log(submission);
if (!shouldSubmit) { if (!shouldSubmit) {
//console.log('No need!'); // console.log('No need to submit transaction.');
return new Promise((resolve) => { return new Promise((resolve) => {
resolve({}); resolve({});
}); });
@ -728,9 +752,9 @@ export default {
return this.deleteAllOriginalLinks().then(() => this.submitNewLinks()); return this.deleteAllOriginalLinks().then(() => this.submitNewLinks());
}, },
submitAttachments: function (shouldSubmit, response) { submitAttachments: function (shouldSubmit, response) {
console.log('submitAttachments'); // console.log('submitAttachments');
if (!shouldSubmit) { if (!shouldSubmit) {
console.log('no need!'); // console.log('no need!');
this.submittedAttachments = 1; this.submittedAttachments = 1;
return new Promise((resolve) => { return new Promise((resolve) => {
resolve({}); resolve({});
@ -798,7 +822,7 @@ export default {
} }
}, },
submitUpdate: function (submission, shouldSubmit, shouldLinks, shouldUpload) { submitUpdate: function (submission, shouldSubmit, shouldLinks, shouldUpload) {
//console.log('submitUpdate()'); // console.log('submitUpdate()');
this.inError = false; this.inError = false;
this.submitData(shouldSubmit, submission) this.submitData(shouldSubmit, submission)

2
frontend/src/components/transactions/SplitForm.vue
View File

@ -372,7 +372,7 @@ export default {
}, },
created() { created() {
console.log('SplitForm(' + this.index + ')'); // console.log('SplitForm(' + this.index + ')');
}, },
methods: { methods: {
removeTransaction: function () { removeTransaction: function () {

4
frontend/src/locales/de.json
View File

@ -42,10 +42,10 @@
"categories": "Kategorien", "categories": "Kategorien",
"go_to_budgets": "Budgets anzeigen", "go_to_budgets": "Budgets anzeigen",
"income": "Einnahmen \/ Einkommen", "income": "Einnahmen \/ Einkommen",
"go_to_deposits": "Zu Einlagen wechseln", "go_to_deposits": "Einnahmen anzeigen",
"go_to_categories": "Kategorien anzeigen", "go_to_categories": "Kategorien anzeigen",
"expense_accounts": "Ausgabekonten", "expense_accounts": "Ausgabekonten",
"go_to_expenses": "Zu Ausgaben wechseln", "go_to_expenses": "Ausgaben anzeigen",
"go_to_bills": "Rechnungen anzeigen", "go_to_bills": "Rechnungen anzeigen",
"bills": "Rechnungen", "bills": "Rechnungen",
"last_thirty_days": "Letzte 30 Tage", "last_thirty_days": "Letzte 30 Tage",

48
frontend/src/pages/budgets/index.js vendored Normal file
View File

@ -0,0 +1,48 @@
/*
* index.js
* Copyright (c) 2020 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program 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 Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
require('../../bootstrap');
import Vue from "vue";
import Index from "../../components/budgets/Index";
import store from "../../components/store";
// i18n
let i18n = require('../../i18n');
let props = {};
new Vue({
i18n,
store,
el: "#budgets",
render: (createElement) => {
return createElement(Index, {props: props});
},
beforeCreate() {
// init the old root store (TODO remove me)
//this.$store.commit('initialiseStore');
//this.$store.dispatch('updateCurrencyPreference');
// init the new root store (dont care about results)
this.$store.dispatch('root/initialiseStore');
// also init the dashboard store.
//this.$store.dispatch('dashboard/index/initialiseStore');
},
});

3
frontend/webpack.mix.js vendored
View File

@ -56,6 +56,9 @@ mix.js('src/pages/accounts/delete.js', 'public/js/accounts').vue({version: 2});
mix.js('src/pages/accounts/show.js', 'public/js/accounts').vue({version: 2}); mix.js('src/pages/accounts/show.js', 'public/js/accounts').vue({version: 2});
mix.js('src/pages/accounts/create.js', 'public/js/accounts').vue({version: 2}); mix.js('src/pages/accounts/create.js', 'public/js/accounts').vue({version: 2});
// budgets
mix.js('src/pages/budgets/index.js', 'public/js/budgets').vue({version: 2});
// transactions. // transactions.
mix.js('src/pages/transactions/create.js', 'public/js/transactions').vue({version: 2}); mix.js('src/pages/transactions/create.js', 'public/js/transactions').vue({version: 2});
mix.js('src/pages/transactions/edit.js', 'public/js/transactions').vue({version: 2}); mix.js('src/pages/transactions/edit.js', 'public/js/transactions').vue({version: 2});

260
frontend/yarn.lock
View File

@ -36,11 +36,11 @@
source-map "^0.5.0" source-map "^0.5.0"
"@babel/generator@^7.14.0": "@babel/generator@^7.14.0":
version "7.14.0" version "7.14.1"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.0.tgz#0f35d663506c43e4f10898fbda0d752ec75494be" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz#1f99331babd65700183628da186f36f63d615c93"
integrity sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg== integrity sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==
dependencies: dependencies:
"@babel/types" "^7.14.0" "@babel/types" "^7.14.1"
jsesc "^2.5.1" jsesc "^2.5.1"
source-map "^0.5.0" source-map "^0.5.0"
@ -70,9 +70,9 @@
semver "^6.3.0" semver "^6.3.0"
"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0": "@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0":
version "7.14.0" version "7.14.1"
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.0.tgz#38367d3dab125b12f94273de418f4df23a11a15e" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.1.tgz#1fe11b376f3c41650ad9fedc665b0068722ea76c"
integrity sha512-6pXDPguA5zC40Y8oI5mqr+jEUpjMJonKvknvA+vD8CYDz5uuXEwWBK8sRAsE/t3gfb1k15AQb9RhwpscC4nUJQ== integrity sha512-r8rsUahG4ywm0QpGcCrLaUSOuNAISR3IZCg4Fx05Ozq31aCUrQsTLH6KPxy0N5ULoQ4Sn9qjNdGNtbPWAC6hYg==
dependencies: dependencies:
"@babel/helper-annotate-as-pure" "^7.12.13" "@babel/helper-annotate-as-pure" "^7.12.13"
"@babel/helper-function-name" "^7.12.13" "@babel/helper-function-name" "^7.12.13"
@ -253,9 +253,9 @@
js-tokens "^4.0.0" js-tokens "^4.0.0"
"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0": "@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0":
version "7.14.0" version "7.14.1"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.0.tgz#2f0ebfed92bcddcc8395b91f1895191ce2760380" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz#1bd644b5db3f5797c4479d89ec1817fe02b84c47"
integrity sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q== integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12": "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
version "7.13.12" version "7.13.12"
@ -514,10 +514,10 @@
dependencies: dependencies:
"@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-transform-block-scoping@^7.13.16": "@babel/plugin-transform-block-scoping@^7.14.1":
version "7.13.16" version "7.14.1"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.13.16.tgz#a9c0f10794855c63b1d629914c7dcfeddd185892" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz#ac1b3a8e3d8cbb31efc6b9be2f74eb9823b74ab2"
integrity sha512-ad3PHUxGnfWF4Efd3qFuznEtZKoBp0spS+DgqzVzRPV7urEBvPLue3y2j80w4Jf2YLzZHj8TOv/Lmvdmh3b2xg== integrity sha512-2mQXd0zBrwfp0O1moWIhPpEeTKDvxyHcnma3JATVP1l+CctWBuot6OJG8LQ4DnBj4ZZPSmlb/fm4mu47EOAnVA==
dependencies: dependencies:
"@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-plugin-utils" "^7.13.0"
@ -752,9 +752,9 @@
"@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-plugin-utils" "^7.12.13"
"@babel/preset-env@^7.12.1": "@babel/preset-env@^7.12.1":
version "7.14.0" version "7.14.1"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.0.tgz#236f88cd5da625e625dd40500d4824523f50e6c5" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.1.tgz#b55914e2e68885ea03f69600b2d3537e54574a93"
integrity sha512-GWRCdBv2whxqqaSi7bo/BEXf070G/fWFMEdCnmoRg2CZJy4GK06ovFuEjJrZhDRXYgBsYtxVbG8GUHvw+UWBkQ== integrity sha512-0M4yL1l7V4l+j/UHvxcdvNfLB9pPtIooHTbEhgD/6UGyh8Hy3Bm1Mj0buzjDXATCSz3JFibVdnoJZCrlUCanrQ==
dependencies: dependencies:
"@babel/compat-data" "^7.14.0" "@babel/compat-data" "^7.14.0"
"@babel/helper-compilation-targets" "^7.13.16" "@babel/helper-compilation-targets" "^7.13.16"
@ -793,7 +793,7 @@
"@babel/plugin-transform-arrow-functions" "^7.13.0" "@babel/plugin-transform-arrow-functions" "^7.13.0"
"@babel/plugin-transform-async-to-generator" "^7.13.0" "@babel/plugin-transform-async-to-generator" "^7.13.0"
"@babel/plugin-transform-block-scoped-functions" "^7.12.13" "@babel/plugin-transform-block-scoped-functions" "^7.12.13"
"@babel/plugin-transform-block-scoping" "^7.13.16" "@babel/plugin-transform-block-scoping" "^7.14.1"
"@babel/plugin-transform-classes" "^7.13.0" "@babel/plugin-transform-classes" "^7.13.0"
"@babel/plugin-transform-computed-properties" "^7.13.0" "@babel/plugin-transform-computed-properties" "^7.13.0"
"@babel/plugin-transform-destructuring" "^7.13.17" "@babel/plugin-transform-destructuring" "^7.13.17"
@ -823,7 +823,7 @@
"@babel/plugin-transform-unicode-escapes" "^7.12.13" "@babel/plugin-transform-unicode-escapes" "^7.12.13"
"@babel/plugin-transform-unicode-regex" "^7.12.13" "@babel/plugin-transform-unicode-regex" "^7.12.13"
"@babel/preset-modules" "^0.1.4" "@babel/preset-modules" "^0.1.4"
"@babel/types" "^7.14.0" "@babel/types" "^7.14.1"
babel-plugin-polyfill-corejs2 "^0.2.0" babel-plugin-polyfill-corejs2 "^0.2.0"
babel-plugin-polyfill-corejs3 "^0.2.0" babel-plugin-polyfill-corejs3 "^0.2.0"
babel-plugin-polyfill-regenerator "^0.2.0" babel-plugin-polyfill-regenerator "^0.2.0"
@ -871,10 +871,10 @@
debug "^4.1.0" debug "^4.1.0"
globals "^11.1.0" globals "^11.1.0"
"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4": "@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.4.4":
version "7.14.0" version "7.14.1"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.0.tgz#3fc3fc74e0cdad878182e5f66cc6bcab1915a802" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db"
integrity sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg== integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==
dependencies: dependencies:
"@babel/helper-validator-identifier" "^7.14.0" "@babel/helper-validator-identifier" "^7.14.0"
to-fast-properties "^2.0.0" to-fast-properties "^2.0.0"
@ -1087,9 +1087,9 @@
integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
"@types/node@*": "@types/node@*":
version "15.0.1" version "15.0.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a" resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67"
integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA== integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==
"@types/parse-glob@*": "@types/parse-glob@*":
version "3.0.29" version "3.0.29"
@ -1261,22 +1261,22 @@
"@webassemblyjs/ast" "1.11.0" "@webassemblyjs/ast" "1.11.0"
"@xtuc/long" "4.2.2" "@xtuc/long" "4.2.2"
"@webpack-cli/configtest@^1.0.2": "@webpack-cli/configtest@^1.0.3":
version "1.0.2" version "1.0.3"
resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.2.tgz#2a20812bfb3a2ebb0b27ee26a52eeb3e3f000836" resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz#204bcff87cda3ea4810881f7ea96e5f5321b87b9"
integrity sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA== integrity sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==
"@webpack-cli/info@^1.2.3": "@webpack-cli/info@^1.2.4":
version "1.2.3" version "1.2.4"
resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.3.tgz#ef819d10ace2976b6d134c7c823a3e79ee31a92c" resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz#7381fd41c9577b2d8f6c2594fad397ef49ad5573"
integrity sha512-lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q== integrity sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g==
dependencies: dependencies:
envinfo "^7.7.3" envinfo "^7.7.3"
"@webpack-cli/serve@^1.3.1": "@webpack-cli/serve@^1.4.0":
version "1.3.1" version "1.4.0"
resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.1.tgz#911d1b3ff4a843304b9c3bacf67bb34672418441" resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz#f84fd07bcacefe56ce762925798871092f0f228e"
integrity sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw== integrity sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==
"@xtuc/ieee754@^1.2.0": "@xtuc/ieee754@^1.2.0":
version "1.2.0" version "1.2.0"
@ -1316,9 +1316,9 @@ acorn@^7.0.0:
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
acorn@^8.2.1: acorn@^8.2.1:
version "8.2.2" version "8.2.4"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.2.tgz#c4574e4fea298d6e6ed4b85ab844b06dd59f26d6" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0"
integrity sha512-VrMS8kxT0e7J1EX0p6rI/E0FbfOVcvBpbIqHThFv+f8YrZIlMfVotYcXKVPmTvPW8sW5miJzfUFrrvthUZg8VQ== integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==
adjust-sourcemap-loader@3.0.0: adjust-sourcemap-loader@3.0.0:
version "3.0.0" version "3.0.0"
@ -1428,11 +1428,6 @@ amdefine@>=0.0.4:
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
ansi-colors@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
ansi-escapes@^4.3.1: ansi-escapes@^4.3.1:
version "4.3.2" version "4.3.2"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
@ -1797,7 +1792,12 @@ bootstrap4-duallistbox@^4.0.2:
resolved "https://registry.yarnpkg.com/bootstrap4-duallistbox/-/bootstrap4-duallistbox-4.0.2.tgz#c6942e34a39d0d05e436d51ebaf31c9349f119d3" resolved "https://registry.yarnpkg.com/bootstrap4-duallistbox/-/bootstrap4-duallistbox-4.0.2.tgz#c6942e34a39d0d05e436d51ebaf31c9349f119d3"
integrity sha512-vQdANVE2NN0HMaZO9qWJy0C7u04uTpAmtUGO3KLq3xAZKCboJweQ437hDTszI6pbYV2olJCGZMbdhvIkBNGeGQ== integrity sha512-vQdANVE2NN0HMaZO9qWJy0C7u04uTpAmtUGO3KLq3xAZKCboJweQ437hDTszI6pbYV2olJCGZMbdhvIkBNGeGQ==
bootstrap@>=4.0, "bootstrap@>=4.5.3 <5.0.0", bootstrap@^4.5.2, bootstrap@^4.6.0: bootstrap@>=4.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.0.tgz#97635ac0e0d6cb466700ebf0fd266bfabf352ed2"
integrity sha512-tmhPET9B9qCl8dCofvHeiIhi49iBt0EehmIsziZib65k1erBW1rHhj2s/2JsuQh5Pq+xz2E9bEbzp9B7xHG+VA==
"bootstrap@>=4.5.3 <5.0.0", bootstrap@^4.5.2, bootstrap@^4.6.0:
version "4.6.0" version "4.6.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw== integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
@ -1932,7 +1932,7 @@ browserify-zlib@^0.2.0:
dependencies: dependencies:
pako "~1.0.5" pako "~1.0.5"
browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.16.5: browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.16.6:
version "4.16.6" version "4.16.6"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
@ -2073,9 +2073,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0" lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001196, caniuse-lite@^1.0.30001219: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001196, caniuse-lite@^1.0.30001219:
version "1.0.30001219" version "1.0.30001223"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz#5bfa5d0519f41f993618bd318f606a4c4c16156b" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz#39b49ff0bfb3ee3587000d2f66c47addc6e14443"
integrity sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ== integrity sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==
chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
version "2.4.2" version "2.4.2"
@ -2108,9 +2108,9 @@ chart.js@^2.9.4:
moment "^2.10.2" moment "^2.10.2"
chart.js@^3.2.0: chart.js@^3.2.0:
version "3.2.0" version "3.2.1"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.2.0.tgz#3d0a4b62b6bee428f8547db6aa68c792b130c260" resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.2.1.tgz#1a17d6a88cef324ef711949e227eb51d6c4c26d3"
integrity sha512-Ml3R47TvOPW6gQ6T8mg/uPvyOASPpPVVF6xb7ZyHkek1c6kJIT5ScT559afXoDf6uwtpDR2BpCommkA5KT8ODg== integrity sha512-XsNDf3854RGZkLCt+5vWAXGAtUdKP2nhfikLGZqud6G4CvRE2ts64TIxTTfspOin2kEZvPgomE29E6oU02dYjQ==
chartjs-color-string@^0.6.0: chartjs-color-string@^0.6.0:
version "0.6.0" version "0.6.0"
@ -2459,11 +2459,11 @@ copy-descriptor@^0.1.0:
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
core-js-compat@^3.9.0, core-js-compat@^3.9.1: core-js-compat@^3.9.0, core-js-compat@^3.9.1:
version "3.11.1" version "3.12.0"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.11.1.tgz#57a91e9b02d3bb8cf37f82eceaf44a3d646fa614" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.0.tgz#a031e51fe411085e33cb629bfee2acaa53bc309a"
integrity sha512-aZ0e4tmlG/aOBHj92/TuOuZwp6jFvn1WNabU5VOVixzhu5t5Ao+JZkQOPlgNXu6ynwLrwJxklT4Gw1G1VGEh+g== integrity sha512-vvaN8EOvYBEjrr+MN3vCKrMNc/xdYZI+Rt/uPMROi4T5Hj8Fz6TiPQm2mrB9aZoQVW1lCFHYmMrv99aUct9mkg==
dependencies: dependencies:
browserslist "^4.16.5" browserslist "^4.16.6"
semver "7.0.0" semver "7.0.0"
core-js@^2.4.0: core-js@^2.4.0:
@ -2472,9 +2472,9 @@ core-js@^2.4.0:
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
core-js@^3.6.5: core-js@^3.6.5:
version "3.11.1" version "3.12.0"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.11.1.tgz#f920392bf8ed63a0ec8e4e729857bfa3d121c525" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.12.0.tgz#62bac86f7d7f087d40dba3e90a211c2c3c8559ea"
integrity sha512-k93Isqg7e4txZWMGNYwevZL9MiogLk8pd1PtwrmFmi8IBq4GXqUaVW/a33Llt6amSI36uSjd0GWwc9pTT9ALlQ== integrity sha512-SaMnchL//WwU2Ot1hhkPflE8gzo7uq1FGvUJ8GKmi3TOU7rGTHIU+eir1WGf6qOtTyxdfdcp10yPdGZ59sQ3hw==
core-util-is@~1.0.0: core-util-is@~1.0.0:
version "1.0.2" version "1.0.2"
@ -2980,9 +2980,9 @@ date-fns-tz@^1.0.12:
integrity sha512-lQ+FF7xUxxRuRqIY7H/lagnT3PhhSnnvtGHzjE5WZKwRyLU7glJfLys05SZ7zHlEr6RXWiqkmgWq4nCkcElR+g== integrity sha512-lQ+FF7xUxxRuRqIY7H/lagnT3PhhSnnvtGHzjE5WZKwRyLU7glJfLys05SZ7zHlEr6RXWiqkmgWq4nCkcElR+g==
date-fns@^2.21.1, date-fns@^2.8.1: date-fns@^2.21.1, date-fns@^2.8.1:
version "2.21.1" version "2.21.3"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.21.1.tgz#679a4ccaa584c0706ea70b3fa92262ac3009d2b0" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.21.3.tgz#8f5f6889d7a96bbcc1f0ea50239b397a83357f9b"
integrity sha512-m1WR0xGiC6j6jNFAyW4Nvh4WxAi4JF4w9jRJwSI8nBmNcyZXPcP9VUQG+6gHQXAmqaGEKDKhOqAtENDC941UkA== integrity sha512-HeYdzCaFflc1i4tGbj7JKMjM4cKGYoyxwcIIkHzNgCkX8xXDNJDZXgDDVchIWpN4eQc3lH37WarduXFZJOtxfw==
daterangepicker@^3.1.0: daterangepicker@^3.1.0:
version "3.1.0" version "3.1.0"
@ -3238,9 +3238,9 @@ dotenv-expand@^5.1.0:
integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
dotenv@^8.2.0: dotenv@^8.2.0:
version "8.2.0" version "8.6.0"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
dropzone@^5.8.1: dropzone@^5.8.1:
version "5.9.2" version "5.9.2"
@ -3265,9 +3265,9 @@ ekko-lightbox@^5.3.0:
integrity sha512-mbacwySuVD3Ad6F2hTkjSTvJt59bcVv2l/TmBerp4xZnLak8tPtA4AScUn4DL42c1ksTiAO6sGhJZ52P/1Qgew== integrity sha512-mbacwySuVD3Ad6F2hTkjSTvJt59bcVv2l/TmBerp4xZnLak8tPtA4AScUn4DL42c1ksTiAO6sGhJZ52P/1Qgew==
electron-to-chromium@^1.3.723: electron-to-chromium@^1.3.723:
version "1.3.725" version "1.3.727"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.725.tgz#04fc83f9189169aff50f0a00c6b4090b910cba85" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"
integrity sha512-2BbeAESz7kc6KBzs7WVrMc1BY5waUphk4D4DX5dSQXJhsc3tP5ZFaiyuL0AB7vUKzDYpIeYwTYlEfxyjsGUrhw== integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==
elliptic@^6.5.3: elliptic@^6.5.3:
version "6.5.4" version "6.5.4"
@ -3310,13 +3310,6 @@ enhanced-resolve@^5.8.0:
graceful-fs "^4.2.4" graceful-fs "^4.2.4"
tapable "^2.2.0" tapable "^2.2.0"
enquirer@^2.3.6:
version "2.3.6"
resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
dependencies:
ansi-colors "^4.1.1"
entities@^2.0.0: entities@^2.0.0:
version "2.2.0" version "2.2.0"
resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
@ -3954,9 +3947,9 @@ glob-to-regexp@^0.4.1:
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
glob@^7.1.3, glob@^7.1.6: glob@^7.1.3, glob@^7.1.6:
version "7.1.6" version "7.1.7"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
dependencies: dependencies:
fs.realpath "^1.0.0" fs.realpath "^1.0.0"
inflight "^1.0.4" inflight "^1.0.4"
@ -4464,9 +4457,9 @@ is-arrayish@^0.3.1:
integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
is-bigint@^1.0.1: is-bigint@^1.0.1:
version "1.0.1" version "1.0.2"
resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2" resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg== integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
is-binary-path@^1.0.0: is-binary-path@^1.0.0:
version "1.0.1" version "1.0.1"
@ -4483,11 +4476,11 @@ is-binary-path@~2.1.0:
binary-extensions "^2.0.0" binary-extensions "^2.0.0"
is-boolean-object@^1.1.0: is-boolean-object@^1.1.0:
version "1.1.0" version "1.1.1"
resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0" resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA== integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
dependencies: dependencies:
call-bind "^1.0.0" call-bind "^1.0.2"
is-buffer@^1.1.5, is-buffer@~1.1.6: is-buffer@^1.1.5, is-buffer@~1.1.6:
version "1.1.6" version "1.1.6"
@ -4533,9 +4526,9 @@ is-data-descriptor@^1.0.0:
kind-of "^6.0.0" kind-of "^6.0.0"
is-date-object@^1.0.1: is-date-object@^1.0.1:
version "1.0.2" version "1.0.4"
resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
is-descriptor@^0.1.0: is-descriptor@^0.1.0:
version "0.1.6" version "0.1.6"
@ -4614,9 +4607,9 @@ is-negative-zero@^2.0.1:
integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
is-number-object@^1.0.4: is-number-object@^1.0.4:
version "1.0.4" version "1.0.5"
resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw== integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
is-number@^3.0.0: is-number@^3.0.0:
version "3.0.0" version "3.0.0"
@ -4658,12 +4651,12 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
isobject "^3.0.1" isobject "^3.0.1"
is-regex@^1.0.4, is-regex@^1.1.2: is-regex@^1.0.4, is-regex@^1.1.2:
version "1.1.2" version "1.1.3"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
dependencies: dependencies:
call-bind "^1.0.2" call-bind "^1.0.2"
has-symbols "^1.0.1" has-symbols "^1.0.2"
is-resolvable@^1.0.0: is-resolvable@^1.0.0:
version "1.1.0" version "1.1.0"
@ -4676,16 +4669,16 @@ is-stream@^2.0.0:
integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
is-string@^1.0.5: is-string@^1.0.5:
version "1.0.5" version "1.0.6"
resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
is-symbol@^1.0.2, is-symbol@^1.0.3: is-symbol@^1.0.2, is-symbol@^1.0.3:
version "1.0.3" version "1.0.4"
resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
dependencies: dependencies:
has-symbols "^1.0.1" has-symbols "^1.0.2"
is-windows@^1.0.2: is-windows@^1.0.2:
version "1.0.2" version "1.0.2"
@ -4893,9 +4886,9 @@ klona@^2.0.4:
integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA== integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
laravel-mix@^6.0.6: laravel-mix@^6.0.6:
version "6.0.18" version "6.0.19"
resolved "https://registry.yarnpkg.com/laravel-mix/-/laravel-mix-6.0.18.tgz#ce1ef5053e59a6ad611f787da181e337394e53aa" resolved "https://registry.yarnpkg.com/laravel-mix/-/laravel-mix-6.0.19.tgz#4de8fa5c1cdd886db380a1f634bf9b3c3aff15af"
integrity sha512-OIyJFvpdyPRS6UWAbECwK1hRvba7VkH2wJIMWY8bButecpd+6Zde4/uKFDs/Up31jzOh8qPxObkamcsGxGq3jg== integrity sha512-SH//4h/bi2ff5hyBfwQ0DE0VfTkskGLU+a/l7HdmTz1F+cJdvakajziyBVRwa9U3+DyvZo9eo9Jgq1jdZWW3XQ==
dependencies: dependencies:
"@babel/core" "^7.12.3" "@babel/core" "^7.12.3"
"@babel/plugin-proposal-object-rest-spread" "^7.12.1" "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
@ -4944,7 +4937,7 @@ laravel-mix@^6.0.6:
vue-style-loader "^4.1.3" vue-style-loader "^4.1.3"
webpack "^5.25.1" webpack "^5.25.1"
webpack-cli "^4.1.0" webpack-cli "^4.1.0"
webpack-dev-server "^4.0.0-beta.0" webpack-dev-server "4.0.0-beta.2"
webpack-merge "^5.2.0" webpack-merge "^5.2.0"
webpack-notifier "^1.8.0" webpack-notifier "^1.8.0"
webpackbar "^5.0.0-3" webpackbar "^5.0.0-3"
@ -5500,9 +5493,9 @@ object-copy@^0.1.0:
kind-of "^3.0.3" kind-of "^3.0.3"
object-inspect@^1.6.0, object-inspect@^1.9.0: object-inspect@^1.6.0, object-inspect@^1.9.0:
version "1.10.2" version "1.10.3"
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
integrity sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA== integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
object-is@^1.0.1: object-is@^1.0.1:
version "1.1.5" version "1.1.5"
@ -6213,9 +6206,9 @@ postcss@7.0.21:
supports-color "^6.1.0" supports-color "^6.1.0"
postcss@^8.1.14, postcss@^8.2.10: postcss@^8.1.14, postcss@^8.2.10:
version "8.2.13" version "8.2.14"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.14.tgz#dcf313eb8247b3ce8078d048c0e8262ca565ad2b"
integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ== integrity sha512-+jD0ZijcvyCqPQo/m/CW0UcARpdFylq04of+Q7RKX6f/Tu+dvpUI/9Sp81+i6/vJThnOBX09Quw0ZLOVwpzX3w==
dependencies: dependencies:
colorette "^1.2.2" colorette "^1.2.2"
nanoid "^3.1.22" nanoid "^3.1.22"
@ -6539,9 +6532,9 @@ resolve-from@^5.0.0:
integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
resolve-url-loader@^3.1.2: resolve-url-loader@^3.1.2:
version "3.1.2" version "3.1.3"
resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz#235e2c28e22e3e432ba7a5d4e305c59a58edfc08" resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.3.tgz#49ec68340f67d8d2ab6b401948d5def3ab2d0367"
integrity sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ== integrity sha512-WbDSNFiKPPLem1ln+EVTE+bFUBdTTytfQZWbmghroaFNFaAVmGq0Saqw6F/306CwgPXsGwXVxbODE+3xAo/YbA==
dependencies: dependencies:
adjust-sourcemap-loader "3.0.0" adjust-sourcemap-loader "3.0.0"
camelcase "5.3.1" camelcase "5.3.1"
@ -6723,9 +6716,9 @@ select2@^4.0.13:
integrity sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw== integrity sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw==
selfsigned@^1.10.8: selfsigned@^1.10.8:
version "1.10.8" version "1.10.11"
resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
dependencies: dependencies:
node-forge "^0.10.0" node-forge "^0.10.0"
@ -7211,9 +7204,9 @@ svgo@^1.0.0:
util.promisify "~1.0.0" util.promisify "~1.0.0"
sweetalert2@^10.15.6: sweetalert2@^10.15.6:
version "10.16.6" version "10.16.7"
resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-10.16.6.tgz#bf9893386aa9330a22fde188c25897a98559dc4a" resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-10.16.7.tgz#beea4accd616c93545ab16ee40c41a3e79ac866b"
integrity sha512-089SRfG8NopJAVG9euo+kKHWRaCK6V5WY6v1kySYL07SDF/FEEW1Fu+LqkHqvQ0h3KnQ8AE2Z81mpvhMOlx/Vw== integrity sha512-8w7UMU+joJro3r7CyyqLOK5Agc0/TI2OqC2T8odOOYRKbPvq2Bq9GF3HoQT2tFnjiqP5QEpVugayowoIl2ZlWw==
tapable@^2.1.1, tapable@^2.2.0: tapable@^2.1.1, tapable@^2.2.0:
version "2.2.0" version "2.2.0"
@ -7514,9 +7507,9 @@ upath@^1.1.1:
integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
uplot@^1.6.7: uplot@^1.6.7:
version "1.6.8" version "1.6.9"
resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.8.tgz#0a7920018de24fa9aa0ba78ab59c99b4a23f8322" resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.9.tgz#0f10e10b5882cb80eb58d63f870b8a77e8d95962"
integrity sha512-Hqg7iv/3fJlD9nockD7heaUj28RhrIwzugXglnoX//W27wgRAJIJMV2VFMZ5oRVM0RIchByAle1ylf/GdnXgjA== integrity sha512-uWIegRdqbqJwnB5SDBt29lyJIgHLIqt5AnwlLGxuA3gKKXGtY7d68RR6oDF2u5pK9jpIb1djrQnm5n0BiAnUgA==
uri-js@^4.2.2: uri-js@^4.2.2:
version "4.4.1" version "4.4.1"
@ -7704,17 +7697,16 @@ wbuf@^1.1.0, wbuf@^1.7.3:
minimalistic-assert "^1.0.0" minimalistic-assert "^1.0.0"
webpack-cli@^4.1.0: webpack-cli@^4.1.0:
version "4.6.0" version "4.7.0"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.6.0.tgz#27ae86bfaec0cf393fcfd58abdc5a229ad32fd16" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz#3195a777f1f802ecda732f6c95d24c0004bc5a35"
integrity sha512-9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA== integrity sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g==
dependencies: dependencies:
"@discoveryjs/json-ext" "^0.5.0" "@discoveryjs/json-ext" "^0.5.0"
"@webpack-cli/configtest" "^1.0.2" "@webpack-cli/configtest" "^1.0.3"
"@webpack-cli/info" "^1.2.3" "@webpack-cli/info" "^1.2.4"
"@webpack-cli/serve" "^1.3.1" "@webpack-cli/serve" "^1.4.0"
colorette "^1.2.1" colorette "^1.2.1"
commander "^7.0.0" commander "^7.0.0"
enquirer "^2.3.6"
execa "^5.0.0" execa "^5.0.0"
fastest-levenshtein "^1.0.12" fastest-levenshtein "^1.0.12"
import-local "^3.0.2" import-local "^3.0.2"
@ -7735,7 +7727,7 @@ webpack-dev-middleware@^4.1.0:
range-parser "^1.2.1" range-parser "^1.2.1"
schema-utils "^3.0.0" schema-utils "^3.0.0"
webpack-dev-server@^4.0.0-beta.0: webpack-dev-server@4.0.0-beta.2:
version "4.0.0-beta.2" version "4.0.0-beta.2"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.0.0-beta.2.tgz#0364a5756544da9c077da829016817703db4d5ed" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.0.0-beta.2.tgz#0364a5756544da9c077da829016817703db4d5ed"
integrity sha512-kbUAjQg1FLtCoIZ0NdcTZWRBVT1EDajBSvGAiAqQPJxBjsr0N3FQ57kJ/4SrIZPyAajn8kcHctwFsTKPwme1tQ== integrity sha512-kbUAjQg1FLtCoIZ0NdcTZWRBVT1EDajBSvGAiAqQPJxBjsr0N3FQ57kJ/4SrIZPyAajn8kcHctwFsTKPwme1tQ==

2
public/v1/js/app_vue.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/accounts/create.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/accounts/delete.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/accounts/index.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/accounts/show.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/budgets/index.js vendored Executable file
View File

File diff suppressed because one or more lines are too long

1
public/v2/js/budgets/index.js.map Executable file
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/dashboard.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/dashboard.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/create.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/create.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/edit.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/edit.js.map
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/transactions/index.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/vendor.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v2/js/vendor.js.LICENSE.txt
View File

@ -16,7 +16,7 @@
*/ */
/*! /*!
* Chart.js v3.2.0 * Chart.js v3.2.1
* https://www.chartjs.org * https://www.chartjs.org
* (c) 2021 Chart.js Contributors * (c) 2021 Chart.js Contributors
* Released under the MIT License * Released under the MIT License

2
public/v2/js/vendor.js.map
View File

File diff suppressed because one or more lines are too long

4
resources/lang/de_DE/firefly.php
View File

@ -1287,8 +1287,8 @@ return [
'budgetsAndSpending' => 'Budgets und Ausgaben', 'budgetsAndSpending' => 'Budgets und Ausgaben',
'budgets_and_spending' => 'Budgets und Ausgaben', 'budgets_and_spending' => 'Budgets und Ausgaben',
'go_to_budget' => 'Zu Budget „{budget}” wechseln', 'go_to_budget' => 'Zu Budget „{budget}” wechseln',
'go_to_deposits' => 'Zu Einlagen wechseln', 'go_to_deposits' => 'Einnahmen anzeigen',
'go_to_expenses' => 'Zu Ausgaben wechseln', 'go_to_expenses' => 'Ausgaben anzeigen',
'savings' => 'Erspartes', 'savings' => 'Erspartes',
'newWithdrawal' => 'Neue Ausgabe', 'newWithdrawal' => 'Neue Ausgabe',
'newDeposit' => 'Neue Einnahme', 'newDeposit' => 'Neue Einnahme',

8
resources/views/v2/budgets/indexx.twig
View File

@ -6,11 +6,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<!-- Small boxes (Stat box) --> <div id="budgets"></div>
<!-- Main row -->
<div id="no-page">Hello, I am empty page.</div>
<!-- /.row (main row) -->
{% endblock %} {% endblock %}
{% block styles %} {% block styles %}
@ -18,5 +14,5 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script src="v2/js/empty.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script> <script src="v2/js/budgets/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %} {% endblock %}

223
yarn.lock
View File

@ -36,11 +36,11 @@
source-map "^0.5.0" source-map "^0.5.0"
"@babel/generator@^7.14.0": "@babel/generator@^7.14.0":
version "7.14.0" version "7.14.1"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.0.tgz#0f35d663506c43e4f10898fbda0d752ec75494be" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz#1f99331babd65700183628da186f36f63d615c93"
integrity sha512-C6u00HbmsrNPug6A+CiNl8rEys7TsdcXwg12BHi2ca5rUfAs3+UwZsuDQSXnc+wCElCXMB8gMaJ3YXDdh8fAlg== integrity sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==
dependencies: dependencies:
"@babel/types" "^7.14.0" "@babel/types" "^7.14.1"
jsesc "^2.5.1" jsesc "^2.5.1"
source-map "^0.5.0" source-map "^0.5.0"
@ -70,9 +70,9 @@
semver "^6.3.0" semver "^6.3.0"
"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0": "@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.14.0":
version "7.14.0" version "7.14.1"
resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.0.tgz#38367d3dab125b12f94273de418f4df23a11a15e" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.1.tgz#1fe11b376f3c41650ad9fedc665b0068722ea76c"
integrity sha512-6pXDPguA5zC40Y8oI5mqr+jEUpjMJonKvknvA+vD8CYDz5uuXEwWBK8sRAsE/t3gfb1k15AQb9RhwpscC4nUJQ== integrity sha512-r8rsUahG4ywm0QpGcCrLaUSOuNAISR3IZCg4Fx05Ozq31aCUrQsTLH6KPxy0N5ULoQ4Sn9qjNdGNtbPWAC6hYg==
dependencies: dependencies:
"@babel/helper-annotate-as-pure" "^7.12.13" "@babel/helper-annotate-as-pure" "^7.12.13"
"@babel/helper-function-name" "^7.12.13" "@babel/helper-function-name" "^7.12.13"
@ -253,9 +253,9 @@
js-tokens "^4.0.0" js-tokens "^4.0.0"
"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0": "@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0":
version "7.14.0" version "7.14.1"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.0.tgz#2f0ebfed92bcddcc8395b91f1895191ce2760380" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz#1bd644b5db3f5797c4479d89ec1817fe02b84c47"
integrity sha512-AHbfoxesfBALg33idaTBVUkLnfXtsgvJREf93p4p0Lwsz4ppfE7g1tpEXVm4vrxUcH4DVhAa9Z1m1zqf9WUC7Q== integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12": "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
version "7.13.12" version "7.13.12"
@ -514,10 +514,10 @@
dependencies: dependencies:
"@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-plugin-utils" "^7.12.13"
"@babel/plugin-transform-block-scoping@^7.13.16": "@babel/plugin-transform-block-scoping@^7.14.1":
version "7.13.16" version "7.14.1"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.13.16.tgz#a9c0f10794855c63b1d629914c7dcfeddd185892" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz#ac1b3a8e3d8cbb31efc6b9be2f74eb9823b74ab2"
integrity sha512-ad3PHUxGnfWF4Efd3qFuznEtZKoBp0spS+DgqzVzRPV7urEBvPLue3y2j80w4Jf2YLzZHj8TOv/Lmvdmh3b2xg== integrity sha512-2mQXd0zBrwfp0O1moWIhPpEeTKDvxyHcnma3JATVP1l+CctWBuot6OJG8LQ4DnBj4ZZPSmlb/fm4mu47EOAnVA==
dependencies: dependencies:
"@babel/helper-plugin-utils" "^7.13.0" "@babel/helper-plugin-utils" "^7.13.0"
@ -752,9 +752,9 @@
"@babel/helper-plugin-utils" "^7.12.13" "@babel/helper-plugin-utils" "^7.12.13"
"@babel/preset-env@^7.12.1": "@babel/preset-env@^7.12.1":
version "7.14.0" version "7.14.1"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.0.tgz#236f88cd5da625e625dd40500d4824523f50e6c5" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.1.tgz#b55914e2e68885ea03f69600b2d3537e54574a93"
integrity sha512-GWRCdBv2whxqqaSi7bo/BEXf070G/fWFMEdCnmoRg2CZJy4GK06ovFuEjJrZhDRXYgBsYtxVbG8GUHvw+UWBkQ== integrity sha512-0M4yL1l7V4l+j/UHvxcdvNfLB9pPtIooHTbEhgD/6UGyh8Hy3Bm1Mj0buzjDXATCSz3JFibVdnoJZCrlUCanrQ==
dependencies: dependencies:
"@babel/compat-data" "^7.14.0" "@babel/compat-data" "^7.14.0"
"@babel/helper-compilation-targets" "^7.13.16" "@babel/helper-compilation-targets" "^7.13.16"
@ -793,7 +793,7 @@
"@babel/plugin-transform-arrow-functions" "^7.13.0" "@babel/plugin-transform-arrow-functions" "^7.13.0"
"@babel/plugin-transform-async-to-generator" "^7.13.0" "@babel/plugin-transform-async-to-generator" "^7.13.0"
"@babel/plugin-transform-block-scoped-functions" "^7.12.13" "@babel/plugin-transform-block-scoped-functions" "^7.12.13"
"@babel/plugin-transform-block-scoping" "^7.13.16" "@babel/plugin-transform-block-scoping" "^7.14.1"
"@babel/plugin-transform-classes" "^7.13.0" "@babel/plugin-transform-classes" "^7.13.0"
"@babel/plugin-transform-computed-properties" "^7.13.0" "@babel/plugin-transform-computed-properties" "^7.13.0"
"@babel/plugin-transform-destructuring" "^7.13.17" "@babel/plugin-transform-destructuring" "^7.13.17"
@ -823,7 +823,7 @@
"@babel/plugin-transform-unicode-escapes" "^7.12.13" "@babel/plugin-transform-unicode-escapes" "^7.12.13"
"@babel/plugin-transform-unicode-regex" "^7.12.13" "@babel/plugin-transform-unicode-regex" "^7.12.13"
"@babel/preset-modules" "^0.1.4" "@babel/preset-modules" "^0.1.4"
"@babel/types" "^7.14.0" "@babel/types" "^7.14.1"
babel-plugin-polyfill-corejs2 "^0.2.0" babel-plugin-polyfill-corejs2 "^0.2.0"
babel-plugin-polyfill-corejs3 "^0.2.0" babel-plugin-polyfill-corejs3 "^0.2.0"
babel-plugin-polyfill-regenerator "^0.2.0" babel-plugin-polyfill-regenerator "^0.2.0"
@ -871,10 +871,10 @@
debug "^4.1.0" debug "^4.1.0"
globals "^11.1.0" globals "^11.1.0"
"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4": "@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.4.4":
version "7.14.0" version "7.14.1"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.0.tgz#3fc3fc74e0cdad878182e5f66cc6bcab1915a802" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db"
integrity sha512-O2LVLdcnWplaGxiPBz12d0HcdN8QdxdsWYhz5LSeuukV/5mn2xUUc3gBeU4QBYPJ18g/UToe8F532XJ608prmg== integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==
dependencies: dependencies:
"@babel/helper-validator-identifier" "^7.14.0" "@babel/helper-validator-identifier" "^7.14.0"
to-fast-properties "^2.0.0" to-fast-properties "^2.0.0"
@ -1065,9 +1065,9 @@
integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
"@types/node@*": "@types/node@*":
version "15.0.1" version "15.0.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a" resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67"
integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA== integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==
"@types/parse-glob@*": "@types/parse-glob@*":
version "3.0.29" version "3.0.29"
@ -1239,22 +1239,22 @@
"@webassemblyjs/ast" "1.11.0" "@webassemblyjs/ast" "1.11.0"
"@xtuc/long" "4.2.2" "@xtuc/long" "4.2.2"
"@webpack-cli/configtest@^1.0.2": "@webpack-cli/configtest@^1.0.3":
version "1.0.2" version "1.0.3"
resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.2.tgz#2a20812bfb3a2ebb0b27ee26a52eeb3e3f000836" resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz#204bcff87cda3ea4810881f7ea96e5f5321b87b9"
integrity sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA== integrity sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==
"@webpack-cli/info@^1.2.3": "@webpack-cli/info@^1.2.4":
version "1.2.3" version "1.2.4"
resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.3.tgz#ef819d10ace2976b6d134c7c823a3e79ee31a92c" resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz#7381fd41c9577b2d8f6c2594fad397ef49ad5573"
integrity sha512-lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q== integrity sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g==
dependencies: dependencies:
envinfo "^7.7.3" envinfo "^7.7.3"
"@webpack-cli/serve@^1.3.1": "@webpack-cli/serve@^1.4.0":
version "1.3.1" version "1.4.0"
resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.1.tgz#911d1b3ff4a843304b9c3bacf67bb34672418441" resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz#f84fd07bcacefe56ce762925798871092f0f228e"
integrity sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw== integrity sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==
"@xtuc/ieee754@^1.2.0": "@xtuc/ieee754@^1.2.0":
version "1.2.0" version "1.2.0"
@ -1275,9 +1275,9 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
negotiator "0.6.2" negotiator "0.6.2"
acorn@^8.2.1: acorn@^8.2.1:
version "8.2.2" version "8.2.4"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.2.tgz#c4574e4fea298d6e6ed4b85ab844b06dd59f26d6" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0"
integrity sha512-VrMS8kxT0e7J1EX0p6rI/E0FbfOVcvBpbIqHThFv+f8YrZIlMfVotYcXKVPmTvPW8sW5miJzfUFrrvthUZg8VQ== integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==
aggregate-error@^3.0.0: aggregate-error@^3.0.0:
version "3.1.0" version "3.1.0"
@ -1307,11 +1307,6 @@ alphanum-sort@^1.0.0:
resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
ansi-colors@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
ansi-escapes@^4.3.1: ansi-escapes@^4.3.1:
version "4.3.2" version "4.3.2"
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
@ -1706,7 +1701,7 @@ browserify-zlib@^0.2.0:
dependencies: dependencies:
pako "~1.0.5" pako "~1.0.5"
browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.16.5: browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.16.6:
version "4.16.6" version "4.16.6"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
@ -1827,9 +1822,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0" lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001196, caniuse-lite@^1.0.30001219: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001196, caniuse-lite@^1.0.30001219:
version "1.0.30001219" version "1.0.30001223"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz#5bfa5d0519f41f993618bd318f606a4c4c16156b" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz#39b49ff0bfb3ee3587000d2f66c47addc6e14443"
integrity sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ== integrity sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==
chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
version "2.4.2" version "2.4.2"
@ -2153,11 +2148,11 @@ copy-descriptor@^0.1.0:
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
core-js-compat@^3.9.0, core-js-compat@^3.9.1: core-js-compat@^3.9.0, core-js-compat@^3.9.1:
version "3.11.1" version "3.12.0"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.11.1.tgz#57a91e9b02d3bb8cf37f82eceaf44a3d646fa614" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.0.tgz#a031e51fe411085e33cb629bfee2acaa53bc309a"
integrity sha512-aZ0e4tmlG/aOBHj92/TuOuZwp6jFvn1WNabU5VOVixzhu5t5Ao+JZkQOPlgNXu6ynwLrwJxklT4Gw1G1VGEh+g== integrity sha512-vvaN8EOvYBEjrr+MN3vCKrMNc/xdYZI+Rt/uPMROi4T5Hj8Fz6TiPQm2mrB9aZoQVW1lCFHYmMrv99aUct9mkg==
dependencies: dependencies:
browserslist "^4.16.5" browserslist "^4.16.6"
semver "7.0.0" semver "7.0.0"
core-util-is@~1.0.0: core-util-is@~1.0.0:
@ -2637,9 +2632,9 @@ dotenv-expand@^5.1.0:
integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
dotenv@^8.2.0: dotenv@^8.2.0:
version "8.2.0" version "8.6.0"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
ee-first@1.1.1: ee-first@1.1.1:
version "1.1.1" version "1.1.1"
@ -2647,9 +2642,9 @@ ee-first@1.1.1:
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
electron-to-chromium@^1.3.723: electron-to-chromium@^1.3.723:
version "1.3.725" version "1.3.727"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.725.tgz#04fc83f9189169aff50f0a00c6b4090b910cba85" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"
integrity sha512-2BbeAESz7kc6KBzs7WVrMc1BY5waUphk4D4DX5dSQXJhsc3tP5ZFaiyuL0AB7vUKzDYpIeYwTYlEfxyjsGUrhw== integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==
elliptic@^6.5.3: elliptic@^6.5.3:
version "6.5.4" version "6.5.4"
@ -2687,13 +2682,6 @@ enhanced-resolve@^5.8.0:
graceful-fs "^4.2.4" graceful-fs "^4.2.4"
tapable "^2.2.0" tapable "^2.2.0"
enquirer@^2.3.6:
version "2.3.6"
resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
dependencies:
ansi-colors "^4.1.1"
entities@^2.0.0: entities@^2.0.0:
version "2.2.0" version "2.2.0"
resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
@ -3151,9 +3139,9 @@ glob-to-regexp@^0.4.1:
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
glob@^7.1.3, glob@^7.1.6: glob@^7.1.3, glob@^7.1.6:
version "7.1.6" version "7.1.7"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
dependencies: dependencies:
fs.realpath "^1.0.0" fs.realpath "^1.0.0"
inflight "^1.0.4" inflight "^1.0.4"
@ -3627,9 +3615,9 @@ is-arrayish@^0.3.1:
integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
is-bigint@^1.0.1: is-bigint@^1.0.1:
version "1.0.1" version "1.0.2"
resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2" resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg== integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
is-binary-path@^1.0.0: is-binary-path@^1.0.0:
version "1.0.1" version "1.0.1"
@ -3646,11 +3634,11 @@ is-binary-path@~2.1.0:
binary-extensions "^2.0.0" binary-extensions "^2.0.0"
is-boolean-object@^1.1.0: is-boolean-object@^1.1.0:
version "1.1.0" version "1.1.1"
resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0" resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA== integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
dependencies: dependencies:
call-bind "^1.0.0" call-bind "^1.0.2"
is-buffer@^1.1.5, is-buffer@~1.1.6: is-buffer@^1.1.5, is-buffer@~1.1.6:
version "1.1.6" version "1.1.6"
@ -3696,9 +3684,9 @@ is-data-descriptor@^1.0.0:
kind-of "^6.0.0" kind-of "^6.0.0"
is-date-object@^1.0.1: is-date-object@^1.0.1:
version "1.0.2" version "1.0.4"
resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
is-descriptor@^0.1.0: is-descriptor@^0.1.0:
version "0.1.6" version "0.1.6"
@ -3777,9 +3765,9 @@ is-negative-zero@^2.0.1:
integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
is-number-object@^1.0.4: is-number-object@^1.0.4:
version "1.0.4" version "1.0.5"
resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw== integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
is-number@^3.0.0: is-number@^3.0.0:
version "3.0.0" version "3.0.0"
@ -3821,12 +3809,12 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
isobject "^3.0.1" isobject "^3.0.1"
is-regex@^1.0.4, is-regex@^1.1.2: is-regex@^1.0.4, is-regex@^1.1.2:
version "1.1.2" version "1.1.3"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
dependencies: dependencies:
call-bind "^1.0.2" call-bind "^1.0.2"
has-symbols "^1.0.1" has-symbols "^1.0.2"
is-resolvable@^1.0.0: is-resolvable@^1.0.0:
version "1.1.0" version "1.1.0"
@ -3839,16 +3827,16 @@ is-stream@^2.0.0:
integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
is-string@^1.0.5: is-string@^1.0.5:
version "1.0.5" version "1.0.6"
resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
is-symbol@^1.0.2, is-symbol@^1.0.3: is-symbol@^1.0.2, is-symbol@^1.0.3:
version "1.0.3" version "1.0.4"
resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
dependencies: dependencies:
has-symbols "^1.0.1" has-symbols "^1.0.2"
is-windows@^1.0.2: is-windows@^1.0.2:
version "1.0.2" version "1.0.2"
@ -3999,9 +3987,9 @@ klona@^2.0.4:
integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA== integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
laravel-mix@^6.0: laravel-mix@^6.0:
version "6.0.18" version "6.0.19"
resolved "https://registry.yarnpkg.com/laravel-mix/-/laravel-mix-6.0.18.tgz#ce1ef5053e59a6ad611f787da181e337394e53aa" resolved "https://registry.yarnpkg.com/laravel-mix/-/laravel-mix-6.0.19.tgz#4de8fa5c1cdd886db380a1f634bf9b3c3aff15af"
integrity sha512-OIyJFvpdyPRS6UWAbECwK1hRvba7VkH2wJIMWY8bButecpd+6Zde4/uKFDs/Up31jzOh8qPxObkamcsGxGq3jg== integrity sha512-SH//4h/bi2ff5hyBfwQ0DE0VfTkskGLU+a/l7HdmTz1F+cJdvakajziyBVRwa9U3+DyvZo9eo9Jgq1jdZWW3XQ==
dependencies: dependencies:
"@babel/core" "^7.12.3" "@babel/core" "^7.12.3"
"@babel/plugin-proposal-object-rest-spread" "^7.12.1" "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
@ -4050,7 +4038,7 @@ laravel-mix@^6.0:
vue-style-loader "^4.1.3" vue-style-loader "^4.1.3"
webpack "^5.25.1" webpack "^5.25.1"
webpack-cli "^4.1.0" webpack-cli "^4.1.0"
webpack-dev-server "^4.0.0-beta.0" webpack-dev-server "4.0.0-beta.2"
webpack-merge "^5.2.0" webpack-merge "^5.2.0"
webpack-notifier "^1.8.0" webpack-notifier "^1.8.0"
webpackbar "^5.0.0-3" webpackbar "^5.0.0-3"
@ -4522,9 +4510,9 @@ object-copy@^0.1.0:
kind-of "^3.0.3" kind-of "^3.0.3"
object-inspect@^1.9.0: object-inspect@^1.9.0:
version "1.10.2" version "1.10.3"
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
integrity sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA== integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
object-is@^1.0.1: object-is@^1.0.1:
version "1.1.5" version "1.1.5"
@ -5173,9 +5161,9 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
supports-color "^6.1.0" supports-color "^6.1.0"
postcss@^8.2, postcss@^8.2.10: postcss@^8.2, postcss@^8.2.10:
version "8.2.13" version "8.2.14"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.14.tgz#dcf313eb8247b3ce8078d048c0e8262ca565ad2b"
integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ== integrity sha512-+jD0ZijcvyCqPQo/m/CW0UcARpdFylq04of+Q7RKX6f/Tu+dvpUI/9Sp81+i6/vJThnOBX09Quw0ZLOVwpzX3w==
dependencies: dependencies:
colorette "^1.2.2" colorette "^1.2.2"
nanoid "^3.1.22" nanoid "^3.1.22"
@ -5573,9 +5561,9 @@ select-hose@^2.0.0:
integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
selfsigned@^1.10.8: selfsigned@^1.10.8:
version "1.10.8" version "1.10.11"
resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
dependencies: dependencies:
node-forge "^0.10.0" node-forge "^0.10.0"
@ -6117,9 +6105,9 @@ type-is@~1.6.17, type-is@~1.6.18:
mime-types "~2.1.24" mime-types "~2.1.24"
uiv@^1.2: uiv@^1.2:
version "1.2.4" version "1.3.0"
resolved "https://registry.yarnpkg.com/uiv/-/uiv-1.2.4.tgz#b168e0cf97a7d27f813cbaf4af9f17c0a1230df1" resolved "https://registry.yarnpkg.com/uiv/-/uiv-1.3.0.tgz#dde58a30b181962b317f1e65cfef775cbd32bf73"
integrity sha512-tSiNxMKY73s18+JRP3Xb/Ynh+ll3UZB+p9l+C/MY5GU7hl7aM/PShqVSVcSqCJGYs7tAexzL5fcF4U96wyH88w== integrity sha512-GmNJWxWIWebg5D3rTDBa5Wnf5hCj+i4Xv/5MFVNi5HTd9jFnnodNjARClgNHWOOtAgS6yBhE7vramszeCzjwbw==
dependencies: dependencies:
portal-vue "^2.1.7" portal-vue "^2.1.7"
vue-functional-data-merge "^3.0.0" vue-functional-data-merge "^3.0.0"
@ -6362,17 +6350,16 @@ wbuf@^1.1.0, wbuf@^1.7.3:
minimalistic-assert "^1.0.0" minimalistic-assert "^1.0.0"
webpack-cli@^4.1.0: webpack-cli@^4.1.0:
version "4.6.0" version "4.7.0"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.6.0.tgz#27ae86bfaec0cf393fcfd58abdc5a229ad32fd16" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz#3195a777f1f802ecda732f6c95d24c0004bc5a35"
integrity sha512-9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA== integrity sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g==
dependencies: dependencies:
"@discoveryjs/json-ext" "^0.5.0" "@discoveryjs/json-ext" "^0.5.0"
"@webpack-cli/configtest" "^1.0.2" "@webpack-cli/configtest" "^1.0.3"
"@webpack-cli/info" "^1.2.3" "@webpack-cli/info" "^1.2.4"
"@webpack-cli/serve" "^1.3.1" "@webpack-cli/serve" "^1.4.0"
colorette "^1.2.1" colorette "^1.2.1"
commander "^7.0.0" commander "^7.0.0"
enquirer "^2.3.6"
execa "^5.0.0" execa "^5.0.0"
fastest-levenshtein "^1.0.12" fastest-levenshtein "^1.0.12"
import-local "^3.0.2" import-local "^3.0.2"
@ -6393,7 +6380,7 @@ webpack-dev-middleware@^4.1.0:
range-parser "^1.2.1" range-parser "^1.2.1"
schema-utils "^3.0.0" schema-utils "^3.0.0"
webpack-dev-server@^4.0.0-beta.0: webpack-dev-server@4.0.0-beta.2:
version "4.0.0-beta.2" version "4.0.0-beta.2"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.0.0-beta.2.tgz#0364a5756544da9c077da829016817703db4d5ed" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.0.0-beta.2.tgz#0364a5756544da9c077da829016817703db4d5ed"
integrity sha512-kbUAjQg1FLtCoIZ0NdcTZWRBVT1EDajBSvGAiAqQPJxBjsr0N3FQ57kJ/4SrIZPyAajn8kcHctwFsTKPwme1tQ== integrity sha512-kbUAjQg1FLtCoIZ0NdcTZWRBVT1EDajBSvGAiAqQPJxBjsr0N3FQ57kJ/4SrIZPyAajn8kcHctwFsTKPwme1tQ==