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

..

BulkController.php

Fix bulk update rules

2022-10-18 20:41:48 +02:00

ConvertController.php

Reformat various code.

2022-03-29 14:58:06 +02:00

CreateController.php

Replace uri with url

2022-04-12 18:19:30 +02:00

DeleteController.php

Fix https://github.com/firefly-iii/firefly-iii/issues/6510

2022-10-06 06:17:49 +02:00

EditController.php

Replace uri with url

2022-04-12 18:19:30 +02:00

IndexController.php

Reformat various code.

2022-03-29 15:10:05 +02:00

LinkController.php

Replace uri with url

2022-04-12 18:19:30 +02:00

MassController.php

Replace uri with url

2022-04-12 18:19:30 +02:00

ShowController.php

Display audit logs

2022-10-02 14:37:50 +02:00