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

..

app.php

Reformat various code.

2022-03-29 15:01:12 +02:00

auth.php

Reformat various code.

2022-03-29 15:01:12 +02:00

breadcrumbs.php

Reformat various code.

2022-03-29 15:01:12 +02:00

broadcasting.php

Apply fixes from StyleCI

2020-03-17 16:06:30 +00:00

bulk.php

Make bulk rules clauses match bulk TransactionController params

2022-10-01 22:39:25 +02:00

cache.php

Reformat various code.

2022-03-29 15:01:12 +02:00

cer.php

Update copyright statements

2022-10-16 19:29:53 +02:00

database.php

Redis username needed for both databases

2022-09-09 14:21:16 +02:00

debugbar.php

Code cleanup.

2021-03-28 11:43:07 +02:00

filesystems.php

Reformat various code.

2022-03-29 15:01:12 +02:00

firefly.php

Merge branch 'develop' into 5.8-dev

2022-10-23 14:49:54 +02:00

google2fa.php

Update packages.

2022-03-30 20:09:19 +02:00

hashing.php

Apply fixes from StyleCI

2020-03-17 16:06:30 +00:00

ide-helper.php

Clean up config.

2020-03-20 17:31:54 +01:00

intro.php

Reformat various code.

2022-03-29 15:01:12 +02:00

logging.php

Reformat various code.

2022-03-29 15:01:12 +02:00

mail.php

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

2022-05-31 05:56:38 +02:00

queue.php

Update some copyrights.

2021-01-29 18:50:35 +01:00

sanctum.php

Reformat various code.

2022-03-29 15:01:12 +02:00

search.php

Add ability to move stuff around, fix spelling.

2022-09-24 17:43:49 +02:00

services.php

Apply fixes from StyleCI

2020-03-17 16:06:30 +00:00

session.php

Reformat various code.

2022-03-29 15:01:12 +02:00

twigbridge.php

Reformat various code.

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

upgrade.php

Reformat various code.

2022-03-29 15:01:12 +02:00

user_roles.php

Update meta files for new release.

2021-09-17 09:23:49 +02:00

view.php

Make it easier to switch between v1/v2 layout.

2021-01-31 20:29:17 +01:00