kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 19:53:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	app/Api/V1/Controllers/Models/AvailableBudget/DestroyController.php
#	config/firefly.php
#	frontend/package.json
#	frontend/src/i18n/fr_FR/index.js
#	frontend/src/i18n/pt_BR/index.js
#	frontend/src/i18n/ru_RU/index.js
#	frontend/src/i18n/sl_SI/index.js
#	frontend/src/i18n/zh_CN/index.js
#	frontend/yarn.lock
#	public/v3/index.html
#	public/v3/js/1473.9b55dc17.js
#	public/v3/js/150.35592a2c.js
#	public/v3/js/1501.3980515e.js
#	public/v3/js/1543.010ec22e.js
#	public/v3/js/1730.207e6e59.js
#	public/v3/js/1864.d9ea853e.js
#	public/v3/js/1951.a5d70097.js
#	public/v3/js/2106.33b7eabd.js
#	public/v3/js/2124.bfc4091d.js
#	public/v3/js/2194.4baebc21.js
#	public/v3/js/2372.f07615ae.js
#	public/v3/js/2407.747d87e4.js
#	public/v3/js/2476.8af9976c.js
#	public/v3/js/2686.5e278d64.js
#	public/v3/js/2700.1251f369.js
#	public/v3/js/3232.0964e736.js
#	public/v3/js/3903.4e461032.js
#	public/v3/js/4640.601878ff.js
#	public/v3/js/4782.e1382ab6.js
#	public/v3/js/4851.3c27e6c7.js
#	public/v3/js/5221.fded0f96.js
#	public/v3/js/5266.e820dd38.js
#	public/v3/js/5348.109b8049.js
#	public/v3/js/5439.d75e5cb4.js
#	public/v3/js/5724.8b5fcafb.js
#	public/v3/js/576.e26ddde9.js
#	public/v3/js/6072.21c05085.js
#	public/v3/js/6323.69d55ffd.js
#	public/v3/js/6676.60b155c0.js
#	public/v3/js/6691.80040366.js
#	public/v3/js/6719.f9d4744f.js
#	public/v3/js/6826.74ed4602.js
#	public/v3/js/6882.c5970da7.js
#	public/v3/js/6919.cc55656e.js
#	public/v3/js/7044.96c481ac.js
#	public/v3/js/7083.c223af4f.js
#	public/v3/js/7222.86a095eb.js
#	public/v3/js/7480.b9bd8fed.js
#	public/v3/js/7499.c362f695.js
#	public/v3/js/7544.47af6552.js
#	public/v3/js/7552.ebdf1aef.js
#	public/v3/js/7586.29cf8776.js
#	public/v3/js/7697.4338f28d.js
#	public/v3/js/773.ff7cb3ef.js
#	public/v3/js/7919.910d5ebb.js
#	public/v3/js/7956.3e1c81cf.js
#	public/v3/js/8044.169b21f8.js
#	public/v3/js/8218.966b669d.js
#	public/v3/js/8344.119567b0.js
#	public/v3/js/8376.477a5508.js
#	public/v3/js/8387.a4c1d7d6.js
#	public/v3/js/8405.62235b41.js
#	public/v3/js/8493.48ada210.js
#	public/v3/js/8611.3ab24e6d.js
#	public/v3/js/8907.233f4719.js
#	public/v3/js/8928.8127fcdf.js
#	public/v3/js/9009.d0e97de6.js
#	public/v3/js/9038.06ad98ab.js
#	public/v3/js/9069.e81f039c.js
#	public/v3/js/9287.bc57ab91.js
#	public/v3/js/9597.0c124ce8.js
#	public/v3/js/9606.ce293dd2.js
#	public/v3/js/app.13f6ce91.js
#	public/v3/js/chunk-common.98b27fd7.js
#	public/v3/js/vendor.92714ea3.js
#	resources/assets/js/locales/fr.json
#	resources/assets/js/locales/ru.json
#	resources/assets/js/locales/sl.json
#	resources/assets/js/locales/zh-cn.json
#	resources/lang/de_DE/firefly.php
#	resources/lang/nl_NL/firefly.php
#	resources/lang/pt_BR/firefly.php
#	resources/lang/sl_SI/firefly.php
#	resources/lang/zh_CN/firefly.php
This commit is contained in:
James Cole
2022-12-24 17:34:20 +01:00
parent 8b9936044b fcecd5c85e
commit 80762616f3
149 changed files with 2282 additions and 1645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Api/V1/Controllers/Data/DestroyController.php
View File

@@ -165,6 +165,7 @@ class DestroyController extends Controller
);
break;
}
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/Account/DestroyController.php
View File

@@ -69,6 +69,7 @@ class DestroyController extends Controller
public function destroy(Account $account): JsonResponse
{
$this->repository->destroy($account, null);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/Attachment/DestroyController.php
View File

@@ -73,6 +73,7 @@ class DestroyController extends Controller
public function destroy(Attachment $attachment): JsonResponse
{
$this->repository->destroy($attachment);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/Bill/DestroyController.php
View File

@@ -67,6 +67,7 @@ class DestroyController extends Controller
public function destroy(Bill $bill): JsonResponse
{
$this->repository->destroy($bill);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/Budget/DestroyController.php
View File

@@ -67,6 +67,7 @@ class DestroyController extends Controller
public function destroy(Budget $budget): JsonResponse
{
$this->repository->destroy($budget);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php
View File

@@ -77,6 +77,7 @@ class DestroyController extends Controller
throw new FireflyException('20028: The budget limit does not belong to the budget.');
}
$this->blRepository->destroyBudgetLimit($budgetLimit);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/Category/DestroyController.php
View File

@@ -67,6 +67,7 @@ class DestroyController extends Controller
public function destroy(Category $category): JsonResponse
{
$this->repository->destroy($category);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php
View File

@@ -70,6 +70,7 @@ class DestroyController extends Controller
public function destroy(ObjectGroup $objectGroup): JsonResponse
{
$this->repository->destroy($objectGroup);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php
View File

@@ -67,6 +67,7 @@ class DestroyController extends Controller
public function destroy(PiggyBank $piggyBank): JsonResponse
{
$this->repository->destroy($piggyBank);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/Recurrence/DestroyController.php
View File

@@ -67,6 +67,7 @@ class DestroyController extends Controller
public function destroy(Recurrence $recurrence): JsonResponse
{
$this->repository->destroy($recurrence);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/Rule/DestroyController.php
View File

@@ -71,6 +71,7 @@ class DestroyController extends Controller
public function destroy(Rule $rule): JsonResponse
{
$this->ruleRepository->destroy($rule);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php
View File

@@ -71,6 +71,7 @@ class DestroyController extends Controller
public function destroy(RuleGroup $ruleGroup): JsonResponse
{
$this->ruleGroupRepository->destroy($ruleGroup, null);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/Tag/DestroyController.php
View File

@@ -71,6 +71,7 @@ class DestroyController extends Controller
public function destroy(Tag $tag): JsonResponse
{
$this->repository->destroy($tag);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/Transaction/DestroyController.php
View File

@@ -122,6 +122,7 @@ class DestroyController extends Controller
public function destroyJournal(TransactionJournal $transactionJournal): JsonResponse
{
$this->repository->destroyJournal($transactionJournal);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php
View File

@@ -88,6 +88,7 @@ class DestroyController extends Controller
}
$this->repository->destroy($currency);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php
View File

@@ -70,6 +70,7 @@ class DestroyController extends Controller
public function destroy(TransactionJournalLink $link): JsonResponse
{
$this->repository->destroyLink($link);
app('preferences')->mark();
return response()->json([], 204);
}

1
app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php
View File

@@ -82,6 +82,7 @@ class DestroyController extends Controller
throw new FireflyException('200020: Link type cannot be changed.');
}
$this->repository->destroy($linkType);
app('preferences')->mark();
return response()->json([], 204);
}

3
app/Api/V1/Controllers/Webhook/DestroyController.php
View File

@@ -69,6 +69,7 @@ class DestroyController extends Controller
public function destroy(Webhook $webhook): JsonResponse
{
$this->repository->destroy($webhook);
app('preferences')->mark();
return response()->json([], 204);
}
@@ -97,6 +98,7 @@ class DestroyController extends Controller
}
$this->repository->destroyAttempt($attempt);
app('preferences')->mark();
return response()->json([], 204);
}
@@ -120,6 +122,7 @@ class DestroyController extends Controller
throw new FireflyException('Webhook and webhook message are no match');
}
$this->repository->destroyMessage($message);
app('preferences')->mark();
return response()->json([], 204);
}

2
app/Api/V1/Requests/Models/Rule/TestRequest.php
View File

@@ -84,7 +84,7 @@ class TestRequest extends FormRequest
{
return [
'start' => 'date',
'end' => 'date|after:start',
'end' => 'date|after_or_equal:start',
'accounts' => '',
'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
];

2
app/Api/V1/Requests/Models/Rule/TriggerRequest.php
View File

@@ -74,7 +74,7 @@ class TriggerRequest extends FormRequest
{
return [
'start' => 'date',
'end' => 'date|after:start',
'end' => 'date|after_or_equal:start',
'accounts' => '',
'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
];

2
app/Api/V1/Requests/Models/RuleGroup/TestRequest.php
View File

@@ -74,7 +74,7 @@ class TestRequest extends FormRequest
{
return [
'start' => 'date',
'end' => 'date|after:start',
'end' => 'date|after_or_equal:start',
'accounts' => '',
'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
];

2
app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php
View File

@@ -74,7 +74,7 @@ class TriggerRequest extends FormRequest
{
return [
'start' => 'date',
'end' => 'date|after:start',
'end' => 'date|after_or_equal:start',
];
}
}