Compare commits

..

834 Commits

Author SHA1 Message Date
James Cole
3a0b3f46a5 Merge branch 'release/6.0.0-alpha.2' 2023-02-04 08:24:24 +01:00
James Cole
806d108d1c Merge pull request #6972 from firefly-iii/alpha-2
Update meta files for new release.
2023-02-04 08:23:31 +01:00
James Cole
794d130ff9 Update meta files for new release. 2023-02-04 08:22:53 +01:00
James Cole
848e7d4c9f Merge pull request #6971 from firefly-iii/webhook-fix
Webhook fix
2023-02-04 08:12:52 +01:00
James Cole
6e96c75be7 Make sure errors display correctly. 2023-02-04 08:12:32 +01:00
James Cole
e20dc78620 Merge pull request #6970 from firefly-iii/fix-6964
Fix 6964
2023-02-04 07:46:52 +01:00
James Cole
35912fe9fb Also sneak in some CSS fixes. 2023-02-04 07:46:25 +01:00
James Cole
74777a648c Fix #6964 2023-02-04 07:44:43 +01:00
James Cole
0eb0f7f35f Merge pull request #6969 from firefly-iii/dark-mode-improv
Dark mode improv
2023-02-04 07:08:30 +01:00
James Cole
1226ef542f Add missing CSS. 2023-02-04 07:08:05 +01:00
James Cole
7d169518a5 Also refer to minified in templates. 2023-02-04 06:32:23 +01:00
James Cole
abfd837f68 Cleanup and minify 2023-02-04 06:31:28 +01:00
James Cole
8ab1e97fb0 Improve skins 2023-02-04 06:00:44 +01:00
James Cole
9fbb290d0f Better UI for webhook 2023-02-03 21:16:53 +01:00
James Cole
28deb32f5e Various improve before build. 2023-02-03 21:16:32 +01:00
James Cole
2c1023ad40 Merge pull request #6957 from firefly-iii/fix-missing-call
Fix missing message call.
2023-02-01 18:07:00 +01:00
James Cole
766418a894 Fix missing message call. 2023-02-01 18:05:52 +01:00
James Cole
970193473d Merge pull request #6955 from firefly-iii/fix-6947-3
Always (try to) create group
2023-02-01 06:17:41 +01:00
James Cole
a782abd6db Always (try to) create group 2023-02-01 06:17:23 +01:00
James Cole
b98050e238 Merge pull request #6954 from firefly-iii/fix-6947-2
Fix 6947 2
2023-02-01 06:06:35 +01:00
James Cole
1c02b04a0d Fix #6947 again 2023-02-01 06:06:07 +01:00
James Cole
c5f94372a0 Merge pull request #6953 from firefly-iii/fix-6947
Fix https://github.com/firefly-iii/firefly-iii/issues/6947
2023-01-31 19:45:42 +01:00
James Cole
928613e908 Fix https://github.com/firefly-iii/firefly-iii/issues/6947 2023-01-31 19:45:11 +01:00
James Cole
fd3da949da Merge pull request #6945 from firefly-iii/various-fixes-2
Fix CSS and update packages.
2023-01-29 18:54:01 +01:00
James Cole
15210f75e7 Fix CSS and update packages. 2023-01-29 18:53:26 +01:00
James Cole
dec5e3440d Merge pull request #6944 from firefly-iii/various-fixes
Various fixes and cleanup
2023-01-29 15:30:15 +01:00
James Cole
413a4f3d9c Various fixes and cleanup 2023-01-29 15:29:42 +01:00
James Cole
1cbb644d65 Merge pull request #6943 from firefly-iii/dark-mode
Dark mode
2023-01-29 15:05:29 +01:00
James Cole
e008c1f742 Update templates 2023-01-29 14:52:22 +01:00
James Cole
9bffa86706 Various CSS improvements 2023-01-29 14:49:53 +01:00
James Cole
a5a95055c5 Various CSS fixes. 2023-01-29 10:01:00 +01:00
James Cole
5a5c92b5b5 First dark mode CSS 2023-01-29 08:38:53 +01:00
James Cole
41941b37f9 Merge pull request #6941 from firefly-iii/use-validation
Switch to validation style error in API
2023-01-29 07:10:35 +01:00
James Cole
881fe3e6e7 Switch to validation style error in API 2023-01-29 07:10:11 +01:00
James Cole
a7570d9ab5 Merge pull request #6940 from firefly-iii/fix-rule-validation
Fix issue with rule repository validation
2023-01-29 07:02:20 +01:00
James Cole
605afdb271 Merge pull request #6939 from firefly-iii/add-group-check
Basic check for user's administration ID
2023-01-29 07:01:32 +01:00
James Cole
b6e54fe3cf Merge pull request #6938 from firefly-iii/remove-env
Remove env
2023-01-29 07:01:02 +01:00
James Cole
fbe5a5dd39 Remove env vars from config 2023-01-29 07:00:42 +01:00
James Cole
e284da368d Basic check for user's administration ID 2023-01-29 07:00:26 +01:00
James Cole
a5328a9ff4 Remove unused environment variables. 2023-01-29 06:57:49 +01:00
James Cole
a925e1aa02 Fix issue with rule repository validation 2023-01-28 06:59:26 +01:00
James Cole
81c37b3349 Merge pull request #6922 from firefly-iii/dependabot/composer/develop/laravel/sanctum-3.2.1
Bump laravel/sanctum from 3.2.0 to 3.2.1
2023-01-23 06:52:18 +01:00
dependabot[bot]
c84c64a1c2 Bump laravel/sanctum from 3.2.0 to 3.2.1
Bumps [laravel/sanctum](https://github.com/laravel/sanctum) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/laravel/sanctum/releases)
- [Changelog](https://github.com/laravel/sanctum/blob/3.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/sanctum/compare/v3.2.0...v3.2.1)

---
updated-dependencies:
- dependency-name: laravel/sanctum
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-23 05:51:09 +00:00
James Cole
ced9ea4777 Merge pull request #6921 from firefly-iii/dependabot/composer/develop/laravel/passport-11.5.1
Bump laravel/passport from 11.5.0 to 11.5.1
2023-01-23 06:50:50 +01:00
James Cole
36c0e8df2d Merge pull request #6920 from firefly-iii/dependabot/composer/develop/predis/predis-2.1.1
Bump predis/predis from 2.0.3 to 2.1.1
2023-01-23 06:50:33 +01:00
James Cole
61a0a7795e Merge pull request #6919 from firefly-iii/dependabot/composer/develop/laravel/framework-9.48.0
Bump laravel/framework from 9.47.0 to 9.48.0
2023-01-23 06:50:20 +01:00
James Cole
e2b4448985 Merge pull request #6918 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-1.9.14
Bump phpstan/phpstan from 1.9.11 to 1.9.14
2023-01-23 06:49:42 +01:00
dependabot[bot]
f5d1a597cf Bump laravel/passport from 11.5.0 to 11.5.1
Bumps [laravel/passport](https://github.com/laravel/passport) from 11.5.0 to 11.5.1.
- [Release notes](https://github.com/laravel/passport/releases)
- [Changelog](https://github.com/laravel/passport/blob/11.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/passport/compare/v11.5.0...v11.5.1)

---
updated-dependencies:
- dependency-name: laravel/passport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-23 03:08:13 +00:00
dependabot[bot]
80607bc6ae Bump predis/predis from 2.0.3 to 2.1.1
Bumps [predis/predis](https://github.com/predis/predis) from 2.0.3 to 2.1.1.
- [Release notes](https://github.com/predis/predis/releases)
- [Changelog](https://github.com/predis/predis/blob/main/CHANGELOG.md)
- [Commits](https://github.com/predis/predis/compare/v2.0.3...v2.1.1)

---
updated-dependencies:
- dependency-name: predis/predis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-23 03:07:48 +00:00
dependabot[bot]
8c5c6c2bde Bump laravel/framework from 9.47.0 to 9.48.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.47.0 to 9.48.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.47.0...v9.48.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-23 03:07:36 +00:00
dependabot[bot]
f476a909df Bump phpstan/phpstan from 1.9.11 to 1.9.14
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.9.11 to 1.9.14.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.10.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.9.11...1.9.14)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-23 03:06:55 +00:00
James Cole
9bf86be305 Merge pull request #6912 from firefly-iii/v3-boxes
Better boxes in v3
2023-01-21 20:11:56 +01:00
James Cole
3d96f5df58 Better boxes in v3 2023-01-21 20:08:45 +01:00
James Cole
fc0adfd375 Merge pull request #6911 from firefly-iii/v3-top-boxes
Clean up top boxes
2023-01-21 17:19:03 +01:00
James Cole
1d62d5d44a Merge pull request #6910 from firefly-iii/fix-api-errors
Catch and verify various errors
2023-01-21 17:15:05 +01:00
James Cole
6c2486faa7 Clean up top boxes 2023-01-21 17:14:24 +01:00
James Cole
f9daf7751a Catch and verify various errors 2023-01-21 12:21:06 +01:00
James Cole
c269913510 Merge pull request #6908 from firefly-iii/expand-mergify
no message
2023-01-21 07:08:05 +01:00
James Cole
cc436605d0 no message 2023-01-21 07:07:03 +01:00
James Cole
c697d2aa13 Merge pull request #6906 from firefly-iii/fix-clean-string
Add some extra catches and remove debug info
2023-01-21 06:52:27 +01:00
James Cole
90219bec35 Add some extra catches and remove debug info 2023-01-21 06:52:04 +01:00
James Cole
afca023767 Merge pull request #6905 from firefly-iii/fix-validation
Catch various validation errors
2023-01-20 22:09:19 +01:00
James Cole
1502c5de94 Merge pull request #6904 from firefly-iii/update-languages
Update languages.
2023-01-20 22:08:57 +01:00
James Cole
cd408e581b Catch various validation errors 2023-01-20 22:08:18 +01:00
James Cole
122c8acae0 Update languages. 2023-01-20 22:07:43 +01:00
James Cole
13cffaa1e3 Merge pull request #6903 from firefly-iii/JC5-patch-3
Update TransactionCurrencySeeder.php
2023-01-20 15:11:15 +01:00
James Cole
feab244edd Update TransactionCurrencySeeder.php
Remove crypto currencies from default set.
2023-01-20 15:10:58 +01:00
James Cole
259ad852c9 Merge pull request #6902 from firefly-iii/JC5-patch-2
Update web.php
2023-01-20 12:40:48 +01:00
James Cole
6802f53c96 Update web.php
Make sure dates work.
2023-01-20 12:40:28 +01:00
James Cole
d922390802 Merge pull request #6901 from firefly-iii/JC5-patch-1
Update web.php
2023-01-20 12:34:16 +01:00
James Cole
2a9f51a40f Update web.php
Fix report routes.
2023-01-20 12:33:45 +01:00
James Cole
614d54c9bd Merge pull request #6898 from firefly-iii/pr-6831
Add debug info and a warning for login issues related to #6831
2023-01-19 06:46:44 +01:00
James Cole
3ea8792c6e Add debug info and a warning for login issues related to #6831 2023-01-19 06:45:45 +01:00
James Cole
3d802b9c9e Merge pull request #6891 from firefly-iii/cleanup-routes
Cleanup routes and code.
2023-01-17 20:10:21 +01:00
James Cole
480d787242 Cleanup routes and code. 2023-01-17 20:09:57 +01:00
James Cole
820c6feadd Merge pull request #6889 from firefly-iii/JC5-patch-1
Update web.php
2023-01-17 17:18:54 +01:00
James Cole
8c1eeedf17 Update web.php 2023-01-17 17:18:36 +01:00
James Cole
9b5931f1d6 Merge pull request #6885 from firefly-iii/JC5-patch-1
Update web.php
2023-01-17 12:40:49 +01:00
James Cole
d5cade320b Update web.php 2023-01-17 12:40:40 +01:00
James Cole
ef46ab6de2 Merge pull request #6881 from firefly-iii/JC5-patch-1
Update CreatesObjectGroups.php
2023-01-17 10:16:00 +01:00
James Cole
d0d3921ff6 Update CreatesObjectGroups.php
Fix thing
2023-01-17 10:15:50 +01:00
James Cole
2cb2e2e635 Merge pull request #6880 from firefly-iii/JC5-patch-1
Update CreatesObjectGroups.php
2023-01-17 09:58:35 +01:00
James Cole
1a0047205d Update CreatesObjectGroups.php
An extra trim for extra long group names.
2023-01-17 09:58:17 +01:00
James Cole
468655cd94 Merge pull request #6878 from firefly-iii/fix-routes-again
Fix dateformat.
2023-01-17 05:57:33 +01:00
James Cole
09cb4b10b9 Fix dateformat. 2023-01-17 05:57:06 +01:00
James Cole
6eaf83d6d2 Merge pull request #6877 from firefly-iii/fix-routes
Add regular expressions to routes.
2023-01-17 05:54:49 +01:00
James Cole
7c8a2e3591 Add regular expressions to routes. 2023-01-17 05:54:30 +01:00
James Cole
ba5c3ef0a1 Merge pull request #6876 from firefly-iii/validate-date-field
Validate date field.
2023-01-17 05:41:18 +01:00
James Cole
c0f744b03a Validate date field. 2023-01-17 05:40:56 +01:00
James Cole
8cd13ba13b Merge pull request #6873 from firefly-iii/main
Merge back into develop
2023-01-16 06:56:44 +01:00
James Cole
10db3d63ac Merge pull request #6872 from firefly-iii/fix-6870
Fix 6870
2023-01-16 06:55:20 +01:00
James Cole
a753fde2f1 Fix #6870 2023-01-16 06:54:57 +01:00
James Cole
d4f1b9a1bc Merge pull request #6871 from firefly-iii/fix-6869
Fix https://github.com/firefly-iii/firefly-iii/issues/6869
2023-01-16 06:40:05 +01:00
James Cole
3cfaa5aa03 Fix https://github.com/firefly-iii/firefly-iii/issues/6869 2023-01-16 06:39:16 +01:00
James Cole
bc47017e31 Merge pull request #6864 from firefly-iii/update-build-2
Update build 2
2023-01-15 17:31:35 +01:00
James Cole
125d9e7e9d Rebuild frontend 2023-01-15 17:31:14 +01:00
James Cole
4cea7a3287 Add logging 2023-01-15 17:29:45 +01:00
James Cole
e7a1ad23f4 Merge pull request #6863 from firefly-iii/fix-improper-escaoe
Fix improper escape.
2023-01-15 17:24:37 +01:00
James Cole
afd3fd9f88 Fix improper escape. 2023-01-15 17:05:21 +01:00
James Cole
f2251d7bfa Merge pull request #6862 from firefly-iii/main
Merge back into develop
2023-01-15 16:11:18 +01:00
James Cole
700ccaa853 Merge pull request #6861 from firefly-iii/release/6.0.0-alpha.1
Release/6.0.0 alpha.1
2023-01-15 16:10:06 +01:00
James Cole
0fcdcf0f01 Final updates 2023-01-15 16:09:02 +01:00
James Cole
fa347a5ee4 Merge pull request #6860 from firefly-iii/six-alpha1
Update files for 6.0.0-alpha.1
2023-01-15 15:55:31 +01:00
James Cole
d412c2407a Merge pull request #6859 from firefly-iii/debug-6831
Add debug for https://github.com/firefly-iii/firefly-iii/issues/6831
2023-01-15 15:54:59 +01:00
James Cole
dea86242fd Add debug for https://github.com/firefly-iii/firefly-iii/issues/6831 2023-01-15 15:54:41 +01:00
James Cole
973c175213 Update files for 6.0.0-alpha.1 2023-01-15 15:47:25 +01:00
James Cole
e135d01655 Merge pull request #6857 from firefly-iii/fix-liabilities
Fix liabilities
2023-01-15 15:15:35 +01:00
James Cole
9b37d5ab8d Clean up logging. 2023-01-15 13:49:28 +01:00
James Cole
84c3868c9b Add destructive upgrade routine. 2023-01-15 09:22:34 +01:00
James Cole
3c0b23aaed Add another case for deposits. 2023-01-15 07:52:05 +01:00
James Cole
7e6ce7c3e8 Also in create form. 2023-01-15 07:21:51 +01:00
James Cole
7111aec101 Make sure edit of liability always works. 2023-01-15 07:20:58 +01:00
James Cole
1f9e0b48c9 Fix withdrawals away from liabilities, cleanup debug logs 2023-01-15 06:58:09 +01:00
James Cole
63a7aad44c Merge pull request #6855 from eps90/fix-bulk-validator-for-expenses
Do not validate currency if account has no currency configured
2023-01-14 17:44:55 +01:00
Kuba Turek
9191ae5054 Do not validate currency if account has no currency configured 2023-01-14 17:08:24 +01:00
James Cole
618e70748c Merge pull request #6853 from firefly-iii/add-catalan
Enable and include Catalan.
2023-01-14 15:49:55 +01:00
James Cole
68e4f26656 Enable and include Catalan. 2023-01-14 15:49:13 +01:00
James Cole
5124a5eba9 Merge pull request #6851 from firefly-iii/translation-warnings
Translation warnings
2023-01-14 15:48:31 +01:00
James Cole
708cd014c5 Add warning to files. 2023-01-14 15:47:51 +01:00
James Cole
9654f631c5 Give all files the standard warning (to be replaced). 2023-01-14 15:43:25 +01:00
James Cole
65027d7832 Add placeholder to en_US files. 2023-01-14 15:32:51 +01:00
James Cole
db0500dcf0 Merge pull request #6850 from firefly-iii/fix-auth-issue
Expand authentication validation in API.
2023-01-14 07:55:11 +01:00
James Cole
89d4a34acf Merge pull request #6848 from firefly-iii/fix-deposit-issue
Add feature: Firefly III can create account of the right type if you …
2023-01-14 07:54:21 +01:00
James Cole
23bbebb80e Expand authentication validation in API. 2023-01-14 07:53:00 +01:00
James Cole
4ccdd8f322 Add feature: Firefly III can create account of the right type if you submit ID of the wrong type. 2023-01-14 07:39:51 +01:00
James Cole
3033b0fa7f Fix https://github.com/firefly-iii/firefly-iii/issues/6834 2023-01-11 18:02:24 +01:00
James Cole
abc7bfb54c Fix transformer 2023-01-11 17:41:03 +01:00
James Cole
1fede6b802 Add debug 2023-01-11 17:39:48 +01:00
James Cole
6e3381844e Catch things that should be NULL 2023-01-11 17:38:17 +01:00
James Cole
3f2560c8e5 Check debug 2023-01-11 17:34:05 +01:00
James Cole
abdbb86d05 Remove debug logs 2023-01-11 17:30:39 +01:00
James Cole
9008d19494 Add include 2023-01-11 17:30:20 +01:00
James Cole
929513c220 Remove thing 2023-01-11 17:29:54 +01:00
James Cole
566a303650 Add some debug. 2023-01-11 17:29:19 +01:00
James Cole
e783b8dba4 Remove debug 2023-01-11 17:28:09 +01:00
James Cole
bb6cbe884e Remove various logging. 2023-01-11 17:14:35 +01:00
James Cole
3be4c07848 Add JSON 2023-01-11 08:13:52 +01:00
James Cole
732a87f051 Fix capitalisation. 2023-01-11 06:58:59 +01:00
James Cole
124d3aaf96 Fix bad cache call. 2023-01-11 06:18:42 +01:00
James Cole
65df355440 Fix login box in dark mode. 2023-01-11 06:17:03 +01:00
James Cole
29e07c6604 Fix enum 2023-01-11 06:10:57 +01:00
James Cole
c0af63e59e update packages 2023-01-11 06:06:18 +01:00
James Cole
772f0f5ba4 Merge pull request #6830 from firefly-iii/test-pr-6829 2023-01-10 20:45:33 +01:00
James Cole
6db3e3d75e Fix https://github.com/firefly-iii/firefly-iii/issues/6829 2023-01-10 19:56:38 +01:00
James Cole
9290c2247e Merge pull request #6826 from jstebenne/js/hide-2fa-qr-in-print
Hide sensitive information in 2FA setup page when printing
2023-01-10 05:53:06 +01:00
Julien Stébenne
5967762cd8 Hide sensitive information in 2FA setup page when printing
The QR code (and manual code) should not be recoverable after the initial setup. This would allow an unauthorized person to access an account without leaving a trace (like showing that a backup code was used, given that person has the account password).

Even if very low, having that information visible could be a problem.
2023-01-09 21:47:39 -05:00
James Cole
5845ba0daf Merge pull request #6818 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-1.9.8
Bump phpstan/phpstan from 1.9.7 to 1.9.8
2023-01-09 07:28:33 +01:00
dependabot[bot]
961d067aec Bump phpstan/phpstan from 1.9.7 to 1.9.8
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.9.7 to 1.9.8.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.9.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.9.7...1.9.8)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-09 05:31:02 +00:00
James Cole
81ce2c1b3e Merge pull request #6819 from firefly-iii/dependabot/composer/develop/gdbots/query-parser-3.0.0
Bump gdbots/query-parser from 2.0.2 to 3.0.0
2023-01-09 06:30:19 +01:00
dependabot[bot]
d6bf304390 Bump gdbots/query-parser from 2.0.2 to 3.0.0
Bumps [gdbots/query-parser](https://github.com/gdbots/query-parser-php) from 2.0.2 to 3.0.0.
- [Release notes](https://github.com/gdbots/query-parser-php/releases)
- [Changelog](https://github.com/gdbots/query-parser-php/blob/master/CHANGELOG-2.x.md)
- [Commits](https://github.com/gdbots/query-parser-php/compare/v2.0.2...v3.0.0)

---
updated-dependencies:
- dependency-name: gdbots/query-parser
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-09 03:00:28 +00:00
James Cole
fe9620a438 Switch opening balance. 2023-01-08 19:47:39 +01:00
James Cole
d90321aa1e Catch bad upgrade command. 2023-01-08 19:24:28 +01:00
James Cole
c26667ebc7 Add some extra text. 2023-01-08 19:17:54 +01:00
James Cole
862140a9fc Expand net worth calculation. TODO in three places. 2023-01-08 18:51:24 +01:00
James Cole
8447670ed5 Add new upgrade command. 2023-01-08 18:41:56 +01:00
James Cole
7a2c52531a Fix bad spelling 2023-01-08 16:34:34 +01:00
James Cole
cb4e5a80b2 Fix piggy action. 2023-01-08 08:36:35 +01:00
James Cole
c976149bf1 Fix issue with liability upgrades. 2023-01-08 07:43:16 +01:00
James Cole
4917f40abf Merge tag '5.8.0-alpha.1' into develop
5.8.0-alpha.1
2023-01-07 08:51:45 +01:00
James Cole
4c27bbf069 Merge branch 'release/5.8.0-alpha.1' 2023-01-07 08:51:43 +01:00
James Cole
a90214273b Small textual changes to changelog. 2023-01-07 08:50:25 +01:00
James Cole
5167f53fd5 Update meta files for new alpha release. 2023-01-07 08:41:16 +01:00
James Cole
40083230fd Update meta files for new alpha release. 2023-01-07 08:12:53 +01:00
James Cole
ca57942b38 Force PHP 8.2 2023-01-07 07:53:25 +01:00
James Cole
ef58d5b1b2 Update meta data for first alpha release. 2023-01-07 07:52:55 +01:00
James Cole
cc218e203f Some small fixes in UI 2023-01-07 05:53:48 +01:00
James Cole
9fdaf1cee8 Fix https://github.com/firefly-iii/firefly-iii/issues/6810 2023-01-06 21:12:10 +01:00
James Cole
770d092e93 Rebuild frontend 2023-01-06 06:13:55 +01:00
James Cole
6d4e45b89f Make sure rules are consistent and catch more errors. 2023-01-06 06:12:39 +01:00
James Cole
1fee2092d6 Clear up webhooks 2023-01-05 19:05:23 +01:00
James Cole
7bd824e8cb Update packages and meta data. 2023-01-04 20:40:57 +01:00
James Cole
fa588db1a9 Enable webhooks. 2023-01-04 20:11:56 +01:00
James Cole
c3e0ce0c08 Merge branch 'develop' into 5.8-dev 2023-01-03 08:45:04 +01:00
James Cole
6a629a7da3 Add a little sort and active filter. 2023-01-03 08:44:54 +01:00
James Cole
07e4e93632 Various code cleanup 2023-01-03 06:48:53 +01:00
James Cole
6784fe4436 Fix incompatible function declaration. 2023-01-02 16:24:35 +01:00
James Cole
af8c127106 Fix incompatible function declaration. 2023-01-02 16:21:18 +01:00
James Cole
ebd32e0e08 Update code style. 2023-01-02 16:18:17 +01:00
James Cole
b56acf36c5 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	app/Events/ChangedPiggyBankAmount.php
#	app/Handlers/Events/PiggyBankEventHandler.php
#	changelog.md
#	composer.lock
#	config/firefly.php
2023-01-02 16:17:52 +01:00
James Cole
4daaa44ba8 Merge branch 'release/5.7.18' 2023-01-02 16:10:17 +01:00
James Cole
93ae82691b Merge tag '5.7.18' into develop
5.7.18
2023-01-02 16:10:17 +01:00
James Cole
c3e739cd6f Update packages. 2023-01-02 16:08:46 +01:00
James Cole
851da6a0a1 Update meta files for new release. 2023-01-02 07:03:36 +01:00
James Cole
a99f68fd17 Merge pull request #6789 from firefly-iii/dependabot/composer/develop/ramsey/uuid-4.7.1
Bump ramsey/uuid from 4.7.0 to 4.7.1
2023-01-02 06:54:11 +01:00
James Cole
1266eff7f6 Add strict_types 2023-01-02 06:52:18 +01:00
James Cole
e5d5e774dc Merge branch 'develop' into 5.8-dev
# Conflicts:
#	app/Models/AvailableBudget.php
2023-01-02 06:46:05 +01:00
James Cole
0429f50e5c Add attributes 2023-01-02 06:44:52 +01:00
dependabot[bot]
e9e0225731 Bump ramsey/uuid from 4.7.0 to 4.7.1
Bumps [ramsey/uuid](https://github.com/ramsey/uuid) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/ramsey/uuid/releases)
- [Changelog](https://github.com/ramsey/uuid/blob/4.x/CHANGELOG.md)
- [Commits](https://github.com/ramsey/uuid/compare/4.7.0...4.7.1)

---
updated-dependencies:
- dependency-name: ramsey/uuid
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-02 03:00:25 +00:00
James Cole
e4db5f5a21 Merge branch 'develop' into 5.8-dev 2023-01-01 15:30:38 +01:00
James Cole
3c1f44f554 Fix https://github.com/firefly-iii/firefly-iii/issues/6788 2023-01-01 15:27:14 +01:00
James Cole
67434bb8a5 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	app/Http/Middleware/Authenticate.php
#	app/Models/Account.php
#	app/Support/Authentication/RemoteUserGuard.php
2023-01-01 15:14:15 +01:00
James Cole
b0b65c3f04 Fix https://github.com/firefly-iii/firefly-iii/issues/6788 2023-01-01 14:52:46 +01:00
James Cole
fe724fa1b8 Fix https://github.com/firefly-iii/firefly-iii/issues/6788 2023-01-01 14:50:32 +01:00
James Cole
c3ce9e896e Fix https://github.com/firefly-iii/firefly-iii/issues/6788 2023-01-01 14:25:52 +01:00
James Cole
c60120ac20 Fix https://github.com/firefly-iii/firefly-iii/issues/6787 2023-01-01 13:55:14 +01:00
James Cole
8bbe519350 Undo code. 2023-01-01 11:25:10 +01:00
James Cole
c426ff352c Fix https://github.com/firefly-iii/firefly-iii/issues/6785 2023-01-01 11:23:49 +01:00
James Cole
15605dd163 Fix https://github.com/firefly-iii/firefly-iii/issues/6785 2022-12-31 15:56:36 +01:00
James Cole
4d0ff86bfa Various code cleanup 2022-12-31 15:54:55 +01:00
James Cole
7722ca2bf0 Various code fixes 2022-12-31 13:32:42 +01:00
James Cole
5878b2c427 Merge branch 'develop' into 5.8-dev 2022-12-31 08:59:20 +01:00
James Cole
f2499e0a77 Merge branch 'develop' into 5.8-dev 2022-12-31 08:58:54 +01:00
James Cole
81f781a823 Merge branch 'develop' into 5.8-dev 2022-12-31 07:35:34 +01:00
James Cole
b5734beb32 Fix https://github.com/orgs/firefly-iii/discussions/6775 2022-12-31 07:34:46 +01:00
James Cole
24696bf800 Clean up some code 2022-12-31 07:33:44 +01:00
James Cole
27a576ae8a Various bug fixes and code cleanup. 2022-12-31 06:57:05 +01:00
James Cole
2b9996b844 Remove some unreachable code. 2022-12-30 20:48:48 +01:00
James Cole
742c84269b Code cleanup should trigger scan. 2022-12-30 20:38:54 +01:00
James Cole
333c348117 Merge branch 'main' into 5.8-dev 2022-12-30 20:31:26 +01:00
James Cole
ed4d2ee6ad Update build.yml 2022-12-30 20:30:52 +01:00
James Cole
445804a7f1 Fix phpstan messages. 2022-12-30 20:25:04 +01:00
James Cole
ee0116f112 Various code cleanup. 2022-12-30 09:28:03 +01:00
James Cole
03e176bd16 Some warnings. 2022-12-30 06:27:55 +01:00
James Cole
a84050a084 Forgot a thing 2022-12-30 06:25:28 +01:00
James Cole
bef7887a8d Changelog for 5.8.0 2022-12-30 06:24:43 +01:00
James Cole
5b8e01fbfb Various PSR12 code cleanup 2022-12-29 19:43:43 +01:00
James Cole
56b9b66352 Various PSR12 code cleanup 2022-12-29 19:42:40 +01:00
James Cole
6cfdc58cb1 Various PSR12 code cleanup 2022-12-29 19:42:26 +01:00
James Cole
dbf3e76ecc Various PSR12 code cleanup 2022-12-29 19:41:57 +01:00
James Cole
0022009dd5 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	config/firefly.php
#	resources/lang/de_DE/firefly.php
#	resources/lang/de_DE/validation.php
#	resources/lang/pl_PL/firefly.php
2022-12-29 19:16:24 +01:00
James Cole
6249488f0f Merge tag '5.7.17' into develop
5.7.17
2022-12-29 19:13:54 +01:00
James Cole
29bd3a2804 Merge branch 'release/5.7.17' 2022-12-29 19:13:53 +01:00
James Cole
ba35c5da0b Update meta data 2022-12-29 19:13:15 +01:00
James Cole
9b242f1a75 Update translations. 2022-12-29 19:06:31 +01:00
James Cole
1acc2ab18b Update meta files 2022-12-29 16:02:28 +01:00
James Cole
e031fffe65 Update translations 2022-12-29 15:49:24 +01:00
James Cole
2a61633ab9 Clean up code and update packages 2022-12-29 15:44:13 +01:00
James Cole
5e3f9f9bce Expand search with external ID searches. 2022-12-29 15:42:26 +01:00
James Cole
8c320fd199 Implement custom trigger for recurring transactions 2022-12-29 15:42:02 +01:00
James Cole
85a2a87806 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	composer.lock
2022-12-29 11:36:07 +01:00
James Cole
3666ef8c59 Fix piggy views. 2022-12-29 11:29:00 +01:00
James Cole
e4db21f0c0 Update packages, fix rule 2022-12-29 07:26:14 +01:00
James Cole
d137b2938d Remove unused function. 2022-12-29 07:16:31 +01:00
James Cole
d3a619cb15 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	app/Http/Requests/RuleFormRequest.php
2022-12-28 06:51:59 +01:00
James Cole
d40fd485ca Update packages 2022-12-28 06:49:50 +01:00
James Cole
32e89155a0 Temp fix for https://github.com/firefly-iii/firefly-iii/issues/6753 2022-12-28 06:49:40 +01:00
James Cole
cae0b1798a Merge branch 'develop' into 5.8-dev 2022-12-27 21:13:42 +01:00
James Cole
5e654786be Remove floats. 2022-12-27 21:13:18 +01:00
James Cole
75ce777090 Fix https://github.com/firefly-iii/firefly-iii/issues/6743 2022-12-27 20:00:18 +01:00
James Cole
f350948fb2 Fix https://github.com/firefly-iii/firefly-iii/issues/6743 2022-12-27 17:17:00 +01:00
James Cole
1f4ca9c8fe Fix https://github.com/firefly-iii/firefly-iii/issues/6743 2022-12-27 17:16:28 +01:00
James Cole
dd0c36d464 Merge branch 'develop' into 5.8-dev 2022-12-27 13:02:30 +01:00
James Cole
e468d5b892 Add some debug for https://github.com/firefly-iii/firefly-iii/issues/6743 2022-12-27 13:02:17 +01:00
James Cole
e58cf0d3c9 Add some debug for https://github.com/firefly-iii/firefly-iii/issues/6743 2022-12-27 13:01:49 +01:00
James Cole
e389fd7d7c Remove liabilities from net worth 2022-12-27 08:49:00 +01:00
James Cole
83b5ca69dd Upgrade and build the frontend. 2022-12-27 08:41:18 +01:00
James Cole
5e17cb5823 Final touches. 2022-12-27 07:05:56 +01:00
James Cole
bb11e61034 Clean up liability overview. 2022-12-27 07:01:13 +01:00
James Cole
eff631276e Merge branch 'develop' into 5.8-dev 2022-12-26 06:24:50 +01:00
James Cole
89ab62fff2 Fix #6743 2022-12-26 06:23:06 +01:00
James Cole
bdf7d3978f Fix #6742 2022-12-26 06:17:22 +01:00
James Cole
3fbaed2fdc Merge branch 'develop' into 5.8-dev 2022-12-25 09:23:02 +01:00
James Cole
a4f3be5397 Merge tag '5.7.16' into develop
5.7.16
2022-12-25 07:48:17 +01:00
James Cole
265d973811 Merge branch 'release/5.7.16' 2022-12-25 07:48:15 +01:00
James Cole
e22ed9a69b Update changelog. 2022-12-25 07:47:35 +01:00
James Cole
80762616f3 Merge branch 'develop' into 5.8-dev
# 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
2022-12-24 17:34:20 +01:00
James Cole
fcecd5c85e Accept null values. 2022-12-24 17:31:21 +01:00
James Cole
2780cf4b20 Rebuild frontend 2022-12-24 10:20:32 +01:00
James Cole
7e63700ca2 Update JSON and JS 2022-12-24 10:18:50 +01:00
James Cole
2d9a3f5fc6 Updated translations 2022-12-24 09:53:54 +01:00
James Cole
f5bbd445d2 Update meta files for new release. 2022-12-24 08:58:55 +01:00
James Cole
12008fb0e9 Fix API endpoint 2022-12-24 08:44:33 +01:00
James Cole
5f6c84ab4c Reset after deletion 2022-12-24 08:44:22 +01:00
James Cole
8b9936044b Update packages 2022-12-24 06:21:35 +01:00
James Cole
db478711ed Merge branch 'develop' into 5.8-dev
# Conflicts:
#	app/Api/V1/Controllers/Chart/AccountController.php
#	app/Api/V1/Controllers/Insight/Expense/AccountController.php
#	app/Api/V1/Controllers/Insight/Expense/BillController.php
#	app/Api/V1/Controllers/Insight/Expense/BudgetController.php
#	app/Api/V1/Controllers/Insight/Expense/CategoryController.php
#	app/Api/V1/Controllers/Insight/Expense/PeriodController.php
#	app/Console/Commands/Upgrade/MigrateToGroups.php
#	app/Http/Controllers/Account/IndexController.php
#	app/Http/Controllers/Budget/AvailableBudgetController.php
#	app/Http/Controllers/Budget/BudgetLimitController.php
#	app/Http/Controllers/Budget/EditController.php
#	app/Http/Controllers/Chart/AccountController.php
#	app/Http/Controllers/Json/FrontpageController.php
#	app/Http/Controllers/PiggyBank/EditController.php
2022-12-24 06:15:26 +01:00
James Cole
63184ac298 Add strict type 2022-12-24 05:52:34 +01:00
James Cole
5f6772260d Remove null exceptions 2022-12-24 05:48:04 +01:00
James Cole
22a237d316 Add passport settings 2022-12-24 05:47:50 +01:00
James Cole
c47980a737 Remove many references to (float) 2022-12-24 05:06:39 +01:00
James Cole
e43372b2ce Fix error 2022-12-21 19:12:47 +01:00
James Cole
395b6ecb76 Make sure cache is cleared after transaction deletion. 2022-12-21 19:11:52 +01:00
James Cole
328a1e256e Merge pull request #6725 from firefly-iii/dependabot/composer/develop/fakerphp/faker-1.21.0 2022-12-19 13:29:01 +01:00
James Cole
4a31f9ce7e Merge pull request #6726 from firefly-iii/dependabot/composer/develop/laravel/framework-9.44.0 2022-12-19 13:28:49 +01:00
James Cole
345f4903a9 Merge pull request #6727 from firefly-iii/dependabot/npm_and_yarn/develop/jquery-3.6.2 2022-12-19 13:28:29 +01:00
dependabot[bot]
3fe5e5ea8c Bump jquery from 3.6.1 to 3.6.2
Bumps [jquery](https://github.com/jquery/jquery) from 3.6.1 to 3.6.2.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.6.1...3.6.2)

---
updated-dependencies:
- dependency-name: jquery
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-19 03:00:53 +00:00
dependabot[bot]
b0da22ddf2 Bump laravel/framework from 9.43.0 to 9.44.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.43.0 to 9.44.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.43.0...v9.44.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-19 03:00:37 +00:00
dependabot[bot]
388ee14dfc Bump fakerphp/faker from 1.20.0 to 1.21.0
Bumps [fakerphp/faker](https://github.com/FakerPHP/Faker) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/FakerPHP/Faker/releases)
- [Changelog](https://github.com/FakerPHP/Faker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/FakerPHP/Faker/compare/v1.20.0...v1.21.0)

---
updated-dependencies:
- dependency-name: fakerphp/faker
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-19 03:00:27 +00:00
James Cole
2c53c72024 Merge pull request #6715 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.20 2022-12-12 05:49:48 +01:00
dependabot[bot]
de260adca4 Bump postcss from 8.4.19 to 8.4.20
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.19 to 8.4.20.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.19...8.4.20)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-12 03:00:40 +00:00
James Cole
33f764088e Script and code cleanup. 2022-12-11 10:43:52 +01:00
James Cole
23a8835758 Add some debug info 2022-12-11 10:32:25 +01:00
James Cole
034647a5ca Merge branch 'develop' into 5.8-dev
# Conflicts:
#	composer.lock
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
2022-12-11 10:29:01 +01:00
James Cole
d8813120a7 Update packages. 2022-12-11 10:24:19 +01:00
James Cole
989fd1adba Rebuild frontend 2022-12-11 10:22:51 +01:00
James Cole
a5f4793e81 Add strict type. 2022-12-11 10:21:35 +01:00
James Cole
9529721368 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	app/Factory/TransactionJournalFactory.php
#	app/Providers/EventServiceProvider.php
#	app/Repositories/PiggyBank/ModifiesPiggyBanks.php
#	app/Support/Search/OperatorQuerySearch.php
#	app/Support/Steam.php
#	app/TransactionRules/Actions/UpdatePiggybank.php
#	composer.json
#	composer.lock
#	config/search.php
#	frontend/yarn.lock
#	resources/lang/en_US/firefly.php
2022-12-11 07:37:33 +01:00
James Cole
86243131cd Merge branch 'main' into develop 2022-12-11 07:30:17 +01:00
James Cole
344cbe4fb7 Pass on the journal and update rules. 2022-12-11 07:29:06 +01:00
James Cole
44af5473a8 Unify piggy bank events. Does not save a link to the journal (yet) 2022-12-11 07:17:59 +01:00
James Cole
f33f9c797b Merge pull request #6685 from nebulade/patch-2
Also pick email address from apache filtered headers
2022-12-11 06:22:08 +01:00
James Cole
352eedb136 Fix https://github.com/firefly-iii/firefly-iii/pull/6701 2022-12-11 06:21:08 +01:00
James Cole
c8d6ef3782 Fix https://github.com/firefly-iii/firefly-iii/pull/6701 2022-12-11 06:20:45 +01:00
James Cole
922a5fa9c7 Fix https://github.com/firefly-iii/firefly-iii/pull/6701 2022-12-11 06:20:27 +01:00
James Cole
c125984d55 Remove cache. 2022-12-11 06:20:18 +01:00
James Cole
a60c3165f1 Update stale.yml 2022-12-07 20:26:14 +01:00
James Cole
363c849c50 Update stale.yml 2022-12-07 20:25:27 +01:00
James Cole
36c9782c8f Merge pull request #6698 from firefly-iii/dependabot/composer/develop/symfony/http-client-6.0.16
Bump symfony/http-client from 6.0.15 to 6.0.16
2022-12-05 13:01:38 +01:00
James Cole
49847a91e3 Merge pull request #6699 from firefly-iii/dependabot/composer/develop/laravel/framework-9.42.2
Bump laravel/framework from 9.41.0 to 9.42.2
2022-12-05 13:01:26 +01:00
dependabot[bot]
516653d007 Bump laravel/framework from 9.41.0 to 9.42.2
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.41.0 to 9.42.2.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.41.0...v9.42.2)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-05 03:00:37 +00:00
dependabot[bot]
2743359a4e Bump symfony/http-client from 6.0.15 to 6.0.16
Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.0.15 to 6.0.16.
- [Release notes](https://github.com/symfony/http-client/releases)
- [Changelog](https://github.com/symfony/http-client/blob/6.2/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-client/compare/v6.0.15...v6.0.16)

---
updated-dependencies:
- dependency-name: symfony/http-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-05 03:00:27 +00:00
James Cole
8055e9e927 Merge pull request #6677 from dasJ/feat/search-sepa-ct
Add search support for SEPA CT
2022-12-02 19:01:20 +01:00
Johannes Zellner
702f2c3146 Also pick email address from apache filtered headers 2022-11-30 17:05:39 +01:00
James Cole
ad36082fca Merge pull request #6678 from firefly-iii/dependabot/composer/develop/laravel/framework-9.41.0
Bump laravel/framework from 9.40.1 to 9.41.0
2022-11-28 10:13:53 +01:00
James Cole
81e650986d Merge pull request #6679 from firefly-iii/dependabot/npm_and_yarn/develop/axios-1.2.0
Bump axios from 1.1.3 to 1.2.0
2022-11-28 10:04:17 +01:00
dependabot[bot]
f3c89e8055 Bump axios from 1.1.3 to 1.2.0
Bumps [axios](https://github.com/axios/axios) from 1.1.3 to 1.2.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.1.3...v1.2.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-28 03:00:58 +00:00
dependabot[bot]
3a8c0074b7 Bump laravel/framework from 9.40.1 to 9.41.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.40.1 to 9.41.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.40.1...v9.41.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-28 03:00:31 +00:00
Janne Heß
dcfcbfd9b5 Add search support for SEPA CT 2022-11-27 19:46:45 +01:00
James Cole
04c71a2e9e Merge pull request #6664 from firefly-iii/dependabot/npm_and_yarn/develop/vue-loader-15.10.1
Bump vue-loader from 15.10.0 to 15.10.1
2022-11-21 06:45:35 +01:00
James Cole
2383d16e7a Merge pull request #6663 from firefly-iii/dependabot/npm_and_yarn/develop/vue-template-compiler-2.7.14
Bump vue-template-compiler from 2.7.13 to 2.7.14
2022-11-21 06:45:27 +01:00
James Cole
5bb7705702 Merge pull request #6662 from firefly-iii/dependabot/composer/develop/laravel/framework-9.40.1
Bump laravel/framework from 9.39.0 to 9.40.1
2022-11-21 06:45:18 +01:00
James Cole
2e3267ab9e Merge pull request #6661 from firefly-iii/dependabot/composer/develop/laravel/ui-4.1.0
Bump laravel/ui from 4.0.2 to 4.1.0
2022-11-21 06:45:06 +01:00
James Cole
d969cd72c0 Merge pull request #6654 from firefly-iii/dependabot/npm_and_yarn/loader-utils-1.4.2
Bump loader-utils from 1.4.1 to 1.4.2
2022-11-21 06:38:39 +01:00
James Cole
e4894c756a Merge pull request #6652 from firefly-iii/dependabot/npm_and_yarn/frontend/loader-utils-1.4.2
Bump loader-utils from 1.4.1 to 1.4.2 in /frontend
2022-11-21 06:38:26 +01:00
dependabot[bot]
f52044e794 Bump vue-loader from 15.10.0 to 15.10.1
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.10.0 to 15.10.1.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/next/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.10.0...v15.10.1)

---
updated-dependencies:
- dependency-name: vue-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-21 03:01:27 +00:00
dependabot[bot]
43960a5b60 Bump vue-template-compiler from 2.7.13 to 2.7.14
Bumps [vue-template-compiler](https://github.com/vuejs/vue) from 2.7.13 to 2.7.14.
- [Release notes](https://github.com/vuejs/vue/releases)
- [Changelog](https://github.com/vuejs/vue/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue/compare/v2.7.13...v2.7.14)

---
updated-dependencies:
- dependency-name: vue-template-compiler
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-21 03:01:12 +00:00
dependabot[bot]
81b0b048db Bump laravel/framework from 9.39.0 to 9.40.1
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.39.0 to 9.40.1.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.39.0...v9.40.1)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-21 03:01:10 +00:00
dependabot[bot]
3278d9850e Bump laravel/ui from 4.0.2 to 4.1.0
Bumps [laravel/ui](https://github.com/laravel/ui) from 4.0.2 to 4.1.0.
- [Release notes](https://github.com/laravel/ui/releases)
- [Changelog](https://github.com/laravel/ui/blob/4.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/ui/compare/v4.0.2...v4.1.0)

---
updated-dependencies:
- dependency-name: laravel/ui
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-21 03:01:02 +00:00
dependabot[bot]
b13bcec61a Bump loader-utils from 1.4.1 to 1.4.2
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.1...v1.4.2)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-17 23:56:20 +00:00
dependabot[bot]
21d18acabc Bump loader-utils from 1.4.1 to 1.4.2 in /frontend
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.1...v1.4.2)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-17 04:44:02 +00:00
James Cole
4060d14de0 Merge pull request #6644 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.19 2022-11-14 07:21:11 +01:00
James Cole
c67a71e238 Merge pull request #6643 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.45 2022-11-14 07:20:55 +01:00
James Cole
ed330e30d0 Merge pull request #6642 from firefly-iii/dependabot/npm_and_yarn/develop/vue-2.7.14 2022-11-14 07:20:43 +01:00
James Cole
7673d11673 Merge pull request #6641 from firefly-iii/dependabot/composer/develop/laravel/framework-9.39.0 2022-11-14 07:20:30 +01:00
dependabot[bot]
e1114f720d Bump postcss from 8.4.18 to 8.4.19
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.18 to 8.4.19.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.18...8.4.19)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-14 03:15:04 +00:00
dependabot[bot]
b49e7d6b21 Bump @vue/compiler-sfc from 3.2.41 to 3.2.45
Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc) from 3.2.41 to 3.2.45.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits/v3.2.45/packages/compiler-sfc)

---
updated-dependencies:
- dependency-name: "@vue/compiler-sfc"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-14 03:13:50 +00:00
dependabot[bot]
c9ba5f08c4 Bump vue from 2.7.13 to 2.7.14
Bumps [vue](https://github.com/vuejs/core) from 2.7.13 to 2.7.14.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits)

---
updated-dependencies:
- dependency-name: vue
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-14 03:12:30 +00:00
dependabot[bot]
5aa8793e33 Bump laravel/framework from 9.38.0 to 9.39.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.38.0 to 9.39.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.38.0...v9.39.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-14 03:00:27 +00:00
James Cole
dd98549bce Merge pull request #6627 from firefly-iii/dependabot/npm_and_yarn/loader-utils-1.4.1 2022-11-09 21:22:52 +01:00
dependabot[bot]
d6d53cc598 Bump loader-utils from 1.4.0 to 1.4.1
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-09 20:02:21 +00:00
James Cole
6516495e2b Merge pull request #6623 from firefly-iii/dependabot/npm_and_yarn/frontend/loader-utils-1.4.1 2022-11-09 21:01:07 +01:00
James Cole
7fcdf85dee Fix https://github.com/firefly-iii/firefly-iii/issues/6625 2022-11-09 20:49:27 +01:00
James Cole
704c6055b3 Update link and policy. 2022-11-09 06:35:42 +01:00
dependabot[bot]
f650dd9463 Bump loader-utils from 1.4.0 to 1.4.1 in /frontend
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-09 01:08:56 +00:00
James Cole
1b261359e6 Merge pull request #6615 from firefly-iii/dependabot/composer/develop/ramsey/uuid-4.6.0
Bump ramsey/uuid from 4.5.1 to 4.6.0
2022-11-07 05:32:51 +01:00
James Cole
8050c8cb84 Merge pull request #6614 from firefly-iii/dependabot/composer/develop/league/commonmark-2.3.7
Bump league/commonmark from 2.3.6 to 2.3.7
2022-11-07 05:32:44 +01:00
dependabot[bot]
7666960a86 Bump ramsey/uuid from 4.5.1 to 4.6.0
Bumps [ramsey/uuid](https://github.com/ramsey/uuid) from 4.5.1 to 4.6.0.
- [Release notes](https://github.com/ramsey/uuid/releases)
- [Changelog](https://github.com/ramsey/uuid/blob/4.x/CHANGELOG.md)
- [Commits](https://github.com/ramsey/uuid/compare/4.5.1...4.6.0)

---
updated-dependencies:
- dependency-name: ramsey/uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-07 03:00:29 +00:00
dependabot[bot]
0a7210729f Bump league/commonmark from 2.3.6 to 2.3.7
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.3.6 to 2.3.7.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/2.3/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.3.6...2.3.7)

---
updated-dependencies:
- dependency-name: league/commonmark
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-07 03:00:23 +00:00
James Cole
90c9fdaf55 Fix https://github.com/firefly-iii/firefly-iii/issues/6610 2022-11-06 18:15:53 +01:00
James Cole
60d8bb2aab Better header catch 2022-11-06 18:14:21 +01:00
James Cole
d55833cb86 Merge pull request #6600 from charlesteets/patch-1
typo fix
2022-11-05 04:27:49 +00:00
charlesteets
39fbf3ce20 typo fix 2022-11-04 22:57:43 -04:00
James Cole
acd9685578 Merge branch 'develop' into 5.8-dev 2022-11-04 05:50:12 +01:00
James Cole
15994c8c56 Add missing locale data 2022-11-04 05:49:46 +01:00
James Cole
b942f351f8 Fix https://github.com/firefly-iii/firefly-iii/issues/6597 2022-11-04 05:49:32 +01:00
James Cole
f16b679049 Various code fixes. 2022-11-04 05:11:05 +01:00
James Cole
8d8f81c27d Various code cleanup and phpstan suggestions 2022-11-02 06:25:37 +01:00
James Cole
74610a5d55 Update packages 2022-11-02 05:07:52 +01:00
James Cole
409b4fe4d9 Run CS fixer 2022-11-02 05:02:09 +01:00
James Cole
817a9f57c4 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	config/firefly.php
#	frontend/src/i18n/bg_BG/index.js
#	frontend/src/i18n/cs_CZ/index.js
#	frontend/src/i18n/da_DK/index.js
#	frontend/src/i18n/de_DE/index.js
#	frontend/src/i18n/el_GR/index.js
#	frontend/src/i18n/en_GB/index.js
#	frontend/src/i18n/en_US/index.js
#	frontend/src/i18n/es_ES/index.js
#	frontend/src/i18n/fi_FI/index.js
#	frontend/src/i18n/fr_FR/index.js
#	frontend/src/i18n/hu_HU/index.js
#	frontend/src/i18n/id_ID/index.js
#	frontend/src/i18n/it_IT/index.js
#	frontend/src/i18n/ja_JP/index.js
#	frontend/src/i18n/nb_NO/index.js
#	frontend/src/i18n/nl_NL/index.js
#	frontend/src/i18n/pl_PL/index.js
#	frontend/src/i18n/pt_BR/index.js
#	frontend/src/i18n/pt_PT/index.js
#	frontend/src/i18n/ro_RO/index.js
#	frontend/src/i18n/ru_RU/index.js
#	frontend/src/i18n/sk_SK/index.js
#	frontend/src/i18n/sl_SI/index.js
#	frontend/src/i18n/sv_SE/index.js
#	frontend/src/i18n/tr_TR/index.js
#	frontend/src/i18n/uk_UA/index.js
#	frontend/src/i18n/vi_VN/index.js
#	frontend/src/i18n/zh_CN/index.js
#	frontend/src/i18n/zh_TW/index.js
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
#	resources/assets/js/locales/bg.json
#	resources/assets/js/locales/cs.json
#	resources/assets/js/locales/da.json
#	resources/assets/js/locales/de.json
#	resources/assets/js/locales/el.json
#	resources/assets/js/locales/en-gb.json
#	resources/assets/js/locales/en.json
#	resources/assets/js/locales/es.json
#	resources/assets/js/locales/fi.json
#	resources/assets/js/locales/fr.json
#	resources/assets/js/locales/hu.json
#	resources/assets/js/locales/id.json
#	resources/assets/js/locales/it.json
#	resources/assets/js/locales/ja.json
#	resources/assets/js/locales/nb.json
#	resources/assets/js/locales/nl.json
#	resources/assets/js/locales/pl.json
#	resources/assets/js/locales/pt.json
#	resources/assets/js/locales/ro.json
#	resources/assets/js/locales/ru.json
#	resources/assets/js/locales/sk.json
#	resources/assets/js/locales/sl.json
#	resources/assets/js/locales/sv.json
#	resources/assets/js/locales/tr.json
#	resources/assets/js/locales/uk.json
#	resources/assets/js/locales/vi.json
#	resources/assets/js/locales/zh-cn.json
#	resources/assets/js/locales/zh-tw.json
#	yarn.lock
2022-11-02 05:00:59 +01:00
James Cole
e05c174e6d Merge tag '5.7.15' into develop
5.7.15
2022-11-02 04:58:53 +01:00
James Cole
05d461fb88 Merge branch 'release/5.7.15' 2022-11-02 04:58:52 +01:00
James Cole
7bb2f96ae2 Update meta files for new release. 2022-11-02 04:57:15 +01:00
James Cole
8f15bd716d Fix https://github.com/firefly-iii/firefly-iii/issues/6592 2022-11-02 04:46:06 +01:00
James Cole
a702662e88 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	.gitignore
2022-11-01 19:34:12 +01:00
James Cole
0c6e00666b Fix https://github.com/firefly-iii/firefly-iii/issues/6589 2022-11-01 19:33:43 +01:00
James Cole
5ba079e71c Ignore vendor dir of PHP CS Fixer. 2022-11-01 19:26:00 +01:00
James Cole
ebcf9b3be1 Update error catch 2022-11-01 19:24:34 +01:00
James Cole
e7e3370baa Fix https://github.com/firefly-iii/firefly-iii/issues/6581 2022-10-31 20:12:19 +01:00
James Cole
21d4b396cc Merge branch 'develop' into 5.8-dev 2022-10-31 20:11:29 +01:00
James Cole
249b0c3377 Various code fixes. 2022-10-31 05:53:36 +01:00
James Cole
b36f6741ff Merge pull request #6588 from firefly-iii/dependabot/npm_and_yarn/develop/vue-i18n-8.28.1
Bump vue-i18n from 8.28.0 to 8.28.1
2022-10-31 05:53:10 +01:00
James Cole
0059ed7bde Fix some phpstan issues. 2022-10-31 05:50:44 +01:00
dependabot[bot]
d7bbc8334e Bump vue-i18n from 8.28.0 to 8.28.1
Bumps [vue-i18n](https://github.com/intlify/vue-i18n-next/tree/HEAD/packages/vue-i18n) from 8.28.0 to 8.28.1.
- [Release notes](https://github.com/intlify/vue-i18n-next/releases)
- [Changelog](https://github.com/intlify/vue-i18n-next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/intlify/vue-i18n-next/commits/HEAD/packages/vue-i18n)

---
updated-dependencies:
- dependency-name: vue-i18n
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 04:46:08 +00:00
James Cole
bd245d5c92 Update packages 2022-10-31 05:42:12 +01:00
James Cole
4e618a4d0b Remove phpstan comments. 2022-10-31 05:40:59 +01:00
James Cole
b57785a234 Various code fixes. 2022-10-31 05:39:22 +01:00
James Cole
2b7101e362 Merge pull request #6587 from firefly-iii/dependabot/npm_and_yarn/develop/vue-i18n-8.28.0
Bump vue-i18n from 8.27.2 to 8.28.0
2022-10-31 05:38:10 +01:00
James Cole
e74b629dc2 Merge pull request #6586 from firefly-iii/dependabot/composer/develop/league/commonmark-2.3.6
Bump league/commonmark from 2.3.5 to 2.3.6
2022-10-31 05:38:00 +01:00
James Cole
a4f329cfc3 Merge pull request #6585 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.5.1
Bump doctrine/dbal from 3.5.0 to 3.5.1
2022-10-31 05:37:44 +01:00
James Cole
e993abc8fb Merge pull request #6584 from firefly-iii/dependabot/composer/develop/laravel/framework-9.37.0 2022-10-31 05:37:07 +01:00
James Cole
6961365a40 Merge pull request #6583 from firefly-iii/dependabot/composer/develop/symfony/http-client-6.0.15 2022-10-31 05:36:53 +01:00
James Cole
16303515f5 Merge pull request #6582 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.26 2022-10-31 05:36:39 +01:00
dependabot[bot]
bb5bca9cf0 Bump vue-i18n from 8.27.2 to 8.28.0
Bumps [vue-i18n](https://github.com/intlify/vue-i18n-next/tree/HEAD/packages/vue-i18n) from 8.27.2 to 8.28.0.
- [Release notes](https://github.com/intlify/vue-i18n-next/releases)
- [Changelog](https://github.com/intlify/vue-i18n-next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/intlify/vue-i18n-next/commits/HEAD/packages/vue-i18n)

---
updated-dependencies:
- dependency-name: vue-i18n
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 03:01:41 +00:00
dependabot[bot]
e8a61821e9 Bump league/commonmark from 2.3.5 to 2.3.6
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.3.5 to 2.3.6.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/2.3/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.3.5...2.3.6)

---
updated-dependencies:
- dependency-name: league/commonmark
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 03:01:03 +00:00
dependabot[bot]
5d4cf5f55e Bump doctrine/dbal from 3.5.0 to 3.5.1
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.5.0...3.5.1)

---
updated-dependencies:
- dependency-name: doctrine/dbal
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 03:00:57 +00:00
dependabot[bot]
5e9de60c1a Bump laravel/framework from 9.36.4 to 9.37.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.36.4 to 9.37.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.36.4...v9.37.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 03:00:52 +00:00
dependabot[bot]
417700ef13 Bump symfony/http-client from 6.0.14 to 6.0.15
Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.0.14 to 6.0.15.
- [Release notes](https://github.com/symfony/http-client/releases)
- [Changelog](https://github.com/symfony/http-client/blob/6.1/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-client/compare/v6.0.14...v6.0.15)

---
updated-dependencies:
- dependency-name: symfony/http-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 03:00:44 +00:00
dependabot[bot]
b14062b197 Bump phpunit/phpunit from 9.5.25 to 9.5.26
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.25 to 9.5.26.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/main/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.25...9.5.26)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 03:00:40 +00:00
James Cole
33f370359c Replace phpstan suggestions 2022-10-30 14:44:49 +01:00
James Cole
c032ffd4f9 Fix phpstan issues. 2022-10-30 14:34:36 +01:00
James Cole
1a7d60ccc8 Fix phpcs script 2022-10-30 14:24:53 +01:00
James Cole
f52675068b Use PSR-12 code style 2022-10-30 14:24:37 +01:00
James Cole
f53923f16c Use PSR-12 code style 2022-10-30 14:24:28 +01:00
James Cole
2eebcb21f1 Use PSR-12 code style 2022-10-30 14:24:19 +01:00
James Cole
64ff5eed27 Use PSR-12 code style 2022-10-30 14:24:10 +01:00
James Cole
1667b88dcd Use PSR-12 code style 2022-10-30 14:23:00 +01:00
James Cole
b27fe59ab4 Use PSR-12 code style 2022-10-30 12:24:51 +01:00
James Cole
bdcd9825ec Use PSR-12 code style 2022-10-30 12:23:16 +01:00
James Cole
8edfb1460c Add php cs fixer and some rule sets. 2022-10-30 12:21:41 +01:00
James Cole
914dc8596b remove old inspections 2022-10-30 12:12:35 +01:00
James Cole
6b64a39182 Install PHPstan rules again. 2022-10-30 12:02:56 +01:00
James Cole
d28326cc89 Restore todo's 2022-10-30 11:43:17 +01:00
James Cole
e3181e90df Fix https://github.com/firefly-iii/firefly-iii/issues/6130 2022-10-30 06:45:56 +01:00
James Cole
486f25cd96 Update translations. 2022-10-29 07:59:49 +02:00
James Cole
612a395eb2 Merge branch 'develop' into 5.8-dev 2022-10-26 05:50:42 +02:00
James Cole
a3b4d5ff62 Add missing locale data. 2022-10-26 05:50:06 +02:00
James Cole
b613b56d1e Merge branch 'develop' into 5.8-dev
# Conflicts:
#	resources/views/list/groups.twig
2022-10-24 19:59:26 +02:00
James Cole
6b7fc03f02 Fix style 2022-10-24 19:58:49 +02:00
James Cole
5999ee406c Fix style 2022-10-24 19:58:12 +02:00
James Cole
e348127770 Merge branch 'develop' into 5.8-dev 2022-10-24 19:53:42 +02:00
James Cole
b60a3be34b Fix style 2022-10-24 19:53:19 +02:00
James Cole
e3bdc62ac4 Merge branch 'develop' into 5.8-dev 2022-10-24 19:48:13 +02:00
James Cole
83b8fdba05 Fix #6564 2022-10-24 19:42:06 +02:00
James Cole
b21461c824 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	resources/views/auth/login.twig
#	resources/views/auth/mfa.twig
#	resources/views/auth/passwords/email.twig
#	resources/views/auth/passwords/reset.twig
#	resources/views/auth/register.twig
2022-10-24 19:35:47 +02:00
James Cole
0b64507fd7 Merge pull request #6560 from firefly-iii/dependabot/composer/develop/laravel/framework-9.36.4
Bump laravel/framework from 9.36.2 to 9.36.4
2022-10-24 13:55:36 +02:00
James Cole
45dcd5df09 Merge pull request #6561 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.5.0
Bump doctrine/dbal from 3.4.5 to 3.5.0
2022-10-24 11:13:49 +02:00
dependabot[bot]
3bdea43744 Bump doctrine/dbal from 3.4.5 to 3.5.0
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.4.5 to 3.5.0.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.4.5...3.5.0)

---
updated-dependencies:
- dependency-name: doctrine/dbal
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-24 03:01:47 +00:00
dependabot[bot]
b3895a04a0 Bump laravel/framework from 9.36.2 to 9.36.4
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.36.2 to 9.36.4.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.36.2...v9.36.4)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-24 03:01:42 +00:00
James Cole
d4738b21ab Make sure form elements are not spell checked. 2022-10-23 17:36:26 +02:00
James Cole
2f66315416 Fix #6556 2022-10-23 14:53:13 +02:00
James Cole
f4af19e121 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	composer.lock
#	config/firefly.php
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
#	resources/assets/js/locales/pt-br.json
#	resources/lang/pt_BR/firefly.php
#	yarn.lock
2022-10-23 14:49:54 +02:00
James Cole
abdb717b37 Can no longer set currency of expense / revenue accounts. 2022-10-23 14:46:26 +02:00
James Cole
e229bd8121 Updated translations. 2022-10-22 07:34:05 +02:00
James Cole
d31fa743d0 Add ability to set some transaction flags. Fixes #6526 2022-10-22 07:30:12 +02:00
James Cole
4ad666d964 Add button to remove unused accounts. 2022-10-19 19:57:22 +02:00
James Cole
f7b66a048a Merge branch 'release/5.7.14' 2022-10-18 21:13:43 +02:00
James Cole
a91f6fbfaf Merge tag '5.7.14' into develop
5.7.14
2022-10-18 21:13:43 +02:00
James Cole
f3566c609a Meta files for new release. 2022-10-18 21:13:14 +02:00
James Cole
904320b9b8 Fix bulk update rules 2022-10-18 20:41:48 +02:00
James Cole
35c1ce6504 Fix negative budget limits 2022-10-18 20:37:33 +02:00
James Cole
a96c830e3e Merge branch 'develop' into 5.8-dev 2022-10-17 05:42:49 +02:00
James Cole
ddefdd5ec5 Add instructions to .env.example 2022-10-17 05:42:35 +02:00
James Cole
9e41cd9c8c Fix spelling 2022-10-17 05:42:05 +02:00
James Cole
b3740e643a Update copyright statements 2022-10-16 19:29:53 +02:00
James Cole
55ac76f663 Update copyright. 2022-10-16 19:22:26 +02:00
James Cole
49560ca6a6 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	composer.lock
#	config/firefly.php
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
2022-10-16 19:13:15 +02:00
James Cole
fd37054493 Merge tag '5.7.13' into develop
5.7.13
2022-10-16 16:10:14 +02:00
James Cole
bf589e5c57 Merge branch 'release/5.7.13' 2022-10-16 16:10:13 +02:00
James Cole
e97018cf2e Update composer 2022-10-16 16:08:56 +02:00
James Cole
5038ed7708 Update build files 2022-10-16 16:07:48 +02:00
James Cole
02081b09a2 Meta files for new release. 2022-10-16 15:52:22 +02:00
James Cole
a74d345ac2 Make doubly sure special characters are removed from the notes. 2022-10-16 15:18:11 +02:00
James Cole
e472c3520d Add comments about floats 2022-10-16 14:44:11 +02:00
James Cole
39654249e4 Merge branch 'develop' into 5.8-dev 2022-10-11 11:07:11 +02:00
James Cole
69929bee31 Merge pull request #6531 from firefly-iii/dependabot/composer/develop/laravel/passport-11.2.1 2022-10-10 06:06:10 +02:00
James Cole
b276b24a79 Merge pull request #6532 from firefly-iii/dependabot/npm_and_yarn/develop/axios-1.1.2 2022-10-10 06:05:59 +02:00
dependabot[bot]
1b99dbab0a Bump laravel/passport from 11.2.0 to 11.2.1
Bumps [laravel/passport](https://github.com/laravel/passport) from 11.2.0 to 11.2.1.
- [Release notes](https://github.com/laravel/passport/releases)
- [Changelog](https://github.com/laravel/passport/blob/11.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/passport/compare/v11.2.0...v11.2.1)

---
updated-dependencies:
- dependency-name: laravel/passport
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-10 03:56:14 +00:00
James Cole
1ea0fa318c Merge pull request #6530 from firefly-iii/dependabot/composer/develop/laravel/framework-9.34.0 2022-10-10 05:55:30 +02:00
James Cole
4066fc643f Merge pull request #6529 from firefly-iii/dependabot/composer/develop/spatie/laravel-ignition-1.5.1 2022-10-10 05:55:21 +02:00
dependabot[bot]
b7975c6a88 Bump axios from 0.27.2 to 1.1.2
Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.1.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.27.2...v1.1.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-10 03:01:59 +00:00
dependabot[bot]
1e88b1eb88 Bump laravel/framework from 9.33.0 to 9.34.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.33.0 to 9.34.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.33.0...v9.34.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-10 03:01:30 +00:00
dependabot[bot]
88490de38f Bump spatie/laravel-ignition from 1.5.0 to 1.5.1
Bumps [spatie/laravel-ignition](https://github.com/spatie/laravel-ignition) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/spatie/laravel-ignition/releases)
- [Changelog](https://github.com/spatie/laravel-ignition/blob/main/CHANGELOG.md)
- [Commits](https://github.com/spatie/laravel-ignition/compare/1.5.0...1.5.1)

---
updated-dependencies:
- dependency-name: spatie/laravel-ignition
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-10 03:01:22 +00:00
James Cole
77759d5580 Update text, remove entry. 2022-10-09 07:09:55 +02:00
James Cole
22971ded84 Fix bad composer file 2022-10-08 10:11:51 +02:00
James Cole
841edcfffb Rebuild frontend 2022-10-08 07:04:41 +02:00
James Cole
05fe503456 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	frontend/src/i18n/tr_TR/index.js
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
#	resources/assets/js/locales/bg.json
#	resources/assets/js/locales/cs.json
#	resources/assets/js/locales/de.json
#	resources/assets/js/locales/el.json
#	resources/assets/js/locales/en-gb.json
#	resources/assets/js/locales/en.json
#	resources/assets/js/locales/es.json
#	resources/assets/js/locales/fi.json
#	resources/assets/js/locales/fr.json
#	resources/assets/js/locales/hu.json
#	resources/assets/js/locales/it.json
#	resources/assets/js/locales/ja.json
#	resources/assets/js/locales/nb.json
#	resources/assets/js/locales/nl.json
#	resources/assets/js/locales/pl.json
#	resources/assets/js/locales/pt-br.json
#	resources/assets/js/locales/pt.json
#	resources/assets/js/locales/ro.json
#	resources/assets/js/locales/ru.json
#	resources/assets/js/locales/sk.json
#	resources/assets/js/locales/sv.json
#	resources/assets/js/locales/tr.json
#	resources/assets/js/locales/vi.json
#	resources/assets/js/locales/zh-cn.json
#	resources/assets/js/locales/zh-tw.json
#	resources/lang/bg_BG/firefly.php
#	resources/lang/fr_FR/firefly.php
#	resources/lang/nl_NL/firefly.php
#	resources/lang/ru_RU/firefly.php
2022-10-08 07:03:40 +02:00
James Cole
030b6cb281 Rebuild frontend 2022-10-08 06:50:17 +02:00
James Cole
896c15a7a1 Update meta data and translations. 2022-10-08 06:47:56 +02:00
James Cole
b176308dbd Higher amounts. 2022-10-08 06:05:59 +02:00
James Cole
da71d6172c Fix rule booboo 2022-10-08 05:57:12 +02:00
James Cole
f1457fcda6 New stuff 2022-10-06 06:23:12 +02:00
James Cole
a39553256e Merge branch 'develop' into 5.8-dev 2022-10-06 06:18:25 +02:00
James Cole
553a9be3d5 Fix https://github.com/firefly-iii/firefly-iii/issues/6510 2022-10-06 06:17:49 +02:00
James Cole
187e1914e3 Merge pull request #6502 from D7032E-Group-6/develop
Issue #5234 fix
2022-10-06 06:09:51 +02:00
Nathan PERIER
fc83565d02 Added translations for the new options 2022-10-05 15:23:22 +02:00
James Cole
7e94f246e3 New translations. 2022-10-04 20:49:29 +02:00
James Cole
44637dfaab Merge 2022-10-04 20:31:57 +02:00
James Cole
bab4c05e5f Fix https://github.com/firefly-iii/firefly-iii/issues/6471 2022-10-04 19:12:57 +02:00
Nathan PERIER
5b43a2e99f Added options for month to date and year to date 2022-10-04 15:17:11 +02:00
James Cole
ee2b87d5fe Fix sentences. 2022-10-03 20:26:26 +02:00
James Cole
c9f7e96450 Merge pull request #6491 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.17
Bump postcss from 8.4.16 to 8.4.17
2022-10-03 06:03:07 +02:00
James Cole
ea361365f0 Merge pull request #6490 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.40
Bump @vue/compiler-sfc from 3.2.39 to 3.2.40
2022-10-03 06:02:57 +02:00
James Cole
5dfb35064a Merge pull request #6489 from firefly-iii/dependabot/composer/develop/nunomaduro/collision-6.3.1
Bump nunomaduro/collision from 6.3.0 to 6.3.1
2022-10-03 06:02:48 +02:00
James Cole
5522e4f514 Merge pull request #6488 from firefly-iii/dependabot/composer/develop/laravel/framework-9.33.0
Bump laravel/framework from 9.31.0 to 9.33.0
2022-10-03 06:02:40 +02:00
James Cole
c1367d12a6 Merge pull request #6487 from firefly-iii/dependabot/composer/develop/symfony/http-client-6.0.13
Bump symfony/http-client from 6.0.12 to 6.0.13
2022-10-03 06:02:29 +02:00
James Cole
db2485f97a Clean up rule form. 2022-10-03 05:49:25 +02:00
dependabot[bot]
321c8fca67 Bump postcss from 8.4.16 to 8.4.17
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.16 to 8.4.17.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.16...8.4.17)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-03 03:01:52 +00:00
dependabot[bot]
73b98612a5 Bump @vue/compiler-sfc from 3.2.39 to 3.2.40
Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc) from 3.2.39 to 3.2.40.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits/v3.2.40/packages/compiler-sfc)

---
updated-dependencies:
- dependency-name: "@vue/compiler-sfc"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-03 03:01:36 +00:00
dependabot[bot]
671e93c50f Bump nunomaduro/collision from 6.3.0 to 6.3.1
Bumps [nunomaduro/collision](https://github.com/nunomaduro/collision) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/nunomaduro/collision/releases)
- [Changelog](https://github.com/nunomaduro/collision/blob/v7.x/CHANGELOG.md)
- [Commits](https://github.com/nunomaduro/collision/compare/v6.3.0...v6.3.1)

---
updated-dependencies:
- dependency-name: nunomaduro/collision
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-03 03:01:02 +00:00
dependabot[bot]
553c3ec17e Bump laravel/framework from 9.31.0 to 9.33.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.31.0 to 9.33.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.31.0...v9.33.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-03 03:00:58 +00:00
dependabot[bot]
94b933c7a4 Bump symfony/http-client from 6.0.12 to 6.0.13
Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.0.12 to 6.0.13.
- [Release notes](https://github.com/symfony/http-client/releases)
- [Changelog](https://github.com/symfony/http-client/blob/6.1/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-client/compare/v6.0.12...v6.0.13)

---
updated-dependencies:
- dependency-name: symfony/http-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-03 03:00:45 +00:00
James Cole
38bdd6c36c Final fix, I hope. 2022-10-02 20:27:21 +02:00
James Cole
536e054961 Fix sloppy variable names 2022-10-02 20:23:11 +02:00
James Cole
6dfe93bc19 Fix rule 2022-10-02 20:18:43 +02:00
James Cole
d8a15e41e6 Catch various audit log things 2022-10-02 20:13:32 +02:00
James Cole
ca8a65af60 Display audit logs 2022-10-02 14:37:50 +02:00
James Cole
06cd75ba74 Add description to command. 2022-10-02 06:47:42 +02:00
James Cole
10d2a91d99 Migrate actions 2022-10-02 06:23:31 +02:00
James Cole
f2f3d69aa8 Merge branch 'develop' into 5.8-dev 2022-10-02 05:39:59 +02:00
James Cole
0338010eaa Merge pull request #6481 from janw/main
Make bulk rules clauses match bulk TransactionController params
2022-10-02 05:39:27 +02:00
James Cole
185842a891 Add audit logs for rules. 2022-10-02 05:37:38 +02:00
Jan Willhaus
ff91fe432c Make bulk rules clauses match bulk TransactionController params 2022-10-01 22:39:25 +02:00
James Cole
681b0b9046 Update packages 2022-10-01 21:03:06 +02:00
James Cole
5f11272d49 Merge branch 'develop' into 5.8-dev 2022-10-01 19:06:55 +02:00
James Cole
c4e46bf89b Fix issue in budget limits 2022-10-01 16:35:29 +02:00
James Cole
ee9b651f0f Add ability to invite users 2022-10-01 12:21:42 +02:00
James Cole
9bfa52f3ce Merge branch 'develop' into 5.8-dev
And fix rule creation and edit etc
2022-10-01 07:34:30 +02:00
James Cole
5c471059f3 Fix method 2022-10-01 07:20:26 +02:00
James Cole
5714bd0749 Add reverse button 2022-10-01 07:19:33 +02:00
James Cole
749ce2ca9b Merge branch 'develop' into 5.8-dev 2022-10-01 07:15:17 +02:00
James Cole
93c83fbe7a Rename method 2022-10-01 05:29:42 +02:00
James Cole
4474a71e65 Attempted fix for #6475 2022-09-30 20:07:01 +02:00
James Cole
697ad5b2b5 no message 2022-09-30 19:56:51 +02:00
James Cole
1558e87923 Fix https://github.com/firefly-iii/firefly-iii/issues/6461 2022-09-30 19:56:24 +02:00
James Cole
3b18a29adc Merge branch 'develop' into 5.8-dev 2022-09-30 19:47:09 +02:00
James Cole
c6bc308ce7 Merge branch 'main' into develop 2022-09-30 19:46:57 +02:00
James Cole
36caf5d8ec New translations 2022-09-30 19:46:02 +02:00
James Cole
c49f3fcccf Merge pull request #6476 from firefly-iii/dependabot/composer/twig/twig-3.4.3
Bump twig/twig from 3.4.2 to 3.4.3
2022-09-30 18:15:49 +02:00
dependabot[bot]
d144392bd6 Bump twig/twig from 3.4.2 to 3.4.3
Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/twigphp/Twig/releases)
- [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG)
- [Commits](https://github.com/twigphp/Twig/compare/v3.4.2...v3.4.3)

---
updated-dependencies:
- dependency-name: twig/twig
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-30 15:47:40 +00:00
James Cole
9b7285ea84 Expand search and add operators. 2022-09-28 07:35:57 +02:00
James Cole
0671f20ab1 Merge pull request #6464 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.4.5
Bump doctrine/dbal from 3.4.4 to 3.4.5
2022-09-26 05:42:18 +02:00
James Cole
4bdc5fa3fc Merge pull request #6463 from firefly-iii/dependabot/composer/develop/laravel/framework-9.31.0
Bump laravel/framework from 9.30.1 to 9.31.0
2022-09-26 05:41:35 +02:00
James Cole
ddff192a1f Merge pull request #6462 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.25
Bump phpunit/phpunit from 9.5.24 to 9.5.25
2022-09-26 05:40:36 +02:00
dependabot[bot]
ff55b36f32 Bump doctrine/dbal from 3.4.4 to 3.4.5
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.4.4 to 3.4.5.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.4.4...3.4.5)

---
updated-dependencies:
- dependency-name: doctrine/dbal
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-26 03:01:06 +00:00
dependabot[bot]
8e4c772dcd Bump laravel/framework from 9.30.1 to 9.31.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.30.1 to 9.31.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.30.1...v9.31.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-26 03:01:00 +00:00
dependabot[bot]
fd7683c212 Bump phpunit/phpunit from 9.5.24 to 9.5.25
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.24 to 9.5.25.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/main/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.24...9.5.25)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-26 03:00:52 +00:00
James Cole
6eaed9829b Sort and cleanup code. 2022-09-25 15:31:58 +02:00
James Cole
3c33ea959e Expand search with negated search options 2022-09-25 15:31:07 +02:00
James Cole
80a732b32b First negative search query 2022-09-24 18:06:01 +02:00
James Cole
a9f2741282 Add ability to move stuff around, fix spelling. 2022-09-24 17:43:49 +02:00
James Cole
600fa388c1 Fix extra notification 2022-09-24 12:17:55 +02:00
James Cole
45d7042405 Add slack support to Firefly III 2022-09-24 12:14:27 +02:00
James Cole
2945f5fcde Expand requirements 2022-09-24 11:43:39 +02:00
James Cole
be1dff49fa Add notifications. 2022-09-24 11:41:07 +02:00
James Cole
665b78ebf5 Expand notifications. 2022-09-24 08:23:07 +02:00
James Cole
416fe0c147 Merge branch 'develop' into 5.8-dev 2022-09-24 07:03:03 +02:00
James Cole
4ca346fc4d Expand notifications 2022-09-23 06:05:22 +02:00
James Cole
6f9482fc1b Merge pull request #6444 from firefly-iii/dependabot/composer/develop/spatie/laravel-ignition-1.5.0
Bump spatie/laravel-ignition from 1.4.1 to 1.5.0
2022-09-19 08:16:56 +02:00
James Cole
af6e70c41c Merge pull request #6448 from firefly-iii/dependabot/composer/develop/laravel/passport-11.2.0
Bump laravel/passport from 11.1.0 to 11.2.0
2022-09-19 08:16:02 +02:00
dependabot[bot]
7116c65bd7 Bump laravel/passport from 11.1.0 to 11.2.0
Bumps [laravel/passport](https://github.com/laravel/passport) from 11.1.0 to 11.2.0.
- [Release notes](https://github.com/laravel/passport/releases)
- [Changelog](https://github.com/laravel/passport/blob/11.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/passport/compare/v11.1.0...v11.2.0)

---
updated-dependencies:
- dependency-name: laravel/passport
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-19 06:14:40 +00:00
dependabot[bot]
9e98c52c64 Bump spatie/laravel-ignition from 1.4.1 to 1.5.0
Bumps [spatie/laravel-ignition](https://github.com/spatie/laravel-ignition) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/spatie/laravel-ignition/releases)
- [Changelog](https://github.com/spatie/laravel-ignition/blob/main/CHANGELOG.md)
- [Commits](https://github.com/spatie/laravel-ignition/compare/1.4.1...1.5.0)

---
updated-dependencies:
- dependency-name: spatie/laravel-ignition
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-19 06:14:38 +00:00
James Cole
c5e0c492a7 Merge pull request #6445 from firefly-iii/dependabot/composer/develop/spatie/data-transfer-object-3.9.1
Bump spatie/data-transfer-object from 3.8.1 to 3.9.1
2022-09-19 08:14:01 +02:00
James Cole
f43c74df66 Merge pull request #6443 from firefly-iii/dependabot/composer/develop/laravel/framework-9.30.1
Bump laravel/framework from 9.29.0 to 9.30.1
2022-09-19 08:13:49 +02:00
James Cole
40dbae17b1 Merge pull request #6447 from firefly-iii/dependabot/composer/develop/laravel/ui-4.0.2
Bump laravel/ui from 4.0.1 to 4.0.2
2022-09-19 08:13:39 +02:00
dependabot[bot]
3ca88adade Bump laravel/ui from 4.0.1 to 4.0.2
Bumps [laravel/ui](https://github.com/laravel/ui) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/laravel/ui/releases)
- [Changelog](https://github.com/laravel/ui/blob/4.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/ui/compare/v4.0.1...v4.0.2)

---
updated-dependencies:
- dependency-name: laravel/ui
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-19 06:12:01 +00:00
dependabot[bot]
c8be9ceaf5 Bump spatie/data-transfer-object from 3.8.1 to 3.9.1
Bumps [spatie/data-transfer-object](https://github.com/spatie/data-transfer-object) from 3.8.1 to 3.9.1.
- [Release notes](https://github.com/spatie/data-transfer-object/releases)
- [Changelog](https://github.com/spatie/data-transfer-object/blob/main/CHANGELOG.md)
- [Commits](https://github.com/spatie/data-transfer-object/compare/3.8.1...3.9.1)

---
updated-dependencies:
- dependency-name: spatie/data-transfer-object
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-19 06:09:39 +00:00
James Cole
52df1aad14 Merge pull request #6446 from firefly-iii/dependabot/composer/develop/ramsey/uuid-4.5.1
Bump ramsey/uuid from 4.4.0 to 4.5.1
2022-09-19 08:09:08 +02:00
dependabot[bot]
6bc73f4f55 Bump ramsey/uuid from 4.4.0 to 4.5.1
Bumps [ramsey/uuid](https://github.com/ramsey/uuid) from 4.4.0 to 4.5.1.
- [Release notes](https://github.com/ramsey/uuid/releases)
- [Changelog](https://github.com/ramsey/uuid/blob/4.x/CHANGELOG.md)
- [Commits](https://github.com/ramsey/uuid/compare/4.4.0...4.5.1)

---
updated-dependencies:
- dependency-name: ramsey/uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-19 03:01:26 +00:00
dependabot[bot]
4ade02efc8 Bump laravel/framework from 9.29.0 to 9.30.1
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.29.0 to 9.30.1.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.29.0...v9.30.1)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-19 03:01:10 +00:00
James Cole
d2c52b47f1 Allow setting of notifications. 2022-09-18 16:49:15 +02:00
James Cole
c25b63d87b Fix #4198 2022-09-18 16:28:04 +02:00
James Cole
c120a908f3 Remove available budgets endpoints. 2022-09-18 15:57:24 +02:00
James Cole
07541fa08f Update translations and notifications. 2022-09-18 15:48:28 +02:00
James Cole
0098a9c3c0 Create some empty notifications. 2022-09-18 12:36:35 +02:00
James Cole
9f95d7a76f Fix https://github.com/firefly-iii/firefly-iii/issues/5862 2022-09-18 12:23:20 +02:00
James Cole
67126e46b9 Add webhook code and rebuild. 2022-09-18 10:45:38 +02:00
James Cole
c4c178b39d Merge branch 'develop' into 5.8-dev 2022-09-18 05:54:49 +02:00
James Cole
eef14ced59 Add amount check. Not sure why rule doesn't fire. 2022-09-18 05:53:11 +02:00
James Cole
d9245f06f7 Add option to delete webhooks. 2022-09-18 05:49:56 +02:00
James Cole
625ad14d7d Add code to create webhook. 2022-09-17 16:54:13 +02:00
James Cole
23e5cf1b34 Update languages 2022-09-17 07:14:50 +02:00
James Cole
ad9efde2d0 Expand webhook code. 2022-09-17 07:08:30 +02:00
James Cole
10f2cf2481 Update webhooks 2022-09-17 07:07:25 +02:00
James Cole
f0416f5322 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	config/firefly.php
2022-09-11 08:59:34 +02:00
James Cole
11ba24482f Merge branch 'release/5.7.12' 2022-09-11 07:27:37 +02:00
James Cole
e5bc074e68 Merge tag '5.7.12' into develop
5.7.12
2022-09-11 07:27:37 +02:00
James Cole
93ea86f921 Fix meta files for new release. 2022-09-11 07:27:16 +02:00
James Cole
cf8957a460 Fix https://github.com/firefly-iii/firefly-iii/issues/6332 2022-09-11 07:08:54 +02:00
James Cole
9c2f771bae Fix https://github.com/firefly-iii/firefly-iii/issues/6333 2022-09-11 07:08:02 +02:00
James Cole
d9e8f8106a Fix https://github.com/firefly-iii/firefly-iii/issues/6379 2022-09-11 07:02:39 +02:00
James Cole
6589f88883 Fix https://github.com/firefly-iii/firefly-iii/issues/6421 2022-09-11 06:58:16 +02:00
James Cole
38ebdd8249 Merge pull request #6423 from canoine/develop
Redis username needed for both databases
2022-09-10 06:09:42 +02:00
canoine
6296ead897 Redis username needed for both databases
Redis username needed for both 'default' and 'cache' databases
2022-09-09 14:21:16 +02:00
James Cole
ecf5cc62f9 Fix https://github.com/firefly-iii/firefly-iii/issues/6287 2022-09-08 06:22:02 +02:00
James Cole
b205cc87fc Merge tag '5.7.11' into develop
5.7.11
2022-09-07 18:38:57 +02:00
James Cole
4c60473f02 Merge branch 'release/5.7.11' 2022-09-07 18:38:56 +02:00
James Cole
7104433a68 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	app/Exceptions/Handler.php
#	config/firefly.php
2022-09-07 18:35:01 +02:00
James Cole
f47464944b Update packages 2022-09-07 18:33:23 +02:00
James Cole
edb9480c90 Merge pull request #6413 from firefly-iii/dependabot/composer/develop/predis/predis-2.0.1
Bump predis/predis from 2.0.0 to 2.0.1
2022-09-05 20:05:40 +02:00
dependabot[bot]
615e789134 Bump predis/predis from 2.0.0 to 2.0.1
Bumps [predis/predis](https://github.com/predis/predis) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/predis/predis/releases)
- [Changelog](https://github.com/predis/predis/blob/main/CHANGELOG.md)
- [Commits](https://github.com/predis/predis/compare/v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: predis/predis
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-05 13:09:42 +00:00
James Cole
3e96bb526c Store secret correctly. 2022-09-05 05:39:47 +02:00
James Cole
1d21a8788c Update packages and meta data. 2022-09-04 13:58:21 +02:00
James Cole
e420ead9e8 Update translations. 2022-09-04 13:53:24 +02:00
James Cole
06b7f18d55 Make 2FA code + validation more robust. Thanks to @jtmoss3991, @timaschew and @Ottega. 2022-09-04 13:32:59 +02:00
James Cole
8659c7efbd Skip error 2022-09-04 13:31:46 +02:00
James Cole
80fe52f5d7 Merge pull request #6383 from firefly-iii/dependabot/composer/develop/guzzlehttp/guzzle-7.5.0
Bump guzzlehttp/guzzle from 7.4.5 to 7.5.0
2022-08-29 05:55:27 +02:00
dependabot[bot]
77358301e8 Bump guzzlehttp/guzzle from 7.4.5 to 7.5.0
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.5 to 7.5.0.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guzzle/guzzle/compare/7.4.5...7.5.0)

---
updated-dependencies:
- dependency-name: guzzlehttp/guzzle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-29 03:55:01 +00:00
James Cole
93ed1de23f Merge pull request #6385 from firefly-iii/dependabot/composer/develop/symfony/http-client-6.0.12
Bump symfony/http-client from 6.0.11 to 6.0.12
2022-08-29 05:54:52 +02:00
James Cole
a81ca5114b Merge pull request #6386 from firefly-iii/dependabot/composer/develop/laravel/passport-11.0.0
Bump laravel/passport from 10.4.1 to 11.0.0
2022-08-29 05:54:35 +02:00
James Cole
9a69b941d8 Merge pull request #6387 from firefly-iii/dependabot/npm_and_yarn/develop/jquery-3.6.1
Bump jquery from 3.6.0 to 3.6.1
2022-08-29 05:54:20 +02:00
dependabot[bot]
194ecc7ac7 Bump symfony/http-client from 6.0.11 to 6.0.12
Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.0.11 to 6.0.12.
- [Release notes](https://github.com/symfony/http-client/releases)
- [Changelog](https://github.com/symfony/http-client/blob/6.1/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-client/compare/v6.0.11...v6.0.12)

---
updated-dependencies:
- dependency-name: symfony/http-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-29 03:53:42 +00:00
dependabot[bot]
44da3be910 Bump laravel/passport from 10.4.1 to 11.0.0
Bumps [laravel/passport](https://github.com/laravel/passport) from 10.4.1 to 11.0.0.
- [Release notes](https://github.com/laravel/passport/releases)
- [Changelog](https://github.com/laravel/passport/blob/11.x/CHANGELOG.md)
- [Upgrade guide](https://github.com/laravel/passport/blob/11.x/UPGRADE.md)
- [Commits](https://github.com/laravel/passport/compare/v10.4.1...v11.0.0)

---
updated-dependencies:
- dependency-name: laravel/passport
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-29 03:53:27 +00:00
James Cole
22de6e61ff Merge pull request #6382 from firefly-iii/dependabot/composer/develop/spatie/laravel-ignition-1.4.0
Bump spatie/laravel-ignition from 1.3.1 to 1.4.0
2022-08-29 05:52:56 +02:00
dependabot[bot]
37f91cabf5 Bump jquery from 3.6.0 to 3.6.1
Bumps [jquery](https://github.com/jquery/jquery) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.6.0...3.6.1)

---
updated-dependencies:
- dependency-name: jquery
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-29 03:02:30 +00:00
dependabot[bot]
7f9d87a117 Bump spatie/laravel-ignition from 1.3.1 to 1.4.0
Bumps [spatie/laravel-ignition](https://github.com/spatie/laravel-ignition) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/spatie/laravel-ignition/releases)
- [Changelog](https://github.com/spatie/laravel-ignition/blob/main/CHANGELOG.md)
- [Commits](https://github.com/spatie/laravel-ignition/compare/1.3.1...1.4.0)

---
updated-dependencies:
- dependency-name: spatie/laravel-ignition
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-29 03:00:45 +00:00
James Cole
52e83c2ec2 Fix https://github.com/firefly-iii/firefly-iii/issues/6379 2022-08-28 06:37:03 +02:00
James Cole
70c08d6b50 Basic amount fix 2022-08-23 05:46:59 +02:00
James Cole
0b49e9b8a8 Basic amount fix 2022-08-23 05:46:43 +02:00
James Cole
6add8765c4 Merge branch 'develop' into 5.8-dev 2022-08-23 05:44:25 +02:00
James Cole
73d97d90ae Merge branch 'main' into develop 2022-08-23 05:44:12 +02:00
James Cole
4d12e6b58b New migration command. 2022-08-23 05:43:40 +02:00
James Cole
43650583fe Merge pull request #6368 from firefly-iii/JC5-patch-4
Update stale.yml
2022-08-23 05:41:17 +02:00
James Cole
3cc0e0f20f Update stale.yml 2022-08-23 03:41:05 +00:00
James Cole
27d6e70469 Merge pull request #6360 from firefly-iii/dependabot/composer/develop/laravel/sanctum-3.0.1
Bump laravel/sanctum from 2.15.1 to 3.0.1
2022-08-22 09:05:32 +02:00
James Cole
ab4ee2fdb0 Merge pull request #6363 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.22
Bump phpunit/phpunit from 9.5.21 to 9.5.22
2022-08-22 09:05:01 +02:00
James Cole
23a09825cb Merge pull request #6362 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.4.2
Bump doctrine/dbal from 3.4.0 to 3.4.2
2022-08-22 09:03:48 +02:00
James Cole
ce1e99be9a Merge pull request #6361 from firefly-iii/dependabot/composer/develop/laravel/framework-9.25.1
Bump laravel/framework from 9.24.0 to 9.25.1
2022-08-22 09:03:31 +02:00
dependabot[bot]
63440c4cb7 Bump phpunit/phpunit from 9.5.21 to 9.5.22
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.21 to 9.5.22.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/main/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.21...9.5.22)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-22 03:01:08 +00:00
dependabot[bot]
e5b30fa156 Bump doctrine/dbal from 3.4.0 to 3.4.2
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.4.0 to 3.4.2.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.4.0...3.4.2)

---
updated-dependencies:
- dependency-name: doctrine/dbal
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-22 03:01:03 +00:00
dependabot[bot]
8c067019f7 Bump laravel/framework from 9.24.0 to 9.25.1
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.24.0 to 9.25.1.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.24.0...v9.25.1)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-22 03:00:59 +00:00
dependabot[bot]
bb3ceaeb0e Bump laravel/sanctum from 2.15.1 to 3.0.1
Bumps [laravel/sanctum](https://github.com/laravel/sanctum) from 2.15.1 to 3.0.1.
- [Release notes](https://github.com/laravel/sanctum/releases)
- [Changelog](https://github.com/laravel/sanctum/blob/3.x/CHANGELOG.md)
- [Upgrade guide](https://github.com/laravel/sanctum/blob/3.x/UPGRADE.md)
- [Commits](https://github.com/laravel/sanctum/compare/v2.15.1...v3.0.1)

---
updated-dependencies:
- dependency-name: laravel/sanctum
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-22 03:00:49 +00:00
James Cole
7cf6066afd Merge branch 'develop' into 5.8-dev 2022-08-21 10:42:01 +02:00
James Cole
b6e8144fe9 Try to catch bad operations. 2022-08-19 20:24:20 +02:00
James Cole
7cabc5db57 Merge pull request #6325 from firefly-iii/dependabot/composer/develop/laravel/sanctum-3.0.1
Bump laravel/sanctum from 2.15.1 to 3.0.1
2022-08-15 06:24:40 +02:00
James Cole
059df6f8ac Merge pull request #6344 from firefly-iii/dependabot/composer/develop/laravel/framework-9.24.0
Bump laravel/framework from 9.23.0 to 9.24.0
2022-08-15 06:23:45 +02:00
dependabot[bot]
6ae43aee5c Bump laravel/framework from 9.23.0 to 9.24.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.23.0 to 9.24.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.23.0...v9.24.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-15 03:00:42 +00:00
James Cole
0ef99077d8 Merge branch 'develop' into 5.8-dev 2022-08-14 15:42:38 +02:00
James Cole
3ea48eb6ee Merge branch 'main' into develop 2022-08-14 15:42:25 +02:00
James Cole
322b6d19d8 Add new roles. 2022-08-14 15:41:06 +02:00
dependabot[bot]
8045d3c170 Bump laravel/sanctum from 2.15.1 to 3.0.1
Bumps [laravel/sanctum](https://github.com/laravel/sanctum) from 2.15.1 to 3.0.1.
- [Release notes](https://github.com/laravel/sanctum/releases)
- [Changelog](https://github.com/laravel/sanctum/blob/3.x/CHANGELOG.md)
- [Upgrade guide](https://github.com/laravel/sanctum/blob/3.x/UPGRADE.md)
- [Commits](https://github.com/laravel/sanctum/compare/v2.15.1...v3.0.1)

---
updated-dependencies:
- dependency-name: laravel/sanctum
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-08 16:14:39 +00:00
James Cole
76885d2c50 Merge pull request #6278 from firefly-iii/dependabot/composer/develop/diglactic/laravel-breadcrumbs-8.0.0
Bump diglactic/laravel-breadcrumbs from 7.2.0 to 8.0.0
2022-08-08 18:13:50 +02:00
dependabot[bot]
a1f7a518e3 Bump diglactic/laravel-breadcrumbs from 7.2.0 to 8.0.0
Bumps [diglactic/laravel-breadcrumbs](https://github.com/diglactic/laravel-breadcrumbs) from 7.2.0 to 8.0.0.
- [Release notes](https://github.com/diglactic/laravel-breadcrumbs/releases)
- [Upgrade guide](https://github.com/diglactic/laravel-breadcrumbs/blob/main/UPGRADE.md)
- [Commits](https://github.com/diglactic/laravel-breadcrumbs/compare/v7.2.0...v8.0.0)

---
updated-dependencies:
- dependency-name: diglactic/laravel-breadcrumbs
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-08 16:12:32 +00:00
James Cole
55205d6107 Merge pull request #6329 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.16
Bump postcss from 8.4.14 to 8.4.16
2022-08-08 18:12:04 +02:00
James Cole
c7ce5632ea Merge pull request #6328 from firefly-iii/dependabot/composer/develop/laravel/framework-9.23.0
Bump laravel/framework from 9.22.1 to 9.23.0
2022-08-08 18:11:48 +02:00
James Cole
91cec7485a Merge pull request #6327 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.4.0
Bump doctrine/dbal from 3.3.7 to 3.4.0
2022-08-08 18:11:38 +02:00
James Cole
37fbc657a7 Merge pull request #6326 from firefly-iii/dependabot/composer/develop/ramsey/uuid-4.4.0
Bump ramsey/uuid from 4.3.1 to 4.4.0
2022-08-08 18:11:25 +02:00
dependabot[bot]
908dc15a3b Bump postcss from 8.4.14 to 8.4.16
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.14 to 8.4.16.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.14...8.4.16)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-08 03:02:03 +00:00
dependabot[bot]
d4bd7c0549 Bump laravel/framework from 9.22.1 to 9.23.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.22.1 to 9.23.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.22.1...v9.23.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-08 03:00:59 +00:00
dependabot[bot]
4c0d6a5259 Bump doctrine/dbal from 3.3.7 to 3.4.0
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.3.7 to 3.4.0.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.3.7...3.4.0)

---
updated-dependencies:
- dependency-name: doctrine/dbal
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-08 03:00:49 +00:00
dependabot[bot]
48c8c5b353 Bump ramsey/uuid from 4.3.1 to 4.4.0
Bumps [ramsey/uuid](https://github.com/ramsey/uuid) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/ramsey/uuid/releases)
- [Changelog](https://github.com/ramsey/uuid/blob/4.x/CHANGELOG.md)
- [Commits](https://github.com/ramsey/uuid/compare/4.3.1...4.4.0)

---
updated-dependencies:
- dependency-name: ramsey/uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-08 03:00:43 +00:00
James Cole
d502c8d286 Merge pull request #6300 from firefly-iii/JC5-patch-3
Update stale.yml
2022-08-07 12:46:22 +02:00
James Cole
79c4fad922 Update stale.yml 2022-08-07 10:45:39 +00:00
James Cole
ae0a675668 Merge branch 'develop' into 5.8-dev 2022-08-07 12:31:09 +02:00
James Cole
b1532ab982 Merge branch 'main' into develop 2022-08-07 12:29:54 +02:00
James Cole
08e65887ca Merge pull request #6296 from firefly-iii/JC5-patch-2
Update closed-issues.yml
2022-08-06 17:42:04 +02:00
James Cole
4c0934bae8 Update closed-issues.yml
Small changes in yaml
2022-08-06 15:39:22 +00:00
James Cole
1670fe5e4d Merge pull request #6294 from firefly-iii/JC5-patch-1
Create closed-issues.yml
2022-08-06 17:31:01 +02:00
James Cole
bba362fb58 Create closed-issues.yml
Add a new workflow for closed issues.
2022-08-06 15:30:45 +00:00
James Cole
4aa361617f Merge pull request #6293 from firefly-iii/add-badge-readme
Add badge.
2022-08-05 04:06:00 +02:00
James Cole
be01b177fa Add badge. 2022-08-05 03:59:05 +02:00
James Cole
4d1b21f70d Merge branch 'develop' into 5.8-dev
# Conflicts:
#	composer.lock
2022-08-03 05:40:31 +02:00
James Cole
aa3fba91d4 Remove the service worker. 2022-08-03 05:39:47 +02:00
James Cole
cc6a7b181a Convert to deposit means the journal loses its bill. 2022-08-02 05:39:04 +02:00
James Cole
c460ccfad5 Conversion to transfer means that the original journal loses the bill. 2022-08-02 05:38:24 +02:00
James Cole
69d875d981 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2022-08-01 19:51:56 +02:00
James Cole
75ea1c4f4b Return amount as string 2022-08-01 19:51:45 +02:00
James Cole
cfbda09e36 Merge pull request #6279 from firefly-iii/dependabot/composer/develop/symfony/http-client-6.0.11
Bump symfony/http-client from 6.0.9 to 6.0.11
2022-08-01 05:59:32 +02:00
James Cole
7746f2ca19 Merge pull request #6277 from firefly-iii/dependabot/composer/develop/laravel/framework-9.22.1
Bump laravel/framework from 9.21.6 to 9.22.1
2022-08-01 05:59:23 +02:00
James Cole
a8fb463520 Merge pull request #6281 from firefly-iii/dependabot/composer/develop/laravel/ui-4.0.0
Bump laravel/ui from 3.4.6 to 4.0.0
2022-08-01 05:59:01 +02:00
James Cole
3ef732b895 Merge pull request #6282 from firefly-iii/dependabot/npm_and_yarn/develop/uiv-1.4.2
Bump uiv from 1.4.1 to 1.4.2
2022-08-01 05:58:52 +02:00
dependabot[bot]
1101af87cb Bump uiv from 1.4.1 to 1.4.2
Bumps [uiv](https://github.com/uiv-lib/uiv) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/uiv-lib/uiv/releases)
- [Commits](https://github.com/uiv-lib/uiv/compare/v1.4.1...v1.4.2)

---
updated-dependencies:
- dependency-name: uiv
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-01 03:01:56 +00:00
dependabot[bot]
c9e0043cc1 Bump laravel/ui from 3.4.6 to 4.0.0
Bumps [laravel/ui](https://github.com/laravel/ui) from 3.4.6 to 4.0.0.
- [Release notes](https://github.com/laravel/ui/releases)
- [Changelog](https://github.com/laravel/ui/blob/4.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/ui/compare/v3.4.6...v4.0.0)

---
updated-dependencies:
- dependency-name: laravel/ui
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-01 03:01:04 +00:00
dependabot[bot]
edb8bb3ce3 Bump symfony/http-client from 6.0.9 to 6.0.11
Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.0.9 to 6.0.11.
- [Release notes](https://github.com/symfony/http-client/releases)
- [Changelog](https://github.com/symfony/http-client/blob/6.1/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-client/compare/v6.0.9...v6.0.11)

---
updated-dependencies:
- dependency-name: symfony/http-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-01 03:00:51 +00:00
dependabot[bot]
ac0f75c808 Bump laravel/framework from 9.21.6 to 9.22.1
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.21.6 to 9.22.1.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.21.6...v9.22.1)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-01 03:00:40 +00:00
James Cole
b39e16c51c Fix https://github.com/firefly-iii/firefly-iii/issues/6271 2022-07-31 11:56:02 +02:00
James Cole
23d3abbf63 Merge pull request #6267 from canoine/develop 2022-07-27 06:29:20 +02:00
canoine
34e5433082 Empty REDIS_PASSWORD 2022-07-27 05:51:09 +02:00
canoine
9fbc4c2ba1 Don't force a default username 2022-07-27 05:07:04 +02:00
canoine
38ed7c1543 Don't force a default username 2022-07-27 05:05:36 +02:00
James Cole
39a928d7f4 Merge branch 'develop' into 5.8-dev 2022-07-26 20:28:32 +02:00
canoine
121561da3e Add redis username to fit 6+ ACL capabilities 2022-07-26 19:33:29 +02:00
canoine
5893b30da8 Add redis username to fit 6+ ACL capabilities 2022-07-26 19:32:37 +02:00
James Cole
858480929c Fix null pointer 2022-07-25 19:43:47 +02:00
James Cole
242fb3b498 Remove debug. 2022-07-25 05:57:11 +02:00
James Cole
47469c7082 Fix transformer. 2022-07-25 05:56:21 +02:00
James Cole
18f2633810 Add debug 2022-07-25 05:54:40 +02:00
James Cole
c50a4ae993 Add debug 2022-07-25 05:52:51 +02:00
James Cole
2db32ce44f Better transformer. 2022-07-25 05:51:59 +02:00
James Cole
38b505d036 Skip empty foreign currency 2022-07-25 05:50:02 +02:00
James Cole
b03a36b87f Add some debug info 2022-07-25 05:48:59 +02:00
James Cole
fa72912349 Add some debug to function 2022-07-25 05:47:26 +02:00
James Cole
7e98fac3b7 Better check on foreign currency. 2022-07-25 05:46:32 +02:00
James Cole
f14c8a2ec2 Add some debug 2022-07-25 05:44:41 +02:00
James Cole
443b76388e Expand frontend 2022-07-25 05:42:49 +02:00
James Cole
7c63f097c8 Merge pull request #6264 from firefly-iii/dependabot/composer/develop/laravel/framework-9.21.6
Bump laravel/framework from 9.21.4 to 9.21.6
2022-07-25 05:38:26 +02:00
dependabot[bot]
037cd75658 Bump laravel/framework from 9.21.4 to 9.21.6
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.21.4 to 9.21.6.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.21.4...v9.21.6)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-25 03:00:48 +00:00
James Cole
4e394d6017 Merge branch 'develop' into 5.8-dev 2022-07-24 08:16:27 +02:00
James Cole
76dadd1cab Fix https://github.com/firefly-iii/firefly-iii/issues/6260 2022-07-24 05:44:35 +02:00
James Cole
d8506c4361 Fix https://github.com/firefly-iii/firefly-iii/issues/6260 2022-07-23 21:50:16 +02:00
James Cole
d49809c939 Fix https://github.com/firefly-iii/firefly-iii/issues/6260 2022-07-23 20:15:55 +02:00
James Cole
ea808b441b Add first budget view 2022-07-23 20:13:24 +02:00
James Cole
a464ad015f Merge branch 'develop' into 5.8-dev 2022-07-23 19:26:15 +02:00
James Cole
e8ec13ca5f Fix https://github.com/firefly-iii/firefly-iii/issues/6260 2022-07-23 16:47:05 +02:00
James Cole
7f694ede98 Merge pull request #6255 from rickdoesdev/develop
Use Piggy Bank's start date in suggested monthly calc
2022-07-22 11:31:30 +00:00
Rick Cuddy
203ae2812f Use Piggy Bank's start date in monthly suggestion #6254 2022-07-22 20:12:32 +10:00
James Cole
20dfeae653 Merge branch 'release/5.7.10' 2022-07-21 17:01:38 +02:00
James Cole
397c0abebe Merge tag '5.7.10' into develop
5.7.10
2022-07-21 17:01:38 +02:00
James Cole
72ef7ac5e4 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	frontend/yarn.lock
2022-07-21 16:56:27 +02:00
James Cole
9f8e33a1ec Update final files 2022-07-21 16:51:15 +02:00
James Cole
0b378b51f8 Merge branch 'main' into develop 2022-07-21 16:41:52 +02:00
James Cole
20ab457222 Various new stuff 2022-07-21 16:41:28 +02:00
James Cole
b138812e1a Merge pull request #6246 from firefly-iii/dependabot/npm_and_yarn/frontend/terser-5.14.2
Bump terser from 5.12.1 to 5.14.2 in /frontend
2022-07-21 06:14:44 +00:00
James Cole
dcfd4d6672 Merge pull request #6247 from firefly-iii/dependabot/npm_and_yarn/terser-4.8.1
Bump terser from 4.8.0 to 4.8.1
2022-07-21 06:14:31 +00:00
dependabot[bot]
11b109d425 Bump terser from 4.8.0 to 4.8.1
Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-21 05:22:32 +00:00
dependabot[bot]
ba1f0d9a24 Bump terser from 5.12.1 to 5.14.2 in /frontend
Bumps [terser](https://github.com/terser/terser) from 5.12.1 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-21 01:59:45 +00:00
James Cole
3cdae5a851 Merge pull request #6240 from firefly-iii/dependabot/composer/develop/league/commonmark-2.3.4
Bump league/commonmark from 2.3.3 to 2.3.4
2022-07-18 07:59:20 +00:00
dependabot[bot]
7c162fe87f Bump league/commonmark from 2.3.3 to 2.3.4
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.3.3 to 2.3.4.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/2.3/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.3.3...2.3.4)

---
updated-dependencies:
- dependency-name: league/commonmark
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-18 03:00:41 +00:00
James Cole
eb8f595541 Fix transaction lists. 2022-07-17 08:51:53 +02:00
James Cole
6b6107fb00 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	config/firefly.php
#	frontend/src/i18n/nb_NO/index.js
#	frontend/src/i18n/nl_NL/index.js
#	frontend/src/i18n/ru_RU/index.js
2022-07-17 08:18:18 +02:00
James Cole
b4feb27118 Fix #6118 2022-07-17 07:18:50 +02:00
James Cole
2e8ea7493a Update packages. 2022-07-16 17:26:10 +02:00
James Cole
d26a5a6e9c Fix https://github.com/firefly-iii/firefly-iii/issues/6150 2022-07-16 17:15:44 +02:00
James Cole
29dce924cf Accounts could not share number. Fix #6165 2022-07-16 17:11:14 +02:00
James Cole
2bd068211b Fix #6168 2022-07-16 16:59:17 +02:00
James Cole
1406abe7ae Merge branch 'develop' into 5.8-dev
# Conflicts:
#	yarn.lock
2022-07-16 09:46:43 +02:00
James Cole
c97792d1d1 Update packages 2022-07-16 09:44:28 +02:00
James Cole
ef23948b41 Update packages and rebuild 2022-07-16 09:40:52 +02:00
James Cole
4e47641c76 Update packages 2022-07-16 09:26:30 +02:00
James Cole
0e8d2c5f0a Rebuild frontend 2022-07-16 09:26:19 +02:00
James Cole
9493046212 Add strict types, add debug info 2022-07-16 09:25:10 +02:00
James Cole
5c3b4d1663 Uninstall vuex 2022-07-10 06:29:01 +02:00
James Cole
5e8671d24b Expand code and upgrade. 2022-07-10 06:23:59 +02:00
James Cole
9118a153d5 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	composer.lock
#	yarn.lock
2022-07-09 17:25:39 +02:00
James Cole
b97988a597 Update packages to shutup dependabot. 2022-07-05 19:16:53 +02:00
James Cole
56ff25285c Expand frontend and API 2022-07-05 19:12:22 +02:00
James Cole
2f20bac734 Merge pull request #6211 from firefly-iii/dependabot/composer/develop/laravel/framework-9.19.0
Bump laravel/framework from 9.18.0 to 9.19.0
2022-07-04 05:07:21 +00:00
dependabot[bot]
4b23ca1186 Bump laravel/framework from 9.18.0 to 9.19.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.18.0 to 9.19.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.18.0...v9.19.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-04 04:21:59 +00:00
James Cole
cb7e766321 Merge pull request #6212 from firefly-iii/dependabot/composer/develop/nunomaduro/collision-6.2.1
Bump nunomaduro/collision from 6.2.0 to 6.2.1
2022-07-04 04:21:02 +00:00
dependabot[bot]
a63f1c30d9 Bump nunomaduro/collision from 6.2.0 to 6.2.1
Bumps [nunomaduro/collision](https://github.com/nunomaduro/collision) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/nunomaduro/collision/releases)
- [Changelog](https://github.com/nunomaduro/collision/blob/stable/CHANGELOG.md)
- [Commits](https://github.com/nunomaduro/collision/compare/v6.2.0...v6.2.1)

---
updated-dependencies:
- dependency-name: nunomaduro/collision
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-04 03:01:20 +00:00
James Cole
196c504b3d Fix nullpointer 2022-07-03 08:45:08 +02:00
James Cole
68755137e4 Fix routes 2022-07-03 08:33:01 +02:00
James Cole
19bef9b725 Update command. 2022-07-03 08:31:17 +02:00
James Cole
34e006d87b Also update orphans. 2022-07-03 08:24:04 +02:00
James Cole
d215510124 Expand data quality command. 2022-07-03 08:16:51 +02:00
James Cole
9d75ac221c Merge pull request #6193 from firefly-iii/dependabot/npm_and_yarn/develop/vue-i18n-8.27.2
Bump vue-i18n from 8.27.1 to 8.27.2
2022-06-27 03:48:00 +00:00
James Cole
e610c3d6ab Merge pull request #6192 from firefly-iii/dependabot/composer/develop/laravel/framework-9.18.0
Bump laravel/framework from 9.17.0 to 9.18.0
2022-06-27 03:47:47 +00:00
James Cole
96d70a84ab Merge pull request #6191 from firefly-iii/dependabot/composer/develop/guzzlehttp/guzzle-7.4.5
Bump guzzlehttp/guzzle from 7.4.4 to 7.4.5
2022-06-27 03:47:31 +00:00
dependabot[bot]
3f6abdb457 Bump vue-i18n from 8.27.1 to 8.27.2
Bumps [vue-i18n](https://github.com/intlify/vue-i18n-next/tree/HEAD/packages/vue-i18n) from 8.27.1 to 8.27.2.
- [Release notes](https://github.com/intlify/vue-i18n-next/releases)
- [Changelog](https://github.com/intlify/vue-i18n-next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/intlify/vue-i18n-next/commits/HEAD/packages/vue-i18n)

---
updated-dependencies:
- dependency-name: vue-i18n
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-27 03:05:21 +00:00
dependabot[bot]
00d19241d9 Bump laravel/framework from 9.17.0 to 9.18.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.17.0 to 9.18.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.17.0...v9.18.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-27 03:01:20 +00:00
dependabot[bot]
7c44cae83c Bump guzzlehttp/guzzle from 7.4.4 to 7.4.5
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.4 to 7.4.5.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guzzle/guzzle/compare/7.4.4...7.4.5)

---
updated-dependencies:
- dependency-name: guzzlehttp/guzzle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-27 03:01:06 +00:00
Sander Dorigo
9652c86782 tight param for api macro 2022-06-25 14:37:15 +02:00
Sander Dorigo
cea8c4c217 FIx issue with rule action 2022-06-25 14:36:53 +02:00
Sander Dorigo
03637a080c Merge branch '5.8-dev' of github.com:firefly-iii/firefly-iii into 5.8-dev 2022-06-25 14:36:34 +02:00
James Cole
e27cffcf31 Empty controllers. 2022-06-25 14:24:14 +02:00
James Cole
f52144d8d9 Expand code. 2022-06-25 14:23:52 +02:00
Sander Dorigo
b12d72bef6 New code for API 2 2022-06-23 09:33:43 +02:00
James Cole
4e6dc3bcef Merge pull request #6184 from firefly-iii/dependabot/composer/guzzlehttp/guzzle-7.4.5
Bump guzzlehttp/guzzle from 7.4.4 to 7.4.5
2022-06-22 05:23:15 +00:00
dependabot[bot]
c1cd322f8f Bump guzzlehttp/guzzle from 7.4.4 to 7.4.5
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.4 to 7.4.5.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guzzle/guzzle/compare/7.4.4...7.4.5)

---
updated-dependencies:
- dependency-name: guzzlehttp/guzzle
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-21 21:02:11 +00:00
James Cole
0995d78506 Merge pull request #6175 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.21
Bump phpunit/phpunit from 9.5.20 to 9.5.21
2022-06-20 05:39:37 +00:00
dependabot[bot]
34c9823096 Bump phpunit/phpunit from 9.5.20 to 9.5.21
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.5.20 to 9.5.21.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/main/ChangeLog-9.5.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.5.20...9.5.21)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-20 05:39:27 +00:00
James Cole
040ba2cf8b Merge pull request #6176 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.3.7
Bump doctrine/dbal from 3.3.6 to 3.3.7
2022-06-20 05:38:46 +00:00
James Cole
08896c5813 Merge pull request #6177 from firefly-iii/dependabot/composer/develop/spatie/laravel-ignition-1.3.1
Bump spatie/laravel-ignition from 1.2.4 to 1.3.1
2022-06-20 05:38:02 +00:00
James Cole
ebe67b14c1 Merge pull request #6178 from firefly-iii/dependabot/composer/develop/pragmarx/google2fa-8.0.1
Bump pragmarx/google2fa from 8.0.0 to 8.0.1
2022-06-20 05:37:40 +00:00
dependabot[bot]
75ed1fbbfc Bump pragmarx/google2fa from 8.0.0 to 8.0.1
Bumps [pragmarx/google2fa](https://github.com/antonioribeiro/google2fa) from 8.0.0 to 8.0.1.
- [Release notes](https://github.com/antonioribeiro/google2fa/releases)
- [Changelog](https://github.com/antonioribeiro/google2fa/blob/8.x/CHANGELOG.md)
- [Commits](https://github.com/antonioribeiro/google2fa/compare/8.0.0...v8.0.1)

---
updated-dependencies:
- dependency-name: pragmarx/google2fa
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-20 03:00:56 +00:00
dependabot[bot]
e39c0c8414 Bump spatie/laravel-ignition from 1.2.4 to 1.3.1
Bumps [spatie/laravel-ignition](https://github.com/spatie/laravel-ignition) from 1.2.4 to 1.3.1.
- [Release notes](https://github.com/spatie/laravel-ignition/releases)
- [Changelog](https://github.com/spatie/laravel-ignition/blob/main/CHANGELOG.md)
- [Commits](https://github.com/spatie/laravel-ignition/compare/1.2.4...1.3.1)

---
updated-dependencies:
- dependency-name: spatie/laravel-ignition
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-20 03:00:51 +00:00
dependabot[bot]
769fb7c218 Bump doctrine/dbal from 3.3.6 to 3.3.7
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.3.6 to 3.3.7.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.3.6...3.3.7)

---
updated-dependencies:
- dependency-name: doctrine/dbal
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-20 03:00:44 +00:00
James Cole
359a5656e8 Update cleanup.yml 2022-06-16 20:19:13 +02:00
James Cole
8e3b5f9cbc Create cleanup.yml 2022-06-15 03:28:52 +00:00
James Cole
a9747d668a Merge pull request #6162 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.49
Bump laravel-mix from 6.0.48 to 6.0.49
2022-06-13 06:26:04 +00:00
James Cole
9c815c916f Merge pull request #6161 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.37
Bump @vue/compiler-sfc from 3.2.36 to 3.2.37
2022-06-13 06:25:56 +00:00
James Cole
faa995fd01 Merge pull request #6160 from firefly-iii/dependabot/composer/develop/guzzlehttp/guzzle-7.4.4
Bump guzzlehttp/guzzle from 7.4.3 to 7.4.4
2022-06-13 06:25:47 +00:00
James Cole
be224367bb Merge pull request #6159 from firefly-iii/dependabot/composer/develop/predis/predis-2.0.0
Bump predis/predis from 1.1.10 to 2.0.0
2022-06-13 06:25:37 +00:00
James Cole
609ff7d2aa Merge pull request #6158 from firefly-iii/dependabot/composer/develop/laravel/framework-9.17.0
Bump laravel/framework from 9.16.0 to 9.17.0
2022-06-13 06:23:27 +00:00
James Cole
10544e5fbd Merge pull request #6157 from firefly-iii/dependabot/composer/develop/league/commonmark-2.3.3
Bump league/commonmark from 2.3.2 to 2.3.3
2022-06-13 06:23:17 +00:00
James Cole
812e767ba4 Merge pull request #6156 from firefly-iii/dependabot/composer/develop/spatie/laravel-ignition-1.2.4
Bump spatie/laravel-ignition from 1.2.3 to 1.2.4
2022-06-13 06:23:08 +00:00
dependabot[bot]
134f0cfcd1 Bump laravel-mix from 6.0.48 to 6.0.49
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.48 to 6.0.49.
- [Release notes](https://github.com/JeffreyWay/laravel-mix/releases)
- [Changelog](https://github.com/laravel-mix/laravel-mix/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JeffreyWay/laravel-mix/commits)

---
updated-dependencies:
- dependency-name: laravel-mix
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 03:01:43 +00:00
dependabot[bot]
e46adb6539 Bump @vue/compiler-sfc from 3.2.36 to 3.2.37
Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc) from 3.2.36 to 3.2.37.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits/v3.2.37/packages/compiler-sfc)

---
updated-dependencies:
- dependency-name: "@vue/compiler-sfc"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 03:01:33 +00:00
dependabot[bot]
97c1233e89 Bump guzzlehttp/guzzle from 7.4.3 to 7.4.4
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guzzle/guzzle/compare/7.4.3...7.4.4)

---
updated-dependencies:
- dependency-name: guzzlehttp/guzzle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 03:01:06 +00:00
dependabot[bot]
3e0d8e024c Bump predis/predis from 1.1.10 to 2.0.0
Bumps [predis/predis](https://github.com/predis/predis) from 1.1.10 to 2.0.0.
- [Release notes](https://github.com/predis/predis/releases)
- [Changelog](https://github.com/predis/predis/blob/main/CHANGELOG.md)
- [Commits](https://github.com/predis/predis/compare/v1.1.10...v2.0.0)

---
updated-dependencies:
- dependency-name: predis/predis
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 03:01:01 +00:00
dependabot[bot]
1f7fbf57af Bump laravel/framework from 9.16.0 to 9.17.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.16.0 to 9.17.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.16.0...v9.17.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 03:00:56 +00:00
dependabot[bot]
ade653c393 Bump league/commonmark from 2.3.2 to 2.3.3
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.3.2 to 2.3.3.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/2.3/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.3.2...2.3.3)

---
updated-dependencies:
- dependency-name: league/commonmark
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 03:00:46 +00:00
dependabot[bot]
016395fe8a Bump spatie/laravel-ignition from 1.2.3 to 1.2.4
Bumps [spatie/laravel-ignition](https://github.com/spatie/laravel-ignition) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/spatie/laravel-ignition/releases)
- [Changelog](https://github.com/spatie/laravel-ignition/blob/main/CHANGELOG.md)
- [Commits](https://github.com/spatie/laravel-ignition/compare/1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: spatie/laravel-ignition
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 03:00:41 +00:00
James Cole
e0c9d3627e Fix bills. 2022-06-10 17:45:25 +02:00
James Cole
07fe4400ed Merge pull request #6153 from firefly-iii/dependabot/composer/guzzlehttp/guzzle-7.4.4
Bump guzzlehttp/guzzle from 7.4.3 to 7.4.4
2022-06-10 15:40:45 +00:00
James Cole
70ddbd743c Small change in conversion 2022-06-10 17:39:00 +02:00
James Cole
5a02006a42 Remove code. 2022-06-10 17:35:34 +02:00
dependabot[bot]
cc7db2b614 Bump guzzlehttp/guzzle from 7.4.3 to 7.4.4
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guzzle/guzzle/compare/7.4.3...7.4.4)

---
updated-dependencies:
- dependency-name: guzzlehttp/guzzle
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-10 06:50:51 +00:00
James Cole
1b2106d43b Better handling of DB errors. 2022-06-10 06:00:01 +02:00
James Cole
86d15435a5 Update frontend build. 2022-06-09 20:31:44 +02:00
James Cole
beed44f065 Add cron job to download transaction currencies from Azure (if enabled by user). 2022-06-09 17:47:01 +02:00
James Cole
de3376c966 Fix https://github.com/firefly-iii/firefly-iii/issues/6148 2022-06-09 05:56:50 +02:00
James Cole
313676e3be Add transaction lists 2022-06-09 05:45:45 +02:00
James Cole
86d4549874 Updated code. 2022-06-07 19:46:09 +02:00
James Cole
c3bd46d7c0 Preference can be turned on and off (is always off now) 2022-06-07 19:24:08 +02:00
James Cole
46e97f95f9 Merge branch 'develop' into 5.8-dev
# Conflicts:
#	composer.lock
2022-06-06 17:41:34 +02:00
James Cole
f13dd18b6f Update boxes. 2022-06-06 17:39:50 +02:00
James Cole
c916fbbee9 Add code for budgets 2022-06-06 16:41:54 +02:00
James Cole
d007db166a Various code for currency exchange rate support 2022-06-06 14:40:19 +02:00
James Cole
d3314e0130 Merge pull request #6136 from firefly-iii/dependabot/composer/develop/laravel/framework-9.16.0
Bump laravel/framework from 9.14.1 to 9.16.0
2022-06-06 04:39:31 +00:00
James Cole
75b033c563 Merge pull request #6137 from firefly-iii/dependabot/composer/develop/spatie/data-transfer-object-3.8.1
Bump spatie/data-transfer-object from 3.7.3 to 3.8.1
2022-06-06 04:39:14 +00:00
James Cole
f451efd90c Merge pull request #6138 from firefly-iii/dependabot/composer/develop/league/commonmark-2.3.2
Bump league/commonmark from 2.3.1 to 2.3.2
2022-06-06 04:39:02 +00:00
James Cole
81f2c59ae4 Merge pull request #6139 from firefly-iii/dependabot/npm_and_yarn/develop/laravel-mix-6.0.48
Bump laravel-mix from 6.0.43 to 6.0.48
2022-06-06 04:38:50 +00:00
dependabot[bot]
ef67355e3b Bump laravel-mix from 6.0.43 to 6.0.48
Bumps [laravel-mix](https://github.com/JeffreyWay/laravel-mix) from 6.0.43 to 6.0.48.
- [Release notes](https://github.com/JeffreyWay/laravel-mix/releases)
- [Changelog](https://github.com/laravel-mix/laravel-mix/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JeffreyWay/laravel-mix/commits)

---
updated-dependencies:
- dependency-name: laravel-mix
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-06 03:02:12 +00:00
dependabot[bot]
4201bc16a1 Bump league/commonmark from 2.3.1 to 2.3.2
Bumps [league/commonmark](https://github.com/thephpleague/commonmark) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/thephpleague/commonmark/releases)
- [Changelog](https://github.com/thephpleague/commonmark/blob/2.3/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/commonmark/compare/2.3.1...2.3.2)

---
updated-dependencies:
- dependency-name: league/commonmark
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-06 03:01:04 +00:00
dependabot[bot]
14d58c9834 Bump spatie/data-transfer-object from 3.7.3 to 3.8.1
Bumps [spatie/data-transfer-object](https://github.com/spatie/data-transfer-object) from 3.7.3 to 3.8.1.
- [Release notes](https://github.com/spatie/data-transfer-object/releases)
- [Changelog](https://github.com/spatie/data-transfer-object/blob/main/CHANGELOG.md)
- [Commits](https://github.com/spatie/data-transfer-object/compare/3.7.3...3.8.1)

---
updated-dependencies:
- dependency-name: spatie/data-transfer-object
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-06 03:00:58 +00:00
dependabot[bot]
8ac9fe7e69 Bump laravel/framework from 9.14.1 to 9.16.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.14.1 to 9.16.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.14.1...v9.16.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-06 03:00:54 +00:00
James Cole
9c08b9f1d3 Small update to frontend and associated code. 2022-06-05 20:02:43 +02:00
James Cole
6b2619c5cc Clean up index and add some new strings. 2022-06-05 16:18:28 +02:00
James Cole
2ace09eb49 Update version 2022-06-05 15:39:31 +02:00
James Cole
47167c06ae Rebuild frontend. 2022-06-05 14:09:30 +02:00
James Cole
2d62fcac06 Fix final modals. 2022-06-05 14:05:02 +02:00
James Cole
eeda74d79c Update templates 2022-06-05 13:37:43 +02:00
James Cole
4cf23a954f New view and new login layout 2022-06-05 11:50:45 +02:00
James Cole
0bc1e6dbaa Add local css & js 2022-06-05 11:50:23 +02:00
James Cole
7da0c94e45 Update packages 2022-06-05 11:49:11 +02:00
James Cole
69b1985ac0 Update packages 2022-06-04 21:07:57 +02:00
James Cole
61eb8f325e Merge branch 'develop' into 5.8-dev
# Conflicts:
#	frontend/package.json
#	frontend/yarn.lock
2022-06-04 21:05:56 +02:00
James Cole
0ab92114a5 Remove old v2 stuff. 2022-06-04 21:03:55 +02:00
James Cole
66310b494b Update packages 2022-06-04 09:06:19 +02:00
James Cole
805d3ec975 Fix null pointer 2022-06-02 05:49:49 +02:00
James Cole
f83ab0a7dc Fix sqlite issues. 2022-06-01 19:23:40 +02:00
James
ced55b5065 Fix #6122 2022-06-01 15:31:17 +02:00
James Cole
986863f1d2 Merge branch 'release/5.7.9' 2022-05-31 06:17:35 +02:00
James Cole
d1529a0cfc Merge tag '5.7.9' into develop
5.7.9
2022-05-31 06:17:35 +02:00
James Cole
f3ceba5325 Sloppy requirement would push Symfony to PHP 8.1. 2022-05-31 06:17:16 +02:00
James Cole
711b4c62b5 Merge branch 'release/5.7.8' 2022-05-31 06:13:18 +02:00
James Cole
f441f68da6 Merge tag '5.7.8' into develop
5.7.8
2022-05-31 06:13:18 +02:00
James Cole
2cf8bb2537 Update meta files for new release. 2022-05-31 06:12:56 +02:00
James Cole
bf434e5d42 Sloppy requirement would push Symfony to PHP 8.1. 2022-05-31 06:10:53 +02:00
James Cole
b1ea36ae5b Merge branch 'release/5.7.7' 2022-05-31 06:05:39 +02:00
James Cole
5f3524c5aa Merge tag '5.7.7' into develop
5.7.7
2022-05-31 06:05:39 +02:00
James Cole
2f75437ac1 Code for new release. 2022-05-31 06:05:21 +02:00
James Cole
6c945bfd60 Fix https://github.com/firefly-iii/firefly-iii/issues/5996 2022-05-31 05:56:38 +02:00
James Cole
82f993f0ff Merge branch 'main' into develop 2022-05-31 05:54:51 +02:00
James Cole
08f3f2aeb9 Small fix 2022-05-31 05:27:47 +02:00
James Cole
099fc49c4b Fix #6113 2022-05-30 20:48:56 +02:00
James Cole
6f2c46cb36 Merge pull request #6109 from firefly-iii/dependabot/composer/develop/guzzlehttp/guzzle-7.4.3
Bump guzzlehttp/guzzle from 7.4.2 to 7.4.3
2022-05-30 17:09:06 +00:00
James Cole
135424f8b8 Merge pull request #6110 from firefly-iii/dependabot/composer/develop/laravel/framework-9.14.1
Bump laravel/framework from 9.13.0 to 9.14.1
2022-05-30 17:08:55 +00:00
James Cole
9534fa59d6 Merge pull request #6111 from firefly-iii/dependabot/composer/develop/laravel/ui-3.4.6
Bump laravel/ui from 3.4.5 to 3.4.6
2022-05-30 17:08:44 +00:00
James Cole
51ae15a650 Merge pull request #6112 from firefly-iii/dependabot/composer/develop/symfony/http-client-6.0.9
Bump symfony/http-client from 6.0.8 to 6.0.9
2022-05-30 17:07:59 +00:00
dependabot[bot]
29776fa98c Bump symfony/http-client from 6.0.8 to 6.0.9
Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.0.8 to 6.0.9.
- [Release notes](https://github.com/symfony/http-client/releases)
- [Changelog](https://github.com/symfony/http-client/blob/6.1/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-client/compare/v6.0.8...v6.0.9)

---
updated-dependencies:
- dependency-name: symfony/http-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-30 03:01:24 +00:00
dependabot[bot]
7ddffb9251 Bump laravel/ui from 3.4.5 to 3.4.6
Bumps [laravel/ui](https://github.com/laravel/ui) from 3.4.5 to 3.4.6.
- [Release notes](https://github.com/laravel/ui/releases)
- [Changelog](https://github.com/laravel/ui/blob/3.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/ui/compare/v3.4.5...v3.4.6)

---
updated-dependencies:
- dependency-name: laravel/ui
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-30 03:01:18 +00:00
dependabot[bot]
069770b39e Bump laravel/framework from 9.13.0 to 9.14.1
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.13.0 to 9.14.1.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.13.0...v9.14.1)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-30 03:01:08 +00:00
dependabot[bot]
626119d774 Bump guzzlehttp/guzzle from 7.4.2 to 7.4.3
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.2 to 7.4.3.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guzzle/guzzle/compare/7.4.2...7.4.3)

---
updated-dependencies:
- dependency-name: guzzlehttp/guzzle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-30 03:00:53 +00:00
James Cole
993d18d508 Merge pull request #6104 from firefly-iii/dependabot/composer/guzzlehttp/guzzle-7.4.3
Bump guzzlehttp/guzzle from 7.4.2 to 7.4.3
2022-05-26 04:09:31 +00:00
dependabot[bot]
7b84c7c2dc Bump guzzlehttp/guzzle from 7.4.2 to 7.4.3
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.2 to 7.4.3.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guzzle/guzzle/compare/7.4.2...7.4.3)

---
updated-dependencies:
- dependency-name: guzzlehttp/guzzle
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-25 22:27:32 +00:00
James Cole
76429c923e Merge pull request #6101 from LuxChanLu/develop
feat: add the ability to disable mime check on attachement upload
2022-05-25 14:49:43 +00:00
Hugo Meyronneinc
ca1b048758 add eml and json allowed mime types 2022-05-25 14:32:25 +02:00
James Cole
fb11971b84 Merge pull request #6091 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.36
Bump @vue/compiler-sfc from 3.2.33 to 3.2.36
2022-05-23 06:45:38 +00:00
James Cole
465542b0f5 Merge pull request #6092 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.14
Bump postcss from 8.4.13 to 8.4.14
2022-05-23 06:45:29 +00:00
dependabot[bot]
5185a3ed5a Bump postcss from 8.4.13 to 8.4.14
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.13 to 8.4.14.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.13...8.4.14)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-23 03:02:07 +00:00
dependabot[bot]
4d1615197d Bump @vue/compiler-sfc from 3.2.33 to 3.2.36
Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc) from 3.2.33 to 3.2.36.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits/v3.2.36/packages/compiler-sfc)

---
updated-dependencies:
- dependency-name: "@vue/compiler-sfc"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-23 03:01:56 +00:00
James Cole
83c6887ed0 Merge pull request #6085 from turrisxyz/Dependency-GitHub 2022-05-19 05:37:55 +02:00
naveen
9d1e20192d chore(deps): Included dependency review
> Dependency Review GitHub Action in your repository to enforce dependency
> reviews on your pull requests.
> The action scans for vulnerable versions of dependencies introduced by package version
> changes in pull requests,
> and warns you about the associated security vulnerabilities.
> This gives you better visibility of what's changing in a pull request,
> and helps prevent vulnerabilities being added to your repository.

https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-05-19 00:12:46 +00:00
James Cole
40ec63ddb9 Merge tag '5.7.6' into develop
5.7.6
2022-05-18 06:53:04 +02:00
James Cole
35a8016744 Fix store references 2022-05-08 09:32:07 +02:00
James Cole
9020ed158c Various fixes 2022-05-07 19:26:37 +02:00
James Cole
2e3071d40f Merge branch 'develop' into 5.8-dev 2022-05-07 17:12:31 +02:00
James Cole
20852acc78 Merge branch 'develop' into 5.8-dev 2022-05-02 18:55:17 +02:00
James Cole
0babe84a33 Frontend updates 2022-05-02 18:54:43 +02:00
James Cole
8c64c1d5e4 Merge branch 'develop' into 5.8-dev 2022-04-30 13:00:52 +02:00
James Cole
cfcf860438 Restore enums, replace one to enforce php 8.1 compatibility. 2022-04-13 16:27:01 +02:00
James Cole
71d53fbda4 Revert "Replace various enums"
This reverts commit 089514908d.
2022-04-13 16:23:02 +02:00
James Cole
4a3c2d5d97 Rename some enums 2022-04-13 16:22:36 +02:00
James Cole
089514908d Replace various enums 2022-04-13 14:39:13 +02:00
James Cole
9cfced1732 Move constants to dedicated enum 2022-04-13 14:21:33 +02:00
James Cole
a2627b5158 Move constants to dedicated enum 2022-04-13 14:21:17 +02:00
James Cole
342e9a263a Move constants to dedicated enum 2022-04-13 14:20:59 +02:00
James Cole
1d90748e4d Move constants to dedicated enum 2022-04-13 14:20:31 +02:00
James Cole
40efaa1017 Move budget rollover types to enum class. 2022-04-13 14:20:07 +02:00
James Cole
641683d431 Move account types to enum class. 2022-04-13 14:19:42 +02:00
James Cole
b10c1044bd Merge branch 'develop' into 5.8-dev 2022-04-13 14:11:48 +02:00
James Cole
5c069caea1 Create first enum 2022-04-13 14:09:23 +02:00
James Cole
e78f2213ed Require php 8.1 2022-04-13 14:09:14 +02:00
2127 changed files with 160009 additions and 40986 deletions

1
.ci/php-cs-fixer/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
vendor

View File

@@ -0,0 +1,44 @@
<?php
/*
* .php-cs-fixer.php
* Copyright (c) 2022 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/>.
*/
$current = __DIR__;
$paths = [
$current . '/../../app',
$current . '/../../config',
$current . '/../../database',
$current . '/../../routes',
$current . '/../../tests',
$current . '/../../resources/lang',
];
$finder = PhpCsFixer\Finder::create()
->in($paths);
$config = new PhpCsFixer\Config();
return $config->setRules([
'@PSR12' => true,
'strict_param' => true,
'array_syntax' => ['syntax' => 'short'],
])
->setFinder($finder)
;

View File

@@ -0,0 +1,5 @@
{
"require": {
"friendsofphp/php-cs-fixer": "^3.12"
}
}

2053
.ci/php-cs-fixer/composer.lock generated Normal file

File diff suppressed because it is too large Load Diff

37
.ci/phpcs.sh Executable file
View File

@@ -0,0 +1,37 @@
#!/usr/bin/env bash
#
# phpstan.sh
# 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/>.
#
# Install composer packages
#composer install --no-scripts --no-ansi
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
# enable test .env file.
# cp .ci/.env.ci .env
# clean up php code
cd $SCRIPT_DIR/php-cs-fixer
composer update
PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php --allow-risky=yes
cd $SCRIPT_DIR/..
exit 0

View File

@@ -8,26 +8,63 @@ parameters:
ignoreErrors:
- '#is not allowed to extend#'
- '#is neither abstract nor final#'
- '#Control structures using switch should not be used\.#'
- '#has a nullable return type declaration#'
- '#with a nullable type declaration#'
- '#with null as default value#'
- '#Constructor in [a-zA-Z0-9\\_]+ has parameter \$[a-zA-Z0-9\\_]+ with default value#'
- '#is not covariant with PHPDoc type array#'
-
message: '#Function compact\(\) should not be used.#'
message: '#but containers should not be injected#'
paths:
- ../app/Http/Controllers
- ../app/Support/Http/Controllers/RenderPartialViews.php
- ../app/Support/Form/FormSupport.php
- ../app/Support/Form/CurrencyForm.php
- ../app/Support/Form/AccountForm.php
- ../app/Support/Authentication/RemoteUserGuard.php
-
message: '#Control structures using switch should not be used.#'
paths:
- ../app/Api/V1/Controllers/Data/DestroyController.php
- ../app/Console/Commands/Correction/FixAccountTypes.php
- ../app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
- ../app/Exceptions/GracefulNotFoundHandler.php
- ../app/Generator/Webhook/StandardMessageGenerator.php
- ../app/Support/Amount.php
- ../app/Support/Navigation.php
- ../app/Support/ParseDateString.php
- ../app/Support/Search/AccountSearch.php
- ../app/Support/Search/OperatorQuerySearch.php
- ../app/Support/Twig/General.php
- ../app/Transformers/RecurrenceTransformer.php
- ../app/Validation/AccountValidator.php
- ../app/Validation/RecurrenceValidation.php
- ../app/Validation/TransactionValidation.php
-
message: '#Function compact\(\) should not be used#'
paths:
- ../app/Generator/Report/Account/MonthReportGenerator.php
- ../app/Generator/Report/Audit/MonthReportGenerator.php
- ../app/Generator/Report/Budget/MonthReportGenerator.php
- ../app/Generator/Report/Category/MonthReportGenerator.php
- ../app/Generator/Report/Standard/MonthReportGenerator.php
- ../app/Generator/Report/Standard/MultiYearReportGenerator.php
- ../app/Generator/Report/Standard/YearReportGenerator.php
- ../app/Generator/Report/Tag/MonthReportGenerator.php
- ../app/Http/Controllers/Account/*.php
- ../app/Http/Controllers/Admin/*.php
- ../app/Http/Controllers/*.php
- ../app/Support/ExpandedForm.php
- ../app/Generator/Report
- ../app/Support/Form/AccountForm.php
- ../app/Support/Form/CurrencyForm.php
- ../app/Support/Form/FormSupport.php
-
message: '#Either catch a more specific exception#'
paths:
- ../app/Support/Form/FormSupport.php
paths:
- ../app
- ../database
- ../routes
- ../config
- ../bootstrap/app.php
# The level 8 is the highest level. original was 5
level: 3
level: 4

View File

@@ -23,11 +23,11 @@
# Install composer packages
#composer install --no-scripts --no-ansi
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
# enable test .env file.
cp .ci/.env.ci .env
# cp .ci/.env.ci .env
# Do static code analysis.
# ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress
./vendor/bin/phpstan analyse -c .ci/phpstan.neon
exit 0
./vendor/bin/phpstan analyse -c .ci/phpstan.neon --xdebug --error-format=table > phpstan-report.txt

View File

@@ -1,5 +1,7 @@
bg_BG
ca_ES
cs_CZ
da_DK
de_DE
el_GR
en_GB
@@ -8,7 +10,9 @@ es_ES
fi_FI
fr_FR
hu_HU
id_ID
it_IT
ja_JP
nb_NO
nl_NL
pl_PL
@@ -17,7 +21,10 @@ pt_PT
ro_RO
ru_RU
sk_SK
sl_SI
sv_SE
tr_TR
uk_UA
vi_VN
zh-hans_CN
zh-hant_CN

View File

@@ -7,11 +7,15 @@ APP_DEBUG=false
# This should be your email address.
# If you use Docker or similar, you can set this variable from a file by using SITE_OWNER_FILE
# The variable is used in some errors shown to users who aren't admin.
SITE_OWNER=mail@example.com
# The encryption key for your sessions. Keep this very secure.
# Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
# If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
#
# Avoid the "#" character in your APP_KEY, it may break things.
#
APP_KEY=SomeRandomStringOf32CharsExactly
# Firefly III will launch using this language (for new users and unauthenticated visitors)
@@ -111,7 +115,10 @@ REDIS_PATH=
# use only when using 'tcp' or 'http' for REDIS_SCHEME. Leave empty otherwise.
REDIS_HOST=127.0.0.1
REDIS_PORT=6379
REDIS_PASSWORD=null
# Use only with Redis 6+ with proper ACL set. Leave empty otherwise.
REDIS_USERNAME=
REDIS_PASSWORD=
# always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.
REDIS_DB="0"
@@ -151,9 +158,7 @@ MANDRILL_SECRET=
SPARKPOST_SECRET=
# Firefly III can send you the following messages.
SEND_REGISTRATION_MAIL=true
SEND_ERROR_MESSAGE=true
SEND_LOGIN_NEW_IP_WARNING=true
# These messages contain (sensitive) transaction information:
SEND_REPORT_JOURNALS=true
@@ -163,6 +168,12 @@ SEND_REPORT_JOURNALS=true
# and disabled by default.
ENABLE_EXTERNAL_MAP=false
# Set this value to true if you want Firefly III to download currency exchange rates
# from the internet. These rates are hosted by the creator of Firefly III inside
# an Azure Storage Container.
# Not all currencies may be available. Rates may be wrong.
ENABLE_EXTERNAL_RATES=false
# The map will default to this location:
MAP_DEFAULT_LAT=51.983333
MAP_DEFAULT_LONG=5.916667
@@ -189,6 +200,15 @@ AUTHENTICATION_GUARD=web
AUTHENTICATION_GUARD_HEADER=REMOTE_USER
AUTHENTICATION_GUARD_EMAIL=
#
# Firefly III generates a basic keypair for your OAuth tokens.
# If you want, you can overrule the key with your own (secure) value.
# It's also possible to set PASSPORT_PUBLIC_KEY_FILE or PASSPORT_PRIVATE_KEY_FILE
# if you're using Docker secrets or similar solutions for secret management
#
PASSPORT_PRIVATE_KEY=
PASSPORT_PUBLIC_KEY=
#
# Extra authentication settings
#
@@ -230,7 +250,7 @@ ALLOW_WEBHOOKS=false
STATIC_CRON_TOKEN=
# You can fine tune the start-up of a Docker container by editing these environment variables.
# Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data.
# Use this at your own risk. Disabling certain checks and features may result in lots of inconsistent data.
# However if you know what you're doing you can significantly speed up container start times.
# Set each value to true to enable, or false to disable.

48
.github/mergify.yml vendored
View File

@@ -6,3 +6,51 @@ pull_request_rules:
actions:
close:
message: Please do not open PR's on the `main` branch, but on the `develop` branch only. Thank you!
- name: No translations
conditions:
- or:
- -files=^resources/lang/bg_BG
- -files=^resources/lang/ca_ES
- -files=^resources/lang/cs_CZ
- -files=^resources/lang/da_DK
- -files=^resources/lang/de_DE
- -files=^resources/lang/el_GR
- -files=^resources/lang/en_GB
- -files=^resources/lang/es_ES
- -files=^resources/lang/et_EE
- -files=^resources/lang/fa_IR
- -files=^resources/lang/fi_FI
- -files=^resources/lang/fr_FR
- -files=^resources/lang/he_IL
- -files=^resources/lang/hu_HU
- -files=^resources/lang/id_ID
- -files=^resources/lang/is_IS
- -files=^resources/lang/it_IT
- -files=^resources/lang/ja_JP
- -files=^resources/lang/ko_KR
- -files=^resources/lang/lt_LT
- -files=^resources/lang/nb_NO
- -files=^resources/lang/nl_NL
- -files=^resources/lang/pl_PL
- -files=^resources/lang/pt_BR
- -files=^resources/lang/pt_PT
- -files=^resources/lang/ro_RO
- -files=^resources/lang/ru_RU
- -files=^resources/lang/si_LK
- -files=^resources/lang/sk_SK
- -files=^resources/lang/sl_SI
- -files=^resources/lang/sr_CS
- -files=^resources/lang/sv_SE
- -files=^resources/lang/th_TH
- -files=^resources/lang/tlh_AA
- -files=^resources/lang/tr_TR
- -files=^resources/lang/uk_UA
- -files=^resources/lang/vi_VN
- -files=^resources/lang/zh_CN
- -files=^resources/lang/zh_TW
actions:
comment:
message: |
Please do not submit translated strings in your PR. If you need new sentences to be translated, add them to the `en_US` language strings. New or changed translations for other languages can be submitted at https://crowdin.com/project/firefly-iii
Thank you!

94
.github/security.md vendored
View File

@@ -1,53 +1,101 @@
# Security Policy
Firefly III is an application to manage your personal finances. As such, the developer has adopted this security disclosure and response policy to ensure that critical issues are responsibly handled.
Firefly III is an application to manage your personal finances. As such, the developer has adopted this security
disclosure and response policy to ensure that critical issues are responsibly handled.
## Supported Versions
Only the latest Firefly III release is maintained. Applicable fixes, including security fixes, will not backported to older release branches. Please refer to [releases.md](https://github.com/firefly-iii/firefly-iii/blob/main/releases.md) for details.
Only the latest Firefly III release is maintained. Applicable fixes, including security fixes, will not backported to
older release branches. Please refer to [releases.md](https://github.com/firefly-iii/firefly-iii/blob/main/releases.md)
for details.
## Reporting a Vulnerability - Private Disclosure Process
Security is of the highest importance and all security vulnerabilities or suspected security vulnerabilities should be reported to Firefly III privately, to minimize attacks against current users of Firefly III before they are fixed. Vulnerabilities will be investigated and patched on the next patch (or minor) release as soon as possible. This information could be kept entirely internal to the project.
If you know of a publicly disclosed security vulnerability for Firefly III, please **IMMEDIATELY** contact james@firefly-iii.org to inform the Firefly III developer. You can use my [GPG key](https://keybase.io/jc5) for extra security.
Security is of the highest importance and all security vulnerabilities or suspected security vulnerabilities should be
reported to Firefly III privately, to minimize attacks against current users of Firefly III before they are fixed.
Vulnerabilities will be investigated and patched on the next patch (or minor) release as soon as possible. This
information could be kept entirely internal to the project.
If you know of a publicly disclosed security vulnerability for Firefly III, please **IMMEDIATELY** contact
james@firefly-iii.org to inform the Firefly III developer. You can use my [GPG key](https://keybase.io/jc5) for extra
security.
**IMPORTANT: Do not file public issues on GitHub for security vulnerabilities**
To report a vulnerability or a security-related issue, please email the private address james@firefly-iii.org with the details of the vulnerability. The email will be received by the developer of Firefly III. Emails will be addressed within 3 business days, including a detailed plan to investigate the issue and any potential workarounds to perform in the meantime. Do not report non-security-impacting bugs through this channel. Use [GitHub issues](https://github.com/firefly-iii/firefly-iii/issues/new/choose) instead.
To report a vulnerability or a security-related issue, please email the private address james@firefly-iii.org with the
details of the vulnerability. The email will be received by the developer of Firefly III. Emails will be addressed
within 3 business days, including a detailed plan to investigate the issue and any potential workarounds to perform in
the meantime. Do not report non-security-impacting bugs through this channel.
Use [GitHub issues](https://github.com/firefly-iii/firefly-iii/issues/new/choose) instead.
### Proposed Email Content
Provide a descriptive subject line and in the body of the email include the following information:
* Basic identity information, such as your name and your affiliation or company.
* Detailed steps to reproduce the vulnerability (POC scripts, screenshots, and compressed packet captures are all helpful to us).
* Description of the effects of the vulnerability on Firefly III and the related hardware and software configurations, so that the developer can reproduce it.
* Detailed steps to reproduce the vulnerability (POC scripts, screenshots, and compressed packet captures are all
helpful to us).
* Description of the effects of the vulnerability on Firefly III and the related hardware and software configurations,
so that the developer can reproduce it.
* How the vulnerability affects Firefly III usage and an estimation of the attack surface, if there is one.
* List other projects or dependencies that were used in conjunction with Firefly III to produce the vulnerability.
## When to report a vulnerability
* When you think Firefly III has a potential security vulnerability.
* When you suspect a potential vulnerability but you are unsure that it impacts Firefly III.
* When you know of or suspect a potential vulnerability on another project that is used by Firefly III. For example Firefly III has a dependency on Docker, MySQL, etc.
* When you know of or suspect a potential vulnerability on another project that is used by Firefly III. For example
Firefly III has a dependency on Docker, MySQL, etc.
## Patch, Release, and Disclosure
The Firefly III developer will respond to vulnerability reports as follows:
1. The developer will investigate the vulnerability and determine its effects and criticality.
2. If the issue is not deemed to be a vulnerability, the developer will follow up with a detailed reason for rejection.
3. The developer will initiate a conversation with the reporter within 3 business days.
4. If a vulnerability is acknowledged and the timeline for a fix is determined, the developer will work on a plan to communicate with the appropriate community, including identifying mitigating steps that affected users can take to protect themselves until the fix is rolled out.
5. The developer will also create a [CVSS](https://www.first.org/cvss/specification-document) using the [CVSS Calculator](https://www.first.org/cvss/calculator/3.0). The developer makes the final call on the calculated CVSS; it is better to move quickly than making the CVSS perfect. Issues may also be reported to [Mitre](https://cve.mitre.org/) using this [scoring calculator](https://nvd.nist.gov/vuln-metrics/cvss/v3-calculator). The CVE will initially be set to private.
6. The developer will work on fixing the vulnerability and perform internal testing before preparing to roll out the fix.
7. A public disclosure date is negotiated by the Firefly III developer and the bug submitter. We prefer to fully disclose the bug as soon as possible once a user mitigation or patch is available. It is reasonable to delay disclosure when the bug or the fix is not yet fully understood, the solution is not well-tested, or for distributor coordination. The timeframe for disclosure is from immediate (especially if its already publicly known) to a few weeks. For a critical vulnerability with a straightforward mitigation, we expect report date to public disclosure date to be on the order of 14 business days. The Firefly III developer holds the final say when setting a public disclosure date.
9. Once the fix is confirmed, the developer will patch the vulnerability in the next patch or minor release. Upon release of the patched version of Firefly III, we will follow the **Public Disclosure Process**.
1. The developer will investigate the vulnerability and determine its effects and criticality.
2. If the issue is not deemed to be a vulnerability, the developer will follow up with a detailed reason for rejection.
3. The developer will initiate a conversation with the reporter within 3 business days.
4. If a vulnerability is acknowledged and the timeline for a fix is determined, the developer will work on a plan to
communicate with the appropriate community, including identifying mitigating steps that affected users can take to
protect themselves until the fix is rolled out.
5. The developer will also create a [CVSS](https://www.first.org/cvss/specification-document) using
the [CVSS Calculator](https://www.first.org/cvss/calculator/3.0). The developer makes the final call on the
calculated CVSS; it is better to move quickly than making the CVSS perfect. Issues may also be reported
to [Mitre](https://cve.mitre.org/) using
this [scoring calculator](https://nvd.nist.gov/vuln-metrics/cvss/v3-calculator). The CVE will initially be set to
private.
6. The developer will work on fixing the vulnerability and perform internal testing before preparing to roll out the
fix.
7. A public disclosure date is negotiated by the Firefly III developer and the bug submitter. We prefer to fully
disclose the bug as soon as possible once a user mitigation or patch is available. It is reasonable to delay
disclosure when the bug or the fix is not yet fully understood, the solution is not well-tested, or for distributor
coordination. The timeframe for disclosure is from immediate (especially if its already publicly known) to a few
weeks. For a critical vulnerability with a straightforward mitigation, we expect report date to public disclosure
date to be on the order of 14 business days. The Firefly III developer holds the final say when setting a public
disclosure date.
8. Once the fix is confirmed, the developer will patch the vulnerability in the next patch or minor release. Upon
release of the patched version of Firefly III, we will follow the **Public Disclosure Process**.
### Public Disclosure Process
The developer publishes a public [advisory](https://github.com/firefly-iii/firefly-iii/security/advisories) to the Firefly III community via GitHub. In most cases, additional communication via Twitter, reddit and other channels will assist in educating Firefly III users and rolling out the patched release to affected users.
The develop will also publish any mitigating steps users can take until the fix can be applied to their Firefly III instances.
The developer publishes a public [advisory](https://github.com/firefly-iii/firefly-iii/security/advisories) to the
Firefly III community via GitHub. In most cases, additional communication via Mastodon, Gitter and other channels will
assist in educating Firefly III users and rolling out the patched release to affected users.
The developer will also publish any mitigating steps users can take until the fix can be applied to their Firefly III
instances.
## Confidentiality, integrity and availability
We consider vulnerabilities leading to the compromise of data confidentiality, elevation of privilege, or integrity to be our highest priority concerns. Availability, in particular in areas relating to DoS and resource exhaustion, is also a serious security concern. The Firefly III developer takes all vulnerabilities, potential vulnerabilities, and suspected vulnerabilities seriously and will investigate them in an urgent and expeditious manner.
Note that we do not currently consider the default settings for Firefly III to be secure-by-default. It is necessary for operators to explicitly configure settings, role based access control, and other resource related features in Firefly III to provide a hardened Firefly III environment. We will not act on any security disclosure that relates to a lack of safe defaults. Over time, we will work towards improved safe-by-default configuration, taking into account backwards compatibility.
We consider vulnerabilities leading to the compromise of data confidentiality, elevation of privilege, or integrity to
be our highest priority concerns. Availability, in particular in areas relating to DoS and resource exhaustion, is also
a serious security concern. The Firefly III developer takes all vulnerabilities, potential vulnerabilities, and
suspected vulnerabilities seriously and will investigate them in an urgent and expeditious manner.
Note that we do not currently consider the default settings for Firefly III to be secure-by-default. It is necessary for
operators to explicitly configure settings, role based access control, and other resource related features in Firefly
III to provide a hardened Firefly III environment. We will not act on any security disclosure that relates to a lack of
safe defaults. Over time, we will work towards improved safe-by-default configuration, taking into account backwards
compatibility.
## Credits

1
.github/stale.yml vendored
View File

@@ -14,6 +14,7 @@ exemptLabels:
- feature
- bug
- announcement
- "layout-v3"
# Set to true to ignore issues in a project (defaults to false)
exemptProjects: false

View File

@@ -4,6 +4,7 @@ on:
branches:
- main
- develop
- 5.8-dev
pull_request:
types: [opened, synchronize, reopened]
jobs:

99
.github/workflows/cleanup.yml vendored Normal file
View File

@@ -0,0 +1,99 @@
# This workflow prunes old workflow runs for an entire repository.
name: Prune old builds
on:
schedule:
- cron: '0 0 * * *'
workflow_dispatch:
jobs:
prune:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- name: Prune cancelled/skipped runs
uses: actions/github-script@v4
with:
github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
script: |
const cancelled = await github.actions.listWorkflowRunsForRepo({
owner: context.repo.owner,
per_page: 100,
repo: context.repo.repo,
status: 'cancelled',
});
const skipped = await github.actions.listWorkflowRunsForRepo({
owner: context.repo.owner,
per_page: 100,
repo: context.repo.repo,
status: 'skipped',
});
for (const response of [cancelled, skipped]) {
for (const run of response.data.workflow_runs) {
console.log(`Run id ${run.id} of '${run.name}' is a cancelled/skipped run. Deleting...`);
await github.actions.deleteWorkflowRun({
owner: context.repo.owner,
repo: context.repo.repo,
run_id: run.id
});
}
}
- name: Prune runs older than 3 days
uses: actions/github-script@v4
with:
github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
script: |
const days_to_expiration = 3;
const ms_in_day = 86400000;
const now = Date.now();
const pages = 5;
// we don't want to prune old runs from test.yml
// because we track the duration of runs over time
const workflows = [
'build.yml',
'cleanup.yml',
'depsreview.yaml',
'laravel.yml',
'lock.yml',
'stale.yml'
]
let runs_to_delete = [];
for (const workflow of workflows) {
for (let page = 0; page < pages; page += 1) {
let response = await github.actions.listWorkflowRuns({
owner: context.repo.owner,
page: page,
per_page: 100,
repo: context.repo.repo,
workflow_id: workflow
});
if (response.data.workflow_runs.length > 0) {
for (const run of response.data.workflow_runs) {
if (now - Date.parse(run.created_at) > ms_in_day * days_to_expiration) {
runs_to_delete.push([run.id, run.name]);
}
}
}
}
}
for (const run of runs_to_delete) {
console.log(`Run id ${run[0]} of '${run[1]}' is older than ${days_to_expiration} days. Deleting...`);
try {
await github.actions.deleteWorkflowRun({
owner: context.repo.owner,
repo: context.repo.repo,
run_id: run[0]
});
} catch (error) {
// ignore errors
}
}

22
.github/workflows/closed-issues.yml vendored Normal file
View File

@@ -0,0 +1,22 @@
name: "Reply to closed issue"
on:
issues:
types:
- closed
jobs:
auto_comment:
runs-on: ubuntu-latest
steps:
-
uses: aws-actions/closed-issue-message@v1
with:
message: |
Hi there! This is an automatic reply. `Share and enjoy`
This issue is now closed. Please be aware that closed issues are not actively monitored. If you reply, you may get no response.
- If the original bug is not actually fixed, please feel free to open a new ticket. Please refer to this issue for clarity.
- Follow-up questions can also be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/)
Thank you for your consideration.
repo-token: "${{ secrets.GITHUB_TOKEN }}"

14
.github/workflows/depsreview.yaml vendored Normal file
View File

@@ -0,0 +1,14 @@
name: 'Dependency Review'
on: [pull_request]
permissions:
contents: read
jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3
- name: 'Dependency Review'
uses: actions/dependency-review-action@v1

View File

@@ -2,6 +2,7 @@ name: "Close stale issues"
on:
schedule:
- cron: "30 1 * * *"
workflow_dispatch:
permissions:
contents: read
@@ -13,7 +14,7 @@ jobs:
pull-requests: write # for actions/stale to close stale PRs
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
- uses: actions/stale@v6
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: >
@@ -26,4 +27,4 @@ jobs:
for your contributions.
days-before-stale: 14
days-before-close: 7
exempt-issue-labels: 'enhancement,feature,bug,announcement'
exempt-issue-labels: 'enhancement,feature,bug,announcement,layout-v3'

1
.gitignore vendored
View File

@@ -6,3 +6,4 @@
npm-debug.log
yarn-error.log
.env
/.ci/php-cs-fixer/vendor

View File

@@ -67,7 +67,7 @@ class AccountController extends Controller
* Documentation for this endpoint:
* https://api-docs.firefly-iii.org/#/autocomplete/getAccountsAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
* @throws JsonException
@@ -82,7 +82,7 @@ class AccountController extends Controller
$date = $data['date'] ?? today(config('app.timezone'));
$return = [];
$result = $this->repository->searchAccount((string) $query, $types, $data['limit']);
$result = $this->repository->searchAccount((string)$query, $types, $data['limit']);
$defaultCurrency = app('amount')->getDefaultCurrency();
/** @var Account $account */
@@ -96,7 +96,7 @@ class AccountController extends Controller
}
$return[] = [
'id' => (string) $account->id,
'id' => (string)$account->id,
'name' => $account->name,
'name_with_balance' => $nameWithBalance,
'type' => $account->accountType->type,
@@ -111,12 +111,13 @@ class AccountController extends Controller
// custom order.
$order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
usort(
$return, function ($a, $b) use ($order) {
$pos_a = array_search($a['type'], $order);
$pos_b = array_search($b['type'], $order);
$return,
function ($a, $b) use ($order) {
$pos_a = array_search($a['type'], $order, true);
$pos_b = array_search($b['type'], $order, true);
return $pos_a - $pos_b;
}
return $pos_a - $pos_b;
}
);
return response()->json($return);

View File

@@ -58,8 +58,9 @@ class BillController extends Controller
/**
* Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getBillsAC
* TODO expand API to add active field.
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
@@ -70,13 +71,13 @@ class BillController extends Controller
$filtered = $result->map(
static function (Bill $item) {
return [
'id' => (string) $item->id,
'id' => (string)$item->id,
'name' => $item->name,
'active' => $item->active
];
}
);
return response()->json($filtered->toArray());
}
}

View File

@@ -59,7 +59,7 @@ class BudgetController extends Controller
* Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getBudgetsAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
@@ -70,7 +70,7 @@ class BudgetController extends Controller
$filtered = $result->map(
static function (Budget $item) {
return [
'id' => (string) $item->id,
'id' => (string)$item->id,
'name' => $item->name,
];
}

View File

@@ -59,7 +59,7 @@ class CategoryController extends Controller
* Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getCategoriesAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
@@ -70,7 +70,7 @@ class CategoryController extends Controller
$filtered = $result->map(
static function (Category $item) {
return [
'id' => (string) $item->id,
'id' => (string)$item->id,
'name' => $item->name,
];
}

View File

@@ -59,7 +59,7 @@ class CurrencyController extends Controller
* Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
@@ -72,7 +72,7 @@ class CurrencyController extends Controller
/** @var TransactionCurrency $currency */
foreach ($collection as $currency) {
$result[] = [
'id' => (string) $currency->id,
'id' => (string)$currency->id,
'name' => $currency->name,
'code' => $currency->code,
'symbol' => $currency->symbol,
@@ -87,7 +87,7 @@ class CurrencyController extends Controller
* Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesCodeAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
* @deprecated
@@ -101,7 +101,7 @@ class CurrencyController extends Controller
/** @var TransactionCurrency $currency */
foreach ($collection as $currency) {
$result[] = [
'id' => (string) $currency->id,
'id' => (string)$currency->id,
'name' => sprintf('%s (%s)', $currency->name, $currency->code),
'code' => $currency->code,
'symbol' => $currency->symbol,

View File

@@ -59,7 +59,7 @@ class ObjectGroupController extends Controller
* Documentation for this endpoint is at:
* https://api-docs.firefly-iii.org/#/autocomplete/getObjectGroupsAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
@@ -72,7 +72,7 @@ class ObjectGroupController extends Controller
/** @var ObjectGroup $objectGroup */
foreach ($result as $objectGroup) {
$return[] = [
'id' => (string) $objectGroup->id,
'id' => (string)$objectGroup->id,
'name' => $objectGroup->title,
'title' => $objectGroup->title,
];
@@ -80,5 +80,4 @@ class ObjectGroupController extends Controller
return response()->json($return);
}
}

View File

@@ -63,7 +63,7 @@ class PiggyBankController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
@@ -78,7 +78,7 @@ class PiggyBankController extends Controller
foreach ($piggies as $piggy) {
$currency = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
$response[] = [
'id' => (string) $piggy->id,
'id' => (string)$piggy->id,
'name' => $piggy->name,
'currency_id' => $currency->id,
'currency_name' => $currency->name,
@@ -95,7 +95,7 @@ class PiggyBankController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesBalanceAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
@@ -110,10 +110,12 @@ class PiggyBankController extends Controller
$currency = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
$currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0';
$response[] = [
'id' => (string) $piggy->id,
'id' => (string)$piggy->id,
'name' => $piggy->name,
'name_with_balance' => sprintf(
'%s (%s / %s)', $piggy->name, app('amount')->formatAnything($currency, $currentAmount, false),
'%s (%s / %s)',
$piggy->name,
app('amount')->formatAnything($currency, $currentAmount, false),
app('amount')->formatAnything($currency, $piggy->targetamount, false),
),
'currency_id' => $currency->id,
@@ -126,5 +128,4 @@ class PiggyBankController extends Controller
return response()->json($response);
}
}

View File

@@ -56,7 +56,7 @@ class RecurrenceController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getRecurringAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
@@ -69,7 +69,7 @@ class RecurrenceController extends Controller
/** @var Recurrence $recurrence */
foreach ($recurrences as $recurrence) {
$response[] = [
'id' => (string) $recurrence->id,
'id' => (string)$recurrence->id,
'name' => $recurrence->title,
'description' => $recurrence->description,
];
@@ -77,5 +77,4 @@ class RecurrenceController extends Controller
return response()->json($response);
}
}

View File

@@ -56,7 +56,7 @@ class RuleController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getRulesAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
@@ -69,7 +69,7 @@ class RuleController extends Controller
/** @var Rule $rule */
foreach ($rules as $rule) {
$response[] = [
'id' => (string) $rule->id,
'id' => (string)$rule->id,
'name' => $rule->title,
'description' => $rule->description,
];
@@ -77,5 +77,4 @@ class RuleController extends Controller
return response()->json($response);
}
}

View File

@@ -56,7 +56,7 @@ class RuleGroupController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getRuleGroupsAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
@@ -69,7 +69,7 @@ class RuleGroupController extends Controller
/** @var RuleGroup $group */
foreach ($groups as $group) {
$response[] = [
'id' => (string) $group->id,
'id' => (string)$group->id,
'name' => $group->title,
'description' => $group->description,
];

View File

@@ -59,7 +59,7 @@ class TagController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getTagAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
@@ -72,7 +72,7 @@ class TagController extends Controller
/** @var Tag $tag */
foreach ($result as $tag) {
$array[] = [
'id' => (string) $tag->id,
'id' => (string)$tag->id,
'name' => $tag->tag,
'tag' => $tag->tag,
];

View File

@@ -64,7 +64,7 @@ class TransactionController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
@@ -80,8 +80,8 @@ class TransactionController extends Controller
/** @var TransactionJournal $journal */
foreach ($filtered as $journal) {
$array[] = [
'id' => (string) $journal->id,
'transaction_group_id' => (string) $journal->transaction_group_id,
'id' => (string)$journal->id,
'transaction_group_id' => (string)$journal->transaction_group_id,
'name' => $journal->description,
'description' => $journal->description,
];
@@ -94,17 +94,17 @@ class TransactionController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsIDAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
*/
public function transactionsWithID(AutocompleteRequest $request): JsonResponse
{
$data = $request->getData();
$result = new Collection;
$result = new Collection();
if (is_numeric($data['query'])) {
// search for group, not journal.
$firstResult = $this->groupRepository->find((int) $data['query']);
$firstResult = $this->groupRepository->find((int)$data['query']);
if (null !== $firstResult) {
// group may contain multiple journals, each a result:
foreach ($firstResult->transactionJournals as $journal) {
@@ -122,8 +122,8 @@ class TransactionController extends Controller
/** @var TransactionJournal $journal */
foreach ($result as $journal) {
$array[] = [
'id' => (string) $journal->id,
'transaction_group_id' => (string) $journal->transaction_group_id,
'id' => (string)$journal->id,
'transaction_group_id' => (string)$journal->transaction_group_id,
'name' => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
'description' => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
];

View File

@@ -55,7 +55,7 @@ class TransactionTypeController extends Controller
* This endpoint is documented at
* https://api-docs.firefly-iii.org/#/autocomplete/getTransactionTypesAC
*
* @param AutocompleteRequest $request
* @param AutocompleteRequest $request
*
* @return JsonResponse
* @codeCoverageIgnore
@@ -70,7 +70,7 @@ class TransactionTypeController extends Controller
foreach ($types as $type) {
// different key for consistency.
$array[] = [
'id' => (string) $type->id,
'id' => (string)$type->id,
'name' => $type->type,
'type' => $type->type,
];

View File

@@ -76,7 +76,7 @@ class AccountController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/charts/getChartAccountOverview
*
* @param DateRequest $request
* @param DateRequest $request
*
* @return JsonResponse
* @throws FireflyException
@@ -98,7 +98,7 @@ class AccountController extends Controller
$frontPage = app('preferences')->get('frontPageAccounts', $defaultSet);
$default = app('amount')->getDefaultCurrency();
if (empty($frontPage->data)) {
if (!(is_array($frontPage->data) && count($frontPage->data) > 0)) {
$frontPage->data = $defaultSet;
$frontPage->save();
}
@@ -115,7 +115,7 @@ class AccountController extends Controller
}
$currentSet = [
'label' => $account->name,
'currency_id' => (string) $currency->id,
'currency_id' => (string)$currency->id,
'currency_code' => $currency->code,
'currency_symbol' => $currency->symbol,
'currency_decimal_places' => $currency->decimal_places,
@@ -127,11 +127,12 @@ class AccountController extends Controller
];
$currentStart = clone $start;
$range = app('steam')->balanceInRange($account, $start, clone $end);
$previous = round((float) array_values($range)[0], 12);
// 2022-10-11 this method no longer converts to float.
$previous = array_values($range)[0];
while ($currentStart <= $end) {
$format = $currentStart->format('Y-m-d');
$label = $currentStart->toAtomString();
$balance = array_key_exists($format, $range) ? round((float) $range[$format], 12) : $previous;
$balance = array_key_exists($format, $range) ? $range[$format] : $previous;
$previous = $balance;
$currentStart->addDay();
$currentSet['entries'][$label] = $balance;

View File

@@ -31,11 +31,12 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Support\Facades\Log;
use League\Fractal\Manager;
use League\Fractal\Serializer\JsonApiSerializer;
use Log;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Symfony\Component\HttpFoundation\Exception\BadRequestException;
use Symfony\Component\HttpFoundation\ParameterBag;
/**
@@ -45,7 +46,9 @@ use Symfony\Component\HttpFoundation\ParameterBag;
*/
abstract class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
use AuthorizesRequests;
use DispatchesJobs;
use ValidatesRequests;
protected const CONTENT_TYPE = 'application/vnd.api+json';
protected array $allowedSort;
@@ -69,7 +72,6 @@ abstract class Controller extends BaseController
return $next($request);
}
);
}
/**
@@ -81,24 +83,34 @@ abstract class Controller extends BaseController
*/
private function getParameters(): ParameterBag
{
$bag = new ParameterBag;
$bag = new ParameterBag();
$page = (int)request()->get('page');
if (0 === $page) {
if ($page < 1) {
$page = 1;
}
if ($page > (2 ^ 16)) {
$page = (2 ^ 16);
}
$bag->set('page', $page);
// some date fields:
$dates = ['start', 'end', 'date'];
foreach ($dates as $field) {
$date = request()->query->get($field);
$obj = null;
try {
$date = request()->query->get($field);
} catch (BadRequestException $e) {
Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $field));
Log::error($e->getMessage());
$value = null;
}
$obj = null;
if (null !== $date) {
try {
$obj = Carbon::parse($date);
} catch (InvalidDateException | InvalidFormatException $e) {
} catch (InvalidDateException|InvalidFormatException $e) {
// don't care
Log::warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', $date, $e->getMessage()));
app('log')->warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', substr($date, 0, 20), $e->getMessage()));
}
}
$bag->set($field, $obj);
@@ -107,7 +119,13 @@ abstract class Controller extends BaseController
// integer fields:
$integers = ['limit'];
foreach ($integers as $integer) {
$value = request()->query->get($integer);
try {
$value = request()->query->get($integer);
} catch (BadRequestException $e) {
Log::error(sprintf('Request field "%s" contains a non-scalar value. Value set to NULL.', $integer));
Log::error($e->getMessage());
$value = null;
}
if (null !== $value) {
$bag->set($integer, (int)$value);
}
@@ -118,14 +136,20 @@ abstract class Controller extends BaseController
}
/**
* @param ParameterBag $bag
* @param ParameterBag $bag
*
* @return ParameterBag
*/
private function getSortParameters(ParameterBag $bag): ParameterBag
{
$sortParameters = [];
$param = (string)request()->query->get('sort');
try {
$param = (string)request()->query->get('sort');
} catch (BadRequestException $e) {
Log::error('Request field "sort" contains a non-scalar value. Value set to NULL.');
Log::error($e->getMessage());
$param = '';
}
if ('' === $param) {
return $bag;
}
@@ -167,7 +191,7 @@ abstract class Controller extends BaseController
$params[$key] = $value;
}
return $return . http_build_query($params);
return $return.http_build_query($params);
}
/**
@@ -176,8 +200,8 @@ abstract class Controller extends BaseController
final protected function getManager(): Manager
{
// create some objects:
$manager = new Manager;
$baseUrl = request()->getSchemeAndHttpHost() . '/api/v1';
$manager = new Manager();
$baseUrl = request()->getSchemeAndHttpHost().'/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl));
return $manager;

View File

@@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Data\Bulk;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Data\Bulk\MoveTransactionsRequest;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -59,7 +58,7 @@ class AccountController extends Controller
/**
* This endpoint is deprecated and not documented.
*
* @param MoveTransactionsRequest $request
* @param MoveTransactionsRequest $request
*
* @return JsonResponse
* @deprecated
@@ -75,7 +74,5 @@ class AccountController extends Controller
$service->moveTransactions($original, $destination);
return response()->json([], 204);
}
}

View File

@@ -63,7 +63,7 @@ class TransactionController extends Controller
/**
* This endpoint is documented at:
*
* @param TransactionRequest $request
* @param TransactionRequest $request
*
* @return JsonResponse
*/
@@ -76,8 +76,8 @@ class TransactionController extends Controller
// to respond to what is in the $query.
// this is OK because only one thing can be in the query at the moment.
if ($this->updatesTransactionAccount($params)) {
$original = $this->repository->find((int) $params['where']['account_id']);
$destination = $this->repository->find((int) $params['update']['account_id']);
$original = $this->repository->find((int)$params['where']['account_id']);
$destination = $this->repository->find((int)$params['update']['account_id']);
/** @var AccountDestroyService $service */
$service = app(AccountDestroyService::class);
@@ -88,7 +88,7 @@ class TransactionController extends Controller
}
/**
* @param array $params
* @param array $params
*
* @return bool
*/
@@ -96,5 +96,4 @@ class TransactionController extends Controller
{
return array_key_exists('account_id', $params['where']) && array_key_exists('account_id', $params['update']);
}
}

View File

@@ -45,28 +45,31 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Log;
/**
* Class DestroyController
*/
class DestroyController extends Controller
{
private bool $unused;
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/destroyData
*
* @param DestroyRequest $request
* @param DestroyRequest $request
*
* @return JsonResponse
* @throws FireflyException
*/
public function destroy(DestroyRequest $request): JsonResponse
{
$objects = $request->getObjects();
$objects = $request->getObjects();
$this->unused = $request->boolean('unused', false);
switch ($objects) {
default:
throw new FireflyException(sprintf('This endpoint can\'t handle object "%s"', $objects));
throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects));
case 'budgets':
$this->destroyBudgets();
break;
@@ -94,24 +97,32 @@ class DestroyController extends Controller
case 'accounts':
$this->destroyAccounts(
[
AccountType::ASSET, AccountType::DEFAULT,
AccountType::BENEFICIARY, AccountType::EXPENSE,
AccountType::REVENUE, AccountType::INITIAL_BALANCE,
AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD,
AccountType::ASSET,
AccountType::DEFAULT,
AccountType::BENEFICIARY,
AccountType::EXPENSE,
AccountType::REVENUE,
AccountType::INITIAL_BALANCE,
AccountType::DEBT,
AccountType::LOAN,
AccountType::MORTGAGE,
AccountType::CREDITCARD,
]
);
break;
case 'asset_accounts':
$this->destroyAccounts(
[
AccountType::ASSET, AccountType::DEFAULT,
AccountType::ASSET,
AccountType::DEFAULT,
]
);
break;
case 'expense_accounts':
$this->destroyAccounts(
[
AccountType::BENEFICIARY, AccountType::EXPENSE,
AccountType::BENEFICIARY,
AccountType::EXPENSE,
]
);
break;
@@ -125,7 +136,10 @@ class DestroyController extends Controller
case 'liabilities':
$this->destroyAccounts(
[
AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD,
AccountType::DEBT,
AccountType::LOAN,
AccountType::MORTGAGE,
AccountType::CREDITCARD,
]
);
break;
@@ -162,6 +176,7 @@ class DestroyController extends Controller
);
break;
}
app('preferences')->mark();
return response()->json([], 204);
}
@@ -252,7 +267,7 @@ class DestroyController extends Controller
}
/**
* @param array $types
* @param array $types
*/
private function destroyAccounts(array $types): void
{
@@ -260,14 +275,24 @@ class DestroyController extends Controller
$repository = app(AccountRepositoryInterface::class);
$collection = $repository->getAccountsByType($types);
$service = app(AccountDestroyService::class);
/** @var Account $account */
foreach ($collection as $account) {
$service->destroy($account, null);
$count = $account->transactions()->count();
if (true === $this->unused && 0 === $count) {
Log::info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));
$service->destroy($account, null);
continue;
}
if (false === $this->unused) {
Log::info(sprintf('Deleting account #%d "%s"', $account->id, $account->name));
$service->destroy($account, null);
}
}
}
/**
* @param array $types
* @param array $types
*/
private function destroyTransactions(array $types): void
{
@@ -280,5 +305,4 @@ class DestroyController extends Controller
$service->destroy($journal);
}
}
}

View File

@@ -57,7 +57,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportAccounts
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -67,11 +67,10 @@ class ExportController extends Controller
$this->exporter->setExportAccounts(true);
return $this->returnExport('accounts');
}
/**
* @param string $key
* @param string $key
*
* @return LaravelResponse
* @throws FireflyException
@@ -87,13 +86,13 @@ class ExportController extends Controller
$response
->header('Content-Description', 'File Transfer')
->header('Content-Type', 'application/octet-stream')
->header('Content-Disposition', 'attachment; filename=' . $fileName)
->header('Content-Disposition', 'attachment; filename='.$fileName)
->header('Content-Transfer-Encoding', 'binary')
->header('Connection', 'Keep-Alive')
->header('Expires', '0')
->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
->header('Pragma', 'public')
->header('Content-Length', (string) strlen($data[$key]));
->header('Content-Length', (string)strlen($data[$key]));
return $response;
}
@@ -102,7 +101,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportBills
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -118,7 +117,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportBudgets
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -134,7 +133,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportCategories
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -150,7 +149,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportPiggies
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -166,7 +165,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportRecurring
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -182,7 +181,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportRules
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -198,7 +197,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportTags
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -214,7 +213,7 @@ class ExportController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/data/exportTransactions
*
* @param ExportRequest $request
* @param ExportRequest $request
*
* @return LaravelResponse
* @throws FireflyException
@@ -229,5 +228,4 @@ class ExportController extends Controller
return $this->returnExport('transactions');
}
}

View File

@@ -0,0 +1,93 @@
<?php
/*
* PurgeController.php
* Copyright (c) 2022 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/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Data;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Models\Account;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Category;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\Recurrence;
use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Http\JsonResponse;
class PurgeController extends Controller
{
/**
* @return JsonResponse
*/
public function purge(): JsonResponse
{
$user = auth()->user();
// some manual code, too lazy to call all repositories.
//,transactions,withdrawals,deposits,transfers';
// budgets:
Budget::whereUserId($user->id)->onlyTrashed()->forceDelete();
// bills
Bill::whereUserId($user->id)->onlyTrashed()->forceDelete();
// piggies
$set = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*']);
/** @var PiggyBank $piggy */
foreach ($set as $piggy) {
$piggy->forceDelete();
}
// rule group
RuleGroup::whereUserId($user->id)->onlyTrashed()->forceDelete();
// rules
Rule::whereUserId($user->id)->onlyTrashed()->forceDelete();
// recurring transactions
Recurrence::whereUserId($user->id)->onlyTrashed()->forceDelete();
// categories
Category::whereUserId($user->id)->onlyTrashed()->forceDelete();
// tags
Tag::whereUserId($user->id)->onlyTrashed()->forceDelete();
// accounts
Account::whereUserId($user->id)->onlyTrashed()->forceDelete();
// transaction groups
TransactionGroup::whereUserId($user->id)->onlyTrashed()->forceDelete();
// transaction journals
TransactionJournal::whereUserId($user->id)->onlyTrashed()->forceDelete();
return response()->json([], 204);
}
}

View File

@@ -76,7 +76,7 @@ class AccountController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseAsset
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -91,11 +91,11 @@ class AccountController extends Controller
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [
'id' => (string) $expense['id'],
'id' => (string)$expense['id'],
'name' => $expense['name'],
'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'difference_float' => (float)$expense['sum'], // intentional float
'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
@@ -107,7 +107,7 @@ class AccountController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseExpense
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -123,16 +123,15 @@ class AccountController extends Controller
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [
'id' => (string) $expense['id'],
'id' => (string)$expense['id'],
'name' => $expense['name'],
'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'difference_float' => (float)$expense['sum'], // intentional float
'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
return response()->json($result);
}
}

View File

@@ -61,7 +61,7 @@ class BillController extends Controller
*
* Expenses per bill, possibly filtered by bill and account.
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -85,33 +85,33 @@ class BillController extends Controller
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$billId = (int) $journal['bill_id'];
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
$billId = (int)$journal['bill_id'];
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
$key = sprintf('%d-%d', $billId, $currencyId);
$foreignKey = sprintf('%d-%d', $billId, $foreignCurrencyId);
if (0 !== $currencyId) {
$response[$key] = $response[$key] ?? [
'id' => (string) $billId,
'name' => $journal['bill_name'],
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
'id' => (string)$billId,
'name' => $journal['bill_name'],
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$key]['difference'] = bcadd($response[$key]['difference'], $journal['amount']);
$response[$key]['difference_float'] = (float) $response[$key]['difference'];
$response[$key]['difference_float'] = (float)$response[$key]['difference']; // intentional float
}
if (0 !== $foreignCurrencyId) {
$response[$foreignKey] = $response[$foreignKey] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignKey]['difference'] = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
$response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // intentional float
}
}
@@ -124,7 +124,7 @@ class BillController extends Controller
*
* Expenses for no bill filtered by account.
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -143,32 +143,31 @@ class BillController extends Controller
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], $journal['amount']);
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // intentional float
}
}
return response()->json(array_values($response));
}
}

View File

@@ -68,7 +68,7 @@ class BudgetController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseBudget
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -88,11 +88,11 @@ class BudgetController extends Controller
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [
'id' => (string) $budget->id,
'id' => (string)$budget->id,
'name' => $budget->name,
'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'difference_float' => (float)$expense['sum'], // intentional float
'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
@@ -105,7 +105,7 @@ class BudgetController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseNoBudget
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -120,14 +120,12 @@ class BudgetController extends Controller
foreach ($expenses as $expense) {
$result[] = [
'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'difference_float' => (float)$expense['sum'], // intentional float
'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
return response()->json($result);
}
}

View File

@@ -69,7 +69,7 @@ class CategoryController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferCategory
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -89,11 +89,11 @@ class CategoryController extends Controller
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [
'id' => (string) $category->id,
'id' => (string)$category->id,
'name' => $category->name,
'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'difference_float' => (float)$expense['sum'], // intentional float
'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
@@ -106,7 +106,7 @@ class CategoryController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -121,13 +121,12 @@ class CategoryController extends Controller
foreach ($expenses as $expense) {
$result[] = [
'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'difference_float' => (float)$expense['sum'], // intentional float
'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
return response()->json($result);
}
}

View File

@@ -34,12 +34,11 @@ use Illuminate\Http\JsonResponse;
*/
class PeriodController extends Controller
{
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightExpenseTotal
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -55,32 +54,31 @@ class PeriodController extends Controller
$collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], $journal['amount']);
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // intentional float
}
}
return response()->json(array_values($response));
}
}

View File

@@ -60,7 +60,7 @@ class TagController extends Controller
*
* Expenses for no tag filtered by account.
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -79,28 +79,28 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], $journal['amount']);
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose.
}
}
@@ -113,7 +113,7 @@ class TagController extends Controller
*
* Expenses per tag, possibly filtered by tag and account.
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -137,8 +137,8 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals();
/** @var array $journal */
foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
/** @var array $tag */
foreach ($journal['tags'] as $tag) {
@@ -149,32 +149,31 @@ class TagController extends Controller
// on currency ID
if (0 !== $currencyId) {
$response[$key] = $response[$key] ?? [
'id' => (string) $tagId,
'name' => $tag['name'],
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
'id' => (string)$tagId,
'name' => $tag['name'],
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$key]['difference'] = bcadd($response[$key]['difference'], $journal['amount']);
$response[$key]['difference_float'] = (float) $response[$key]['difference'];
$response[$key]['difference_float'] = (float)$response[$key]['difference']; // float but on purpose.
}
// on foreign ID
if (0 !== $foreignCurrencyId) {
$response[$foreignKey] = $journal[$foreignKey] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignKey]['difference'] = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
$response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // float but on purpose.
}
}
}
return response()->json(array_values($response));
}
}

View File

@@ -76,7 +76,7 @@ class AccountController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeAsset
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -90,11 +90,11 @@ class AccountController extends Controller
/** @var array $entry */
foreach ($income as $entry) {
$result[] = [
'id' => (string) $entry['id'],
'id' => (string)$entry['id'],
'name' => $entry['name'],
'difference' => $entry['sum'],
'difference_float' => (float) $entry['sum'],
'currency_id' => (string) $entry['currency_id'],
'difference_float' => (float)$entry['sum'], // float but on purpose.
'currency_id' => (string)$entry['currency_id'],
'currency_code' => $entry['currency_code'],
];
}
@@ -106,7 +106,7 @@ class AccountController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeRevenue
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -122,16 +122,15 @@ class AccountController extends Controller
/** @var array $entry */
foreach ($income as $entry) {
$result[] = [
'id' => (string) $entry['id'],
'id' => (string)$entry['id'],
'name' => $entry['name'],
'difference' => $entry['sum'],
'difference_float' => (float) $entry['sum'],
'currency_id' => (string) $entry['currency_id'],
'difference_float' => (float)$entry['sum'], // float but on purpose.
'currency_id' => (string)$entry['currency_id'],
'currency_code' => $entry['currency_code'],
];
}
return response()->json($result);
}
}

View File

@@ -69,7 +69,7 @@ class CategoryController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeCategory
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -89,11 +89,11 @@ class CategoryController extends Controller
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [
'id' => (string) $category->id,
'id' => (string)$category->id,
'name' => $category->name,
'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'difference_float' => (float)$expense['sum'], // float but on purpose.
'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
@@ -106,7 +106,7 @@ class CategoryController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeNoCategory
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -121,13 +121,12 @@ class CategoryController extends Controller
foreach ($expenses as $expense) {
$result[] = [
'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'difference_float' => (float)$expense['sum'], // float but on purpose.
'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
return response()->json($result);
}
}

View File

@@ -34,12 +34,11 @@ use Illuminate\Http\JsonResponse;
*/
class PeriodController extends Controller
{
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightIncomeTotal
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -55,34 +54,34 @@ class PeriodController extends Controller
$collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
$response[$foreignCurrencyId]['difference'],
app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose.
}
}
return response()->json(array_values($response));
}
}

View File

@@ -61,7 +61,7 @@ class TagController extends Controller
*
* Expenses for no tag filtered by account.
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -80,30 +80,31 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
$response[$foreignCurrencyId]['difference'],
app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
}
}
@@ -116,7 +117,7 @@ class TagController extends Controller
*
* Expenses per tag, possibly filtered by tag and account.
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -140,8 +141,8 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals();
/** @var array $journal */
foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
/** @var array $tag */
foreach ($journal['tags'] as $tag) {
@@ -152,34 +153,34 @@ class TagController extends Controller
// on currency ID
if (0 !== $currencyId) {
$response[$key] = $response[$key] ?? [
'id' => (string) $tagId,
'name' => $tag['name'],
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
'id' => (string)$tagId,
'name' => $tag['name'],
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$key]['difference'] = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
$response[$key]['difference_float'] = (float) $response[$key]['difference'];
$response[$key]['difference_float'] = (float)$response[$key]['difference'];
}
// on foreign ID
if (0 !== $foreignCurrencyId) {
$response[$foreignKey] = $journal[$foreignKey] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignKey]['difference'] = bcadd(
$response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount'])
$response[$foreignKey]['difference'],
app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
$response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
}
}
}
return response()->json(array_values($response));
}
}

View File

@@ -61,7 +61,7 @@ class AccountController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransfers
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/

View File

@@ -68,7 +68,7 @@ class CategoryController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferCategory
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -88,11 +88,11 @@ class CategoryController extends Controller
/** @var array $expense */
foreach ($expenses as $expense) {
$result[] = [
'id' => (string) $category->id,
'id' => (string)$category->id,
'name' => $category->name,
'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'difference_float' => (float)$expense['sum'],
'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
@@ -105,7 +105,7 @@ class CategoryController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -120,13 +120,12 @@ class CategoryController extends Controller
foreach ($expenses as $expense) {
$result[] = [
'difference' => $expense['sum'],
'difference_float' => (float) $expense['sum'],
'currency_id' => (string) $expense['currency_id'],
'difference_float' => (float)$expense['sum'],
'currency_id' => (string)$expense['currency_id'],
'currency_code' => $expense['currency_code'],
];
}
return response()->json($result);
}
}

View File

@@ -34,12 +34,11 @@ use Illuminate\Http\JsonResponse;
*/
class PeriodController extends Controller
{
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferTotal
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -55,34 +54,34 @@ class PeriodController extends Controller
$collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
$response[$foreignCurrencyId]['difference'],
app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
}
}
return response()->json(array_values($response));
}
}

View File

@@ -58,7 +58,7 @@ class TagController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/insight/insightTransferNoTag
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -77,30 +77,31 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals();
foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
if (0 !== $currencyId) {
$response[$currencyId] = $response[$currencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
$response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
$response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
}
if (0 !== $foreignCurrencyId) {
$response[$foreignCurrencyId] = $response[$foreignCurrencyId] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignCurrencyId]['difference'] = bcadd(
$response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
$response[$foreignCurrencyId]['difference'],
app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
$response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
}
}
@@ -113,7 +114,7 @@ class TagController extends Controller
*
* Transfers per tag, possibly filtered by tag and account.
*
* @param GenericRequest $request
* @param GenericRequest $request
*
* @return JsonResponse
*/
@@ -137,8 +138,8 @@ class TagController extends Controller
$genericSet = $collector->getExtractedJournals();
/** @var array $journal */
foreach ($genericSet as $journal) {
$currencyId = (int) $journal['currency_id'];
$foreignCurrencyId = (int) $journal['foreign_currency_id'];
$currencyId = (int)$journal['currency_id'];
$foreignCurrencyId = (int)$journal['foreign_currency_id'];
/** @var array $tag */
foreach ($journal['tags'] as $tag) {
@@ -149,29 +150,30 @@ class TagController extends Controller
// on currency ID
if (0 !== $currencyId) {
$response[$key] = $response[$key] ?? [
'id' => (string) $tagId,
'name' => $tag['name'],
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $currencyId,
'currency_code' => $journal['currency_code'],
];
'id' => (string)$tagId,
'name' => $tag['name'],
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$currencyId,
'currency_code' => $journal['currency_code'],
];
$response[$key]['difference'] = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
$response[$key]['difference_float'] = (float) $response[$key]['difference'];
$response[$key]['difference_float'] = (float)$response[$key]['difference'];
}
// on foreign ID
if (0 !== $foreignCurrencyId) {
$response[$foreignKey] = $journal[$foreignKey] ?? [
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string) $foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
'difference' => '0',
'difference_float' => 0,
'currency_id' => (string)$foreignCurrencyId,
'currency_code' => $journal['foreign_currency_code'],
];
$response[$foreignKey]['difference'] = bcadd(
$response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount'])
$response[$foreignKey]['difference'],
app('steam')->positive($journal['foreign_amount'])
);
$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
$response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // intentional float
}
}
}

View File

@@ -61,7 +61,7 @@ class DestroyController extends Controller
*
* Remove the specified resource from storage.
*
* @param Account $account
* @param Account $account
*
* @codeCoverageIgnore
* @return JsonResponse
@@ -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);
}

View File

@@ -73,7 +73,7 @@ class ListController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/accounts/listAttachmentByAccount
*
* @param Account $account
* @param Account $account
*
* @return JsonResponse
* @codeCoverageIgnore
@@ -82,7 +82,7 @@ class ListController extends Controller
public function attachments(Account $account): JsonResponse
{
$manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($account);
$count = $collection->count();
@@ -90,7 +90,7 @@ class ListController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.accounts.attachments', [$account->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.accounts.attachments', [$account->id]).$this->buildParams());
/** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class);
@@ -106,7 +106,7 @@ class ListController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/accounts/listPiggyBankByAccount
*
* @param Account $account
* @param Account $account
*
* @return JsonResponse
* @throws FireflyException
@@ -118,7 +118,7 @@ class ListController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getPiggyBanks($account);
@@ -127,7 +127,7 @@ class ListController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.accounts.piggy_banks', [$account->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.accounts.piggy_banks', [$account->id]).$this->buildParams());
/** @var PiggyBankTransformer $transformer */
$transformer = app(PiggyBankTransformer::class);
@@ -137,7 +137,6 @@ class ListController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
@@ -148,15 +147,15 @@ class ListController extends Controller
*
* @codeCoverageIgnore
*
* @param Request $request
* @param Account $account
* @param Request $request
* @param Account $account
*
* @return JsonResponse
* @throws FireflyException
*/
public function transactions(Request $request, Account $account): JsonResponse
{
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type);
@@ -181,7 +180,7 @@ class ListController extends Controller
}
$paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.accounts.transactions', [$account->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.accounts.transactions', [$account->id]).$this->buildParams());
$groups = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */

View File

@@ -71,7 +71,7 @@ class ShowController extends Controller
*
* Display a listing of the resource.
*
* @param Request $request
* @param Request $request
*
* @return JsonResponse
* @throws FireflyException
@@ -85,7 +85,7 @@ class ShowController extends Controller
// types to get, page size:
$types = $this->mapAccountTypes($this->parameters->get('type'));
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of accounts. Count it and split it.
$this->repository->resetAccountOrder();
@@ -99,7 +99,7 @@ class ShowController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.accounts.index') . $this->buildParams());
$paginator->setPath(route('api.v1.accounts.index').$this->buildParams());
/** @var AccountTransformer $transformer */
$transformer = app(AccountTransformer::class);
@@ -117,7 +117,7 @@ class ShowController extends Controller
*
* Show single instance.
*
* @param Account $account
* @param Account $account
*
* @return JsonResponse
*/
@@ -135,5 +135,4 @@ class ShowController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -63,7 +63,7 @@ class StoreController extends Controller
*
* Store a new instance.
*
* @param StoreRequest $request
* @param StoreRequest $request
*
* @return JsonResponse
*/
@@ -82,5 +82,4 @@ class StoreController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -66,8 +66,8 @@ class UpdateController extends Controller
*
* Update account.
*
* @param UpdateRequest $request
* @param Account $account
* @param UpdateRequest $request
* @param Account $account
*
* @return JsonResponse
*/
@@ -75,7 +75,7 @@ class UpdateController extends Controller
{
Log::debug(sprintf('Now in %s', __METHOD__));
$data = $request->getUpdateData();
$data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
$data['type'] = config('firefly.shortNamesByFullName.'.$account->accountType->type);
$account = $this->repository->update($account, $data);
$manager = $this->getManager();
$account->refresh();

View File

@@ -66,13 +66,14 @@ class DestroyController extends Controller
*
* @codeCoverageIgnore
*
* @param Attachment $attachment
* @param Attachment $attachment
*
* @return JsonResponse
*/
public function destroy(Attachment $attachment): JsonResponse
{
$this->repository->destroy($attachment);
app('preferences')->mark();
return response()->json([], 204);
}

View File

@@ -71,7 +71,7 @@ class ShowController extends Controller
*
* Download an attachment.
*
* @param Attachment $attachment
* @param Attachment $attachment
*
* @codeCoverageIgnore
* @return LaravelResponse
@@ -97,13 +97,13 @@ class ShowController extends Controller
$response
->header('Content-Description', 'File Transfer')
->header('Content-Type', 'application/octet-stream')
->header('Content-Disposition', 'attachment; filename=' . $quoted)
->header('Content-Disposition', 'attachment; filename='.$quoted)
->header('Content-Transfer-Encoding', 'binary')
->header('Connection', 'Keep-Alive')
->header('Expires', '0')
->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
->header('Pragma', 'public')
->header('Content-Length', (string) strlen($content));
->header('Content-Length', (string)strlen($content));
return $response;
}
@@ -125,7 +125,7 @@ class ShowController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of attachments. Count it and split it.
$collection = $this->repository->get();
@@ -134,7 +134,7 @@ class ShowController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.attachments.index') . $this->buildParams());
$paginator->setPath(route('api.v1.attachments.index').$this->buildParams());
/** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class);
@@ -152,7 +152,7 @@ class ShowController extends Controller
*
* Display the specified resource.
*
* @param Attachment $attachment
* @param Attachment $attachment
*
* @return JsonResponse
*/

View File

@@ -71,7 +71,7 @@ class StoreController extends Controller
*
* Store a newly created resource in storage.
*
* @param StoreRequest $request
* @param StoreRequest $request
*
* @return JsonResponse
* @throws FireflyException
@@ -97,8 +97,8 @@ class StoreController extends Controller
*
* @codeCoverageIgnore
*
* @param Request $request
* @param Attachment $attachment
* @param Request $request
* @param Attachment $attachment
*
* @return JsonResponse
*/

View File

@@ -67,8 +67,8 @@ class UpdateController extends Controller
*
* Update the specified resource in storage.
*
* @param UpdateRequest $request
* @param Attachment $attachment
* @param UpdateRequest $request
* @param Attachment $attachment
*
* @return JsonResponse
*/

View File

@@ -1,77 +0,0 @@
<?php
/*
* DestroyController.php
* 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/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Models\AvailableBudget;
use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
/**
* Class DestroyController
*/
class DestroyController extends Controller
{
private AvailableBudgetRepositoryInterface $abRepository;
/**
* AvailableBudgetController constructor.
*
* @codeCoverageIgnore
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->abRepository = app(AvailableBudgetRepositoryInterface::class);
$this->abRepository->setUser($user);
return $next($request);
}
);
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/available_budgets/listAvailableBudget
*
* Remove the specified resource from storage.
*
* @param AvailableBudget $availableBudget
*
* @codeCoverageIgnore
*
* @return JsonResponse
*/
public function destroy(AvailableBudget $availableBudget): JsonResponse
{
$this->abRepository->destroyAvailableBudget($availableBudget);
return response()->json([], 204);
}
}

View File

@@ -77,7 +77,7 @@ class ShowController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$start = $this->parameters->get('start');
$end = $this->parameters->get('end');
@@ -89,7 +89,7 @@ class ShowController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.available_budgets.index') . $this->buildParams());
$paginator->setPath(route('api.v1.available_budgets.index').$this->buildParams());
/** @var AvailableBudgetTransformer $transformer */
$transformer = app(AvailableBudgetTransformer::class);
@@ -107,7 +107,7 @@ class ShowController extends Controller
*
* Display the specified resource.
*
* @param AvailableBudget $availableBudget
* @param AvailableBudget $availableBudget
*
* @return JsonResponse
* @codeCoverageIgnore
@@ -124,5 +124,4 @@ class ShowController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -1,105 +0,0 @@
<?php
/*
* StoreController.php
* 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/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Models\AvailableBudget\Request;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\TransactionCurrencyFactory;
use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
use FireflyIII\Transformers\AvailableBudgetTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use JsonException;
use League\Fractal\Resource\Item;
/**
* Class StoreController
*/
class StoreController extends Controller
{
private AvailableBudgetRepositoryInterface $abRepository;
/**
* AvailableBudgetController constructor.
*
* @codeCoverageIgnore
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->abRepository = app(AvailableBudgetRepositoryInterface::class);
$this->abRepository->setUser($user);
return $next($request);
}
);
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/available_budgets/storeAvailableBudget
*
* Store a newly created resource in storage.
*
* @param Request $request
*
* @return JsonResponse
* @throws FireflyException
* @throws JsonException
*/
public function store(Request $request): JsonResponse
{
$data = $request->getAll();
$data['start']->startOfDay();
$data['end']->endOfDay();
// currency is not mandatory:
if (array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) {
$factory = app(TransactionCurrencyFactory::class);
$currency = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null);
$data['currency_id'] = $currency->id;
unset($data['currency_code']);
}
if (!array_key_exists('currency_id', $data)) {
$currency = app('amount')->getDefaultCurrencyByUser(auth()->user());
$data['currency_id'] = $currency->id;
}
$availableBudget = $this->abRepository->store($data);
$manager = $this->getManager();
/** @var AvailableBudgetTransformer $transformer */
$transformer = app(AvailableBudgetTransformer::class);
$transformer->setParameters($this->parameters);
$resource = new Item($availableBudget, $transformer, 'available_budgets');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -1,100 +0,0 @@
<?php
/*
* UpdateController.php
* 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/>.
*/
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Models\AvailableBudget\Request;
use FireflyIII\Factory\TransactionCurrencyFactory;
use FireflyIII\Models\AvailableBudget;
use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
use FireflyIII\Transformers\AvailableBudgetTransformer;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use League\Fractal\Resource\Item;
/**
* Class UpdateController
*/
class UpdateController extends Controller
{
private AvailableBudgetRepositoryInterface $abRepository;
/**
* AvailableBudgetController constructor.
*
* @codeCoverageIgnore
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
/** @var User $user */
$user = auth()->user();
$this->abRepository = app(AvailableBudgetRepositoryInterface::class);
$this->abRepository->setUser($user);
return $next($request);
}
);
}
/**
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/available_budgets/updateAvailableBudget
*
* Update the specified resource in storage.
*
* @param Request $request
* @param AvailableBudget $availableBudget
*
* @return JsonResponse
*/
public function update(Request $request, AvailableBudget $availableBudget): JsonResponse
{
$data = $request->getAll();
// find and validate currency ID
if (array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) {
$factory = app(TransactionCurrencyFactory::class);
$currency = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null) ?? app('amount')->getDefaultCurrency();
$currency->enabled = true;
$currency->save();
unset($data['currency_code']);
$data['currency_id'] = $currency->id;
}
$this->abRepository->updateAvailableBudget($availableBudget, $data);
$manager = $this->getManager();
/** @var AvailableBudgetTransformer $transformer */
$transformer = app(AvailableBudgetTransformer::class);
$transformer->setParameters($this->parameters);
$resource = new Item($availableBudget, $transformer, 'available_budgets');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -59,7 +59,7 @@ class DestroyController extends Controller
*
* Remove the specified resource from storage.
*
* @param Bill $bill
* @param Bill $bill
*
* @return JsonResponse
* @codeCoverageIgnore
@@ -67,8 +67,8 @@ class DestroyController extends Controller
public function destroy(Bill $bill): JsonResponse
{
$this->repository->destroy($bill);
app('preferences')->mark();
return response()->json([], 204);
}
}

View File

@@ -72,7 +72,7 @@ class ListController extends Controller
*
* Display a listing of the resource.
*
* @param Bill $bill
* @param Bill $bill
*
* @return JsonResponse
* @throws FireflyException
@@ -81,7 +81,7 @@ class ListController extends Controller
public function attachments(Bill $bill): JsonResponse
{
$manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($bill);
$count = $collection->count();
@@ -89,7 +89,7 @@ class ListController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.bills.attachments', [$bill->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.bills.attachments', [$bill->id]).$this->buildParams());
/** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class);
@@ -107,7 +107,7 @@ class ListController extends Controller
*
* List all of them.
*
* @param Bill $bill
* @param Bill $bill
*
* @return JsonResponse
* @throws FireflyException
@@ -118,7 +118,7 @@ class ListController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getRulesForBill($bill);
@@ -127,7 +127,7 @@ class ListController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.bills.rules', [$bill->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.bills.rules', [$bill->id]).$this->buildParams());
/** @var RuleTransformer $transformer */
$transformer = app(RuleTransformer::class);
@@ -136,7 +136,6 @@ class ListController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
@@ -145,9 +144,9 @@ class ListController extends Controller
*
* Show all transactions.
*
* @param Request $request
* @param Request $request
*
* @param Bill $bill
* @param Bill $bill
*
* @return JsonResponse
* @throws FireflyException
@@ -155,7 +154,7 @@ class ListController extends Controller
*/
public function transactions(Request $request, Bill $bill): JsonResponse
{
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type);
@@ -188,7 +187,7 @@ class ListController extends Controller
// get paginator.
$paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.bills.transactions', [$bill->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.bills.transactions', [$bill->id]).$this->buildParams());
$transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */
@@ -200,5 +199,4 @@ class ListController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -74,7 +74,7 @@ class ShowController extends Controller
$this->repository->correctOrder();
$bills = $this->repository->getBills();
$manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$count = $bills->count();
$bills = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
$paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
@@ -95,7 +95,7 @@ class ShowController extends Controller
*
* Show the specified bill.
*
* @param Bill $bill
* @param Bill $bill
*
* @return JsonResponse
* @codeCoverageIgnore

View File

@@ -65,7 +65,7 @@ class StoreController extends Controller
*
* Store a bill.
*
* @param StoreRequest $request
* @param StoreRequest $request
*
* @return JsonResponse
* @throws FireflyException

View File

@@ -62,8 +62,8 @@ class UpdateController extends Controller
*
* Update a bill.
*
* @param UpdateRequest $request
* @param Bill $bill
* @param UpdateRequest $request
* @param Bill $bill
*
* @return JsonResponse
*/
@@ -80,7 +80,5 @@ class UpdateController extends Controller
$resource = new Item($bill, $transformer, 'bills');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -59,7 +59,7 @@ class DestroyController extends Controller
*
* Remove the specified resource from storage.
*
* @param Budget $budget
* @param Budget $budget
*
* @return JsonResponse
* @codeCoverageIgnore
@@ -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);
}

View File

@@ -74,7 +74,7 @@ class ListController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/listAttachmentByBudget
*
* @param Budget $budget
* @param Budget $budget
*
* @return JsonResponse
* @throws FireflyException
@@ -83,7 +83,7 @@ class ListController extends Controller
public function attachments(Budget $budget): JsonResponse
{
$manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($budget);
$count = $collection->count();
@@ -91,7 +91,7 @@ class ListController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.budgets.attachments', [$budget->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.budgets.attachments', [$budget->id]).$this->buildParams());
/** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class);
@@ -109,7 +109,7 @@ class ListController extends Controller
*
* Display a listing of the resource.
*
* @param Budget $budget
* @param Budget $budget
*
* @return JsonResponse
* @throws FireflyException
@@ -118,13 +118,13 @@ class ListController extends Controller
public function budgetLimits(Budget $budget): JsonResponse
{
$manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$this->parameters->set('budget_id', $budget->id);
$collection = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
$count = $collection->count();
$budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
$paginator = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.budgets.budget_limits', [$budget->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.budgets.budget_limits', [$budget->id]).$this->buildParams());
/** @var BudgetLimitTransformer $transformer */
$transformer = app(BudgetLimitTransformer::class);
@@ -141,9 +141,9 @@ class ListController extends Controller
*
* Show all transactions.
*
* @param Request $request
* @param Request $request
*
* @param Budget $budget
* @param Budget $budget
*
* @return JsonResponse
* @throws FireflyException
@@ -151,7 +151,7 @@ class ListController extends Controller
*/
public function transactions(Request $request, Budget $budget): JsonResponse
{
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// user can overrule page size with limit parameter.
$limit = $this->parameters->get('limit');
@@ -189,7 +189,7 @@ class ListController extends Controller
}
$paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.budgets.transactions', [$budget->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.budgets.transactions', [$budget->id]).$this->buildParams());
$transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */
@@ -207,7 +207,7 @@ class ListController extends Controller
*
* Show all transactions.
*
* @param Request $request
* @param Request $request
*
* @return JsonResponse
* @throws FireflyException
@@ -215,7 +215,7 @@ class ListController extends Controller
*/
public function withoutBudget(Request $request): JsonResponse
{
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// user can overrule page size with limit parameter.
$limit = $this->parameters->get('limit');
@@ -253,7 +253,7 @@ class ListController extends Controller
}
$paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.budgets.without-budget') . $this->buildParams());
$paginator->setPath(route('api.v1.budgets.without-budget').$this->buildParams());
$transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */
@@ -264,5 +264,4 @@ class ListController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -78,7 +78,7 @@ class ShowController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getBudgets();
@@ -87,7 +87,7 @@ class ShowController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.budgets.index') . $this->buildParams());
$paginator->setPath(route('api.v1.budgets.index').$this->buildParams());
/** @var BudgetTransformer $transformer */
$transformer = app(BudgetTransformer::class);
@@ -102,7 +102,7 @@ class ShowController extends Controller
/**
* Show a budget.
*
* @param Budget $budget
* @param Budget $budget
*
* @return JsonResponse
* @codeCoverageIgnore
@@ -119,5 +119,4 @@ class ShowController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -62,7 +62,7 @@ class StoreController extends Controller
*
* Store a budget.
*
* @param StoreRequest $request
* @param StoreRequest $request
*
* @return JsonResponse
* @throws FireflyException

View File

@@ -62,8 +62,8 @@ class UpdateController extends Controller
*
* Update a budget.
*
* @param UpdateRequest $request
* @param Budget $budget
* @param UpdateRequest $request
* @param Budget $budget
*
* @return JsonResponse
*/
@@ -80,6 +80,5 @@ class UpdateController extends Controller
$resource = new Item($budget, $transformer, 'budgets');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -64,8 +64,8 @@ class DestroyController extends Controller
*
* Remove the specified resource from storage.
*
* @param Budget $budget
* @param BudgetLimit $budgetLimit
* @param Budget $budget
* @param BudgetLimit $budgetLimit
*
* @return JsonResponse
* @throws FireflyException
@@ -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);
}

View File

@@ -71,9 +71,9 @@ class ListController extends Controller
* https://api-docs.firefly-iii.org/#/budgets/listTransactionByBudgetLimit
* Show all transactions.
*
* @param Request $request
* @param Budget $budget
* @param BudgetLimit $budgetLimit
* @param Request $request
* @param Budget $budget
* @param BudgetLimit $budgetLimit
*
* @return JsonResponse
* @throws FireflyException
@@ -81,7 +81,7 @@ class ListController extends Controller
*/
public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type);
@@ -110,7 +110,7 @@ class ListController extends Controller
$collector->setRange($budgetLimit->start_date, $budgetLimit->end_date);
$collector->setTypes($types);
$paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.budgets.limits.transactions', [$budget->id, $budgetLimit->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.budgets.limits.transactions', [$budget->id, $budgetLimit->id]).$this->buildParams());
$transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */

View File

@@ -75,8 +75,8 @@ class ShowController extends Controller
*
* Display a listing of the budget limits for this budget.
*
* @param Request $request
* @param Budget $budget
* @param Request $request
* @param Budget $budget
*
* @return JsonResponse
* @throws FireflyException
@@ -86,12 +86,12 @@ class ShowController extends Controller
{
$manager = $this->getManager();
$manager->parseIncludes('budget');
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
$count = $collection->count();
$budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
$paginator = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.budgets.limits.index', [$budget->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.budgets.limits.index', [$budget->id]).$this->buildParams());
/** @var BudgetLimitTransformer $transformer */
$transformer = app(BudgetLimitTransformer::class);
@@ -109,7 +109,7 @@ class ShowController extends Controller
*
* Display a listing of the budget limits for this budget.
*
* @param DateRequest $request
* @param DateRequest $request
*
* @return JsonResponse
* @throws FireflyException
@@ -119,12 +119,12 @@ class ShowController extends Controller
{
$manager = $this->getManager();
$manager->parseIncludes('budget');
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
$count = $collection->count();
$budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
$paginator = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.budget-limits.index') . $this->buildParams());
$paginator->setPath(route('api.v1.budget-limits.index').$this->buildParams());
/** @var BudgetLimitTransformer $transformer */
$transformer = app(BudgetLimitTransformer::class);
@@ -140,16 +140,16 @@ class ShowController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/budgets/getBudgetLimit
*
* @param Request $request
* @param Budget $budget
* @param BudgetLimit $budgetLimit
* @param Request $request
* @param Budget $budget
* @param BudgetLimit $budgetLimit
*
* @return JsonResponse
* @throws FireflyException
*/
public function show(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{
if ((int) $budget->id !== (int) $budgetLimit->budget_id) {
if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
throw new FireflyException('20028: The budget limit does not belong to the budget.');
}
// continue!
@@ -163,5 +163,4 @@ class ShowController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -65,8 +65,8 @@ class StoreController extends Controller
*
* Store a newly created resource in storage.
*
* @param StoreRequest $request
* @param Budget $budget
* @param StoreRequest $request
* @param Budget $budget
*
* @return JsonResponse
*/

View File

@@ -67,17 +67,16 @@ class UpdateController extends Controller
/**
* Update the specified resource in storage.
*
* @param UpdateRequest $request
* @param Budget $budget
* @param BudgetLimit $budgetLimit
* @param UpdateRequest $request
* @param Budget $budget
* @param BudgetLimit $budgetLimit
*
* @return JsonResponse
* @throws FireflyException
*/
public function update(UpdateRequest $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
{
if ((int) $budget->id !== (int) $budgetLimit->budget_id) {
if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
throw new FireflyException('20028: The budget limit does not belong to the budget.');
}
$data = $request->getAll();
@@ -92,6 +91,5 @@ class UpdateController extends Controller
$resource = new Item($budgetLimit, $transformer, 'budget_limits');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -59,7 +59,7 @@ class DestroyController extends Controller
*
* Remove the specified resource from storage.
*
* @param Category $category
* @param Category $category
*
* @return JsonResponse
* @codeCoverageIgnore
@@ -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);
}

View File

@@ -69,7 +69,7 @@ class ListController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/categories/listAttachmentByCategory
*
* @param Category $category
* @param Category $category
*
* @return JsonResponse
* @throws FireflyException
@@ -78,7 +78,7 @@ class ListController extends Controller
public function attachments(Category $category): JsonResponse
{
$manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($category);
$count = $collection->count();
@@ -86,7 +86,7 @@ class ListController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.categories.attachments', [$category->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.categories.attachments', [$category->id]).$this->buildParams());
/** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class);
@@ -104,9 +104,9 @@ class ListController extends Controller
*
* Show all transactions.
*
* @param Request $request
* @param Request $request
*
* @param Category $category
* @param Category $category
*
* @return JsonResponse
* @throws FireflyException
@@ -114,7 +114,7 @@ class ListController extends Controller
*/
public function transactions(Request $request, Category $category): JsonResponse
{
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type);
@@ -145,7 +145,7 @@ class ListController extends Controller
}
$paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.categories.transactions', [$category->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.categories.transactions', [$category->id]).$this->buildParams());
$transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */
@@ -157,5 +157,4 @@ class ListController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -74,7 +74,7 @@ class ShowController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getCategories();
@@ -83,7 +83,7 @@ class ShowController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($categories, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.categories.index') . $this->buildParams());
$paginator->setPath(route('api.v1.categories.index').$this->buildParams());
/** @var CategoryTransformer $transformer */
$transformer = app(CategoryTransformer::class);
@@ -100,7 +100,7 @@ class ShowController extends Controller
*
* Show the category.
*
* @param Category $category
* @param Category $category
*
* @return JsonResponse
* @codeCoverageIgnore

View File

@@ -62,7 +62,7 @@ class StoreController extends Controller
*
* Store new category.
*
* @param StoreRequest $request
* @param StoreRequest $request
*
* @return JsonResponse
* @throws FireflyException
@@ -80,5 +80,4 @@ class StoreController extends Controller
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -62,8 +62,8 @@ class UpdateController extends Controller
*
* Update the category.
*
* @param UpdateRequest $request
* @param Category $category
* @param UpdateRequest $request
* @param Category $category
*
* @return JsonResponse
*/
@@ -80,6 +80,5 @@ class UpdateController extends Controller
$resource = new Item($category, $transformer, 'categories');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -62,7 +62,7 @@ class DestroyController extends Controller
*
* Remove the specified resource from storage.
*
* @param ObjectGroup $objectGroup
* @param ObjectGroup $objectGroup
*
* @codeCoverageIgnore
* @return JsonResponse
@@ -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);
}

View File

@@ -68,7 +68,7 @@ class ListController extends Controller
*
* List all bills in this object group
*
* @param ObjectGroup $objectGroup
* @param ObjectGroup $objectGroup
*
* @return JsonResponse
* @throws FireflyException
@@ -78,7 +78,7 @@ class ListController extends Controller
{
$manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of piggy banks. Count it and split it.
$collection = $this->repository->getBills($objectGroup);
$count = $collection->count();
@@ -86,7 +86,7 @@ class ListController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.currencies.bills', [$objectGroup->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.currencies.bills', [$objectGroup->id]).$this->buildParams());
/** @var BillTransformer $transformer */
$transformer = app(BillTransformer::class);
@@ -104,7 +104,7 @@ class ListController extends Controller
*
* List all piggies under the object group.
*
* @param ObjectGroup $objectGroup
* @param ObjectGroup $objectGroup
*
* @return JsonResponse
* @throws FireflyException
@@ -116,7 +116,7 @@ class ListController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of piggy banks. Count it and split it.
$collection = $this->repository->getPiggyBanks($objectGroup);
@@ -125,7 +125,7 @@ class ListController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.object-groups.piggy_banks', [$objectGroup->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.object-groups.piggy_banks', [$objectGroup->id]).$this->buildParams());
/** @var PiggyBankTransformer $transformer */
$transformer = app(PiggyBankTransformer::class);
@@ -135,6 +135,5 @@ class ListController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -69,7 +69,7 @@ class ShowController extends Controller
*
* Display a listing of the resource.
*
* @param Request $request
* @param Request $request
*
* @return JsonResponse
* @throws FireflyException
@@ -80,7 +80,7 @@ class ShowController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$this->repository->resetOrder();
$collection = $this->repository->get();
@@ -89,7 +89,7 @@ class ShowController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($objectGroups, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.object-groups.index') . $this->buildParams());
$paginator->setPath(route('api.v1.object-groups.index').$this->buildParams());
/** @var ObjectGroupTransformer $transformer */
$transformer = app(ObjectGroupTransformer::class);
@@ -107,7 +107,7 @@ class ShowController extends Controller
*
* Show single instance.
*
* @param ObjectGroup $objectGroup
* @param ObjectGroup $objectGroup
*
* @return JsonResponse
*/

View File

@@ -63,8 +63,8 @@ class UpdateController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/object_groups/updateObjectGroup
*
* @param UpdateRequest $request
* @param ObjectGroup $objectGroup
* @param UpdateRequest $request
* @param ObjectGroup $objectGroup
*
* @return JsonResponse
*/

View File

@@ -59,7 +59,7 @@ class DestroyController extends Controller
*
* Delete the resource.
*
* @param PiggyBank $piggyBank
* @param PiggyBank $piggyBank
*
* @return JsonResponse
* @codeCoverageIgnore
@@ -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);
}

View File

@@ -63,7 +63,7 @@ class ListController extends Controller
* This endpoint is documented at:
* https://api-docs.firefly-iii.org/#/piggy_banks/listAttachmentByPiggyBank
*
* @param PiggyBank $piggyBank
* @param PiggyBank $piggyBank
*
* @return JsonResponse
* @throws FireflyException
@@ -72,7 +72,7 @@ class ListController extends Controller
public function attachments(PiggyBank $piggyBank): JsonResponse
{
$manager = $this->getManager();
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$collection = $this->repository->getAttachments($piggyBank);
$count = $collection->count();
@@ -80,7 +80,7 @@ class ListController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.piggy_banks.attachments', [$piggyBank->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.piggy_banks.attachments', [$piggyBank->id]).$this->buildParams());
/** @var AttachmentTransformer $transformer */
$transformer = app(AttachmentTransformer::class);
@@ -98,7 +98,7 @@ class ListController extends Controller
*
* List single resource.
*
* @param PiggyBank $piggyBank
* @param PiggyBank $piggyBank
*
* @return JsonResponse
* @throws FireflyException
@@ -107,7 +107,7 @@ class ListController extends Controller
public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse
{
// types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$manager = $this->getManager();
$collection = $this->repository->getEvents($piggyBank);
@@ -116,7 +116,7 @@ class ListController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.piggy_banks.events', [$piggyBank->id]) . $this->buildParams());
$paginator->setPath(route('api.v1.piggy_banks.events', [$piggyBank->id]).$this->buildParams());
/** @var PiggyBankEventTransformer $transformer */
$transformer = app(PiggyBankEventTransformer::class);
@@ -126,6 +126,5 @@ class ListController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -73,7 +73,7 @@ class ShowController extends Controller
{
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->getPiggyBanks();
@@ -82,7 +82,7 @@ class ShowController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.piggy_banks.index') . $this->buildParams());
$paginator->setPath(route('api.v1.piggy_banks.index').$this->buildParams());
/** @var PiggyBankTransformer $transformer */
$transformer = app(PiggyBankTransformer::class);
@@ -92,7 +92,6 @@ class ShowController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
@@ -101,7 +100,7 @@ class ShowController extends Controller
*
* List single resource.
*
* @param PiggyBank $piggyBank
* @param PiggyBank $piggyBank
*
* @return JsonResponse
* @codeCoverageIgnore
@@ -117,6 +116,5 @@ class ShowController extends Controller
$resource = new Item($piggyBank, $transformer, 'piggy_banks');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -62,7 +62,7 @@ class StoreController extends Controller
*
* Store new object.
*
* @param StoreRequest $request
* @param StoreRequest $request
*
* @return JsonResponse
* @throws FireflyException

View File

@@ -62,8 +62,8 @@ class UpdateController extends Controller
*
* Update piggy bank.
*
* @param UpdateRequest $request
* @param PiggyBank $piggyBank
* @param UpdateRequest $request
* @param PiggyBank $piggyBank
*
* @return JsonResponse
*/
@@ -84,6 +84,5 @@ class UpdateController extends Controller
$resource = new Item($piggyBank, $transformer, 'piggy_banks');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -59,7 +59,7 @@ class DestroyController extends Controller
*
* Delete the resource.
*
* @param Recurrence $recurrence
* @param Recurrence $recurrence
*
* @return JsonResponse
* @codeCoverageIgnore
@@ -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);
}

View File

@@ -69,8 +69,8 @@ class ListController extends Controller
*
* Show transactions for this recurrence.
*
* @param Request $request
* @param Recurrence $recurrence
* @param Request $request
* @param Recurrence $recurrence
*
* @return JsonResponse
* @throws FireflyException
@@ -78,7 +78,7 @@ class ListController extends Controller
*/
public function transactions(Request $request, Recurrence $recurrence): JsonResponse
{
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$type = $request->get('type') ?? 'default';
$this->parameters->set('type', $type);
@@ -110,7 +110,7 @@ class ListController extends Controller
$collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
}
$paginator = $collector->getPaginatedGroups();
$paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
$paginator->setPath(route('api.v1.transactions.index').$this->buildParams());
$transactions = $paginator->getCollection();
/** @var TransactionGroupTransformer $transformer */

View File

@@ -74,7 +74,7 @@ class ShowController extends Controller
$manager = $this->getManager();
// types to get, page size:
$pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
$pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
// get list of budgets. Count it and split it.
$collection = $this->repository->get();
@@ -83,7 +83,7 @@ class ShowController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.recurrences.index') . $this->buildParams());
$paginator->setPath(route('api.v1.recurrences.index').$this->buildParams());
/** @var RecurrenceTransformer $transformer */
$transformer = app(RecurrenceTransformer::class);
@@ -93,7 +93,6 @@ class ShowController extends Controller
$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
/**
@@ -102,7 +101,7 @@ class ShowController extends Controller
*
* List single resource.
*
* @param Recurrence $recurrence
* @param Recurrence $recurrence
*
* @return JsonResponse
* @codeCoverageIgnore

View File

@@ -62,7 +62,7 @@ class StoreController extends Controller
*
* Store new object.
*
* @param StoreRequest $request
* @param StoreRequest $request
*
* @return JsonResponse
* @throws FireflyException

View File

@@ -62,8 +62,8 @@ class UpdateController extends Controller
*
* Update single recurrence.
*
* @param UpdateRequest $request
* @param Recurrence $recurrence
* @param UpdateRequest $request
* @param Recurrence $recurrence
*
* @return JsonResponse
*/
@@ -80,6 +80,5 @@ class UpdateController extends Controller
$resource = new Item($recurrence, $transformer, 'recurrences');
return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
}
}

View File

@@ -63,7 +63,7 @@ class DestroyController extends Controller
*
* Delete the resource.
*
* @param Rule $rule
* @param Rule $rule
*
* @return JsonResponse
* @codeCoverageIgnore
@@ -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);
}

Some files were not shown because too many files have changed in this diff Show More