James Cole
|
53f1b0218c
|
Merge tag 'v6.0.20' into develop
v6.0.20
|
2023-08-12 19:56:11 +02:00 |
|
James Cole
|
0a7a099796
|
Merge branch 'release/v6.0.20'
|
2023-08-12 19:56:07 +02:00 |
|
James Cole
|
ed90ebc896
|
Update final meta
|
2023-08-12 19:55:31 +02:00 |
|
James Cole
|
87fe518d45
|
Rebuild JS and CSS
|
2023-08-12 19:41:59 +02:00 |
|
James Cole
|
5cb0891a27
|
Forgot to add a date range
|
2023-08-12 19:21:43 +02:00 |
|
James Cole
|
b4bd66bd58
|
Various fixes.
|
2023-08-12 18:21:29 +02:00 |
|
James Cole
|
64d95fe845
|
Add integrity things to JS things.
|
2023-08-12 18:12:20 +02:00 |
|
James Cole
|
a2d6d7a92c
|
Add nonce.
|
2023-08-12 18:09:23 +02:00 |
|
James Cole
|
1d8a784586
|
Update meta files for new release.
|
2023-08-12 18:01:51 +02:00 |
|
James Cole
|
3c8bfae8ff
|
Update API version
|
2023-08-12 17:47:13 +02:00 |
|
James Cole
|
f65eccfe4c
|
Fix https://github.com/firefly-iii/firefly-iii/issues/7835
|
2023-08-12 17:46:56 +02:00 |
|
James Cole
|
7ce6dc9f16
|
Merge branch 'adminlte4' into develop
|
2023-08-12 17:44:08 +02:00 |
|
James Cole
|
4a73caf4c3
|
Rebuild frontend
|
2023-08-12 17:44:00 +02:00 |
|
James Cole
|
1b9d8dd3c3
|
Fix #7845 among other things
|
2023-08-12 17:43:24 +02:00 |
|
James Cole
|
b11bfb0aae
|
update frontend
|
2023-08-12 17:41:56 +02:00 |
|
James Cole
|
024e16bf4b
|
Cleanup charts
|
2023-08-12 07:53:11 +02:00 |
|
James Cole
|
daf753d76e
|
Merge branch 'develop' into adminlte4
|
2023-08-11 19:43:18 +02:00 |
|
James Cole
|
4c90f66578
|
Minor code cleanup
|
2023-08-11 19:40:44 +02:00 |
|
James Cole
|
db94f18d46
|
Clean up migrations
|
2023-08-11 19:37:52 +02:00 |
|
James Cole
|
a9bd0f551d
|
Make sure all objects also add user group
|
2023-08-11 19:37:28 +02:00 |
|
James Cole
|
e1ba2d9ad9
|
New translations
|
2023-08-11 06:24:50 +02:00 |
|
James Cole
|
939c636a74
|
Add new action that can switch the source and destination account of a transfer
|
2023-08-11 06:16:40 +02:00 |
|
James Cole
|
2b829cb645
|
Code cleanup
|
2023-08-11 06:05:02 +02:00 |
|
James Cole
|
4bbc898639
|
Expand bill API and v2 account API
|
2023-08-11 06:04:03 +02:00 |
|
James Cole
|
27d07d5807
|
Expand views
|
2023-08-11 06:03:31 +02:00 |
|
James Cole
|
f010ffefc1
|
Expand with list of piggy banks
|
2023-08-10 19:51:36 +02:00 |
|
James Cole
|
fc0fee161e
|
Merge branch 'develop' into adminlte4
|
2023-08-09 14:14:57 +02:00 |
|
James Cole
|
72c99d3834
|
New API endpoints + transformer
|
2023-08-09 14:14:44 +02:00 |
|
James Cole
|
a2984f299b
|
Extend API
|
2023-08-09 14:14:33 +02:00 |
|
James Cole
|
3925077223
|
Expand views
|
2023-08-09 14:13:32 +02:00 |
|
James Cole
|
deb51bd8de
|
Merge branch 'develop' into adminlte4
|
2023-08-08 16:45:23 +02:00 |
|
James Cole
|
03f39f53d8
|
Fix nullpointer
|
2023-08-08 15:55:48 +02:00 |
|
James Cole
|
e72314778c
|
Fix sankey chart
|
2023-08-08 15:55:26 +02:00 |
|
James Cole
|
ced3e9387a
|
Merge branch 'develop' into adminlte4
|
2023-08-08 15:04:10 +02:00 |
|
James Cole
|
02c906afe6
|
Expand API to return transaction groups.
|
2023-08-08 15:03:58 +02:00 |
|
James Cole
|
7a2d4c9bd2
|
Log as error, not debug
|
2023-08-08 14:11:25 +02:00 |
|
James Cole
|
dffddfda18
|
Expand layout
|
2023-08-08 14:11:04 +02:00 |
|
James Cole
|
9bb62c865a
|
Merge branch 'develop' into adminlte4
|
2023-08-07 19:05:41 +02:00 |
|
James Cole
|
a97ebf2b97
|
Move to chartJS
|
2023-08-07 19:05:23 +02:00 |
|
James Cole
|
9a62a6c514
|
Merge pull request #7832 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-deprecation-rules-1.1.4
chore(deps-dev): bump phpstan/phpstan-deprecation-rules from 1.1.3 to 1.1.4
|
2023-08-07 05:52:09 +02:00 |
|
James Cole
|
04dc162270
|
Merge pull request #7831 from firefly-iii/dependabot/composer/develop/laravel/framework-10.17.1
chore(deps): bump laravel/framework from 10.16.1 to 10.17.1
|
2023-08-07 05:51:59 +02:00 |
|
James Cole
|
75d5a50328
|
Merge pull request #7830 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-1.10.27
chore(deps-dev): bump phpstan/phpstan from 1.10.26 to 1.10.27
|
2023-08-07 05:51:51 +02:00 |
|
James Cole
|
eadb7d5dcb
|
Merge pull request #7829 from firefly-iii/dependabot/composer/develop/mockery/mockery-1.6.5
chore(deps-dev): bump mockery/mockery from 1.6.4 to 1.6.5
|
2023-08-07 05:51:42 +02:00 |
|
James Cole
|
8dc07f1148
|
Merge pull request #7828 from firefly-iii/dependabot/composer/develop/league/csv-9.10.0
chore(deps): bump league/csv from 9.9.0 to 9.10.0
|
2023-08-07 05:51:32 +02:00 |
|
dependabot[bot]
|
217ce85a9b
|
chore(deps-dev): bump phpstan/phpstan-deprecation-rules
Bumps [phpstan/phpstan-deprecation-rules](https://github.com/phpstan/phpstan-deprecation-rules) from 1.1.3 to 1.1.4.
- [Release notes](https://github.com/phpstan/phpstan-deprecation-rules/releases)
- [Commits](https://github.com/phpstan/phpstan-deprecation-rules/compare/1.1.3...1.1.4)
---
updated-dependencies:
- dependency-name: phpstan/phpstan-deprecation-rules
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2023-08-07 03:26:49 +00:00 |
|
dependabot[bot]
|
ef88b25dbd
|
chore(deps): bump laravel/framework from 10.16.1 to 10.17.1
Bumps [laravel/framework](https://github.com/laravel/framework) from 10.16.1 to 10.17.1.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/10.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v10.16.1...v10.17.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>
|
2023-08-07 03:26:44 +00:00 |
|
dependabot[bot]
|
4c2e2a3a5a
|
chore(deps-dev): bump phpstan/phpstan from 1.10.26 to 1.10.27
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.26 to 1.10.27.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.10.26...1.10.27)
---
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-08-07 03:26:29 +00:00 |
|
dependabot[bot]
|
1e8e1c6e51
|
chore(deps-dev): bump mockery/mockery from 1.6.4 to 1.6.5
Bumps [mockery/mockery](https://github.com/mockery/mockery) from 1.6.4 to 1.6.5.
- [Release notes](https://github.com/mockery/mockery/releases)
- [Changelog](https://github.com/mockery/mockery/blob/1.6.x/CHANGELOG.md)
- [Commits](https://github.com/mockery/mockery/compare/1.6.4...1.6.5)
---
updated-dependencies:
- dependency-name: mockery/mockery
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2023-08-07 03:26:22 +00:00 |
|
dependabot[bot]
|
a92944786c
|
chore(deps): bump league/csv from 9.9.0 to 9.10.0
Bumps [league/csv](https://github.com/thephpleague/csv) from 9.9.0 to 9.10.0.
- [Release notes](https://github.com/thephpleague/csv/releases)
- [Changelog](https://github.com/thephpleague/csv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thephpleague/csv/compare/9.9.0...9.10.0)
---
updated-dependencies:
- dependency-name: league/csv
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2023-08-07 03:26:17 +00:00 |
|
James Cole
|
8ce760a0bf
|
Merge branch 'develop' into adminlte4
# Conflicts:
# app/Api/V2/Controllers/Chart/CategoryController.php
|
2023-08-06 19:40:09 +02:00 |
|