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

Merge branch 'develop' into feature/credit_calc

Browse Source 
# Conflicts:
#	app/Repositories/Account/AccountRepository.php
This commit is contained in:
James Cole
2021-05-02 06:27:32 +02:00
parent a83578d1ae 8f6655f85e
commit d0622dbcd3
99 changed files with 1254 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,7 +354,7 @@ class ProfileController extends Controller
$user = auth()->user();
$isInternalAuth = $this->internalAuth;
$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;
$userId = $user->id;
$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;
// create new rule engine:
/** @var RuleEngineInterface $newRuleEngine */
$newRuleEngine = app(RuleEngineInterface::class);
// set rules:

1
app/Http/Controllers/System/InstallController.php
View File

@@ -64,6 +64,7 @@ class InstallController extends Controller
$this->upgradeCommands = [
// there are 3 initial commands
'migrate' => ['--seed' => true, '--force' => true],
'firefly-iii:fix-pgsql-sequences' => [],
'firefly-iii:decrypt-all' => [],
'firefly-iii:restore-oauth-keys' => [],
'generate-keys' => [], // an exception :(

4
app/Http/Controllers/Transaction/IndexController.php
View File

@@ -77,6 +77,10 @@ class IndexController extends Controller
*/
public function index(Request $request, string $objectType, Carbon $start = null, Carbon $end = null)
{
if('transfers' === $objectType) {
$objectType = 'transfer';
}
$subTitleIcon = config('firefly.transactionIconsByType.' . $objectType);
$types = config('firefly.transactionTypesByType.' . $objectType);
$page = (int)$request->get('page');