Commit Graph

15414 Commits

Author SHA1 Message Date
James Cole
fae5cdae50
Fix issue in link. 2021-05-01 08:36:19 +02:00
James Cole
8ffe08bfb9
Add more info. 2021-05-01 07:14:43 +02:00
James Cole
1c2b14868b
Skip if null 2021-05-01 07:07:32 +02:00
James Cole
7775a0141b
Skips pgsql for some reason. 2021-05-01 06:53:42 +02:00
James Cole
831272d971
Repair sequences for #4545 2021-05-01 06:46:36 +02:00
James Cole
aac3027480
First attempt 2021-04-30 19:51:50 +02:00
James Cole
c8c4507d4b
Merge branch 'main' into develop 2021-04-30 17:58:22 +02:00
James Cole
6a74cd21fb
Merge pull request #4727 from firefly-iii/dependabot/composer/laravel/framework-8.40.0
Bump laravel/framework from 8.38.0 to 8.40.0
2021-04-30 06:58:07 +02:00
dependabot[bot]
eb5eca9fa5
Bump laravel/framework from 8.38.0 to 8.40.0
Bumps [laravel/framework](https://github.com/laravel/framework) from 8.38.0 to 8.40.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/8.x/CHANGELOG-8.x.md)
- [Commits](https://github.com/laravel/framework/compare/v8.38.0...v8.40.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-30 04:10:52 +00:00
James Cole
0e702fb334
Merge pull request #4725 from firefly-iii/dependabot/composer/composer/composer-2.0.13
Bump composer/composer from 2.0.12 to 2.0.13
2021-04-30 06:09:41 +02:00
dependabot[bot]
626f97cd65
Bump composer/composer from 2.0.12 to 2.0.13
Bumps [composer/composer](https://github.com/composer/composer) from 2.0.12 to 2.0.13.
- [Release notes](https://github.com/composer/composer/releases)
- [Changelog](https://github.com/composer/composer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/composer/composer/compare/2.0.12...2.0.13)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-29 21:54:42 +00:00
James Cole
a83578d1ae
Update code for proper index. 2021-04-27 07:55:54 +02:00
James Cole
be844b82af
Add missing method. 2021-04-27 06:57:06 +02:00
James Cole
65c49c7a71
Merge branch 'develop' into feature/credit_calc
# Conflicts:
#	app/Factory/TransactionJournalMetaFactory.php
#	app/Repositories/Account/AccountRepository.php
#	app/Transformers/AccountTransformer.php
#	config/firefly.php
#	frontend/src/components/accounts/Create.vue
2021-04-27 06:54:38 +02:00
James Cole
f03b0569cf
Update packages 2021-04-27 06:50:10 +02:00
James Cole
82f3a37a3e
Clean up some code. 2021-04-27 06:45:11 +02:00
James Cole
112a27dbd9
Clean up some code. 2021-04-27 06:42:07 +02:00
James Cole
366eca3173
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-04-27 06:24:49 +02:00
James Cole
fab0c5bfd9
Small code cleanup. 2021-04-27 06:23:16 +02:00
James Cole
dc3b923258
Merge pull request #4716 from rubenvanerk/patch-1
Fix link in index
2021-04-26 20:29:43 +02:00
Ruben van Erk
3622d3234a
Fix link in index 2021-04-26 20:08:35 +02:00
James Cole
8ef6595ced
Better sentence 2021-04-26 09:48:04 +02:00
James Cole
cf2c99d986
Merge pull request #4711 from firefly-iii/dependabot/composer/develop/vimeo/psalm-4.7.1
Bump vimeo/psalm from 4.7.0 to 4.7.1
2021-04-26 08:19:45 +02:00
James Cole
672add8668
Merge pull request #4712 from firefly-iii/dependabot/composer/develop/filp/whoops-2.12.1
Bump filp/whoops from 2.12.0 to 2.12.1
2021-04-26 08:14:29 +02:00
James Cole
d5826861a0
Merge pull request #4713 from firefly-iii/dependabot/npm_and_yarn/frontend/develop/chart.js-3.2.0
Bump chart.js from 3.1.1 to 3.2.0 in /frontend
2021-04-26 08:10:46 +02:00
dependabot[bot]
a8494bd6f0
Bump chart.js from 3.1.1 to 3.2.0 in /frontend
Bumps [chart.js](https://github.com/chartjs/Chart.js) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/chartjs/Chart.js/releases)
- [Commits](https://github.com/chartjs/Chart.js/compare/v3.1.1...v3.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-26 05:32:50 +00:00
James Cole
0b94851623
Fix some cases in loans 2021-04-26 07:29:39 +02:00
dependabot[bot]
7fa0c14f8c
Bump filp/whoops from 2.12.0 to 2.12.1
Bumps [filp/whoops](https://github.com/filp/whoops) from 2.12.0 to 2.12.1.
- [Release notes](https://github.com/filp/whoops/releases)
- [Changelog](https://github.com/filp/whoops/blob/master/CHANGELOG.md)
- [Commits](https://github.com/filp/whoops/compare/2.12.0...2.12.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-26 05:09:07 +00:00
dependabot[bot]
9bd22d4252
Bump vimeo/psalm from 4.7.0 to 4.7.1
Bumps [vimeo/psalm](https://github.com/vimeo/psalm) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/vimeo/psalm/releases)
- [Commits](https://github.com/vimeo/psalm/compare/4.7.0...4.7.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-26 05:08:38 +00:00
James Cole
b78f5bd54a
Fix #4708 2021-04-26 06:39:12 +02:00
James Cole
0949a264b8
Fix #4710 2021-04-26 06:18:30 +02:00
James Cole
97a0110931 Merge tag '5.5.9' into develop
5.5.9
2021-04-24 21:37:43 +02:00
James Cole
83ec935ac3 Merge branch 'release/5.5.9' into main 2021-04-24 21:37:42 +02:00
James Cole
e46da428eb
Update meta files. 2021-04-24 21:27:36 +02:00
James Cole
26089f992e
Remove debug code. 2021-04-24 21:18:15 +02:00
James Cole
13233e0893
Fix #4706 2021-04-24 21:08:46 +02:00
James Cole
da934575a6
Disable unused method. 2021-04-24 06:09:31 +02:00
James Cole
6feb04c800
Rebuild various components. 2021-04-24 05:34:24 +02:00
James Cole
be3cb791a5
Fix text 2021-04-23 19:15:03 +02:00
James Cole
e3b93af297
Add some code to fix liabilities. 2021-04-23 19:13:38 +02:00
James Cole
d56f97e86d
Files for 5.5.9 2021-04-23 18:48:15 +02:00
James Cole
a78614f198
Align top boxes 2021-04-23 06:15:24 +02:00
James Cole
2b25631611
Fix budget API call 2021-04-23 06:03:06 +02:00
James Cole
98613b5ea6
Update composer 2021-04-22 19:56:52 +02:00
James Cole
105ecc4452
Add debug 2021-04-22 19:56:42 +02:00
James Cole
418a682f7e
Remove bad account types. 2021-04-22 19:55:43 +02:00
James Cole
215e5d42a7
Rebuild frontend. 2021-04-22 18:41:44 +02:00
James Cole
21d71bd03c
Include user in preference 2021-04-22 18:34:08 +02:00
James Cole
3184a8536e
Add another command. 2021-04-22 18:33:53 +02:00
James Cole
ddf9938c00
Fix issue with empty box. 2021-04-22 18:33:37 +02:00