James Cole 93d481b515 Merge branch 'release/5.5.0' into main ...

# Conflicts:
#	config/firefly.php
#	frontend/src/scss/_variables.scss
#	frontend/yarn.lock
#	public/v2/css/app.css
#	public/v2/css/app.css.map
#	public/v2/js/transactions/edit.js
#	public/v2/js/transactions/edit.js.map
#	public/v2/js/vendor.js
#	public/v2/js/vendor.js.map

2021-03-28 11:56:01 +02:00

..

app.php

Upgrade to 7.4

2020-06-06 22:25:52 +02:00

auth.php

Code cleanup.

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

breadcrumbs.php

Make it easier to switch between v1/v2 layout.

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

broadcasting.php

Apply fixes from StyleCI

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

cache.php

Code cleanup.

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

database.php

Reverse logic operators.

2020-10-24 16:59:56 +02:00

debugbar.php

Code cleanup.

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

filesystems.php

Clean up config.

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

firefly.php

Files for new reelase.

2021-03-27 20:01:28 +01:00

google2fa.php

Make it easier to switch between v1/v2 layout.

2021-02-01 06:57:29 +01: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

Fix some translations.

2020-08-02 09:47:19 +02:00

ldap_auth.php

Let's do this in a separate branch

2020-12-20 10:41:55 +01:00

ldap.php

Let's do this in a separate branch

2020-12-20 10:41:55 +01:00

logging.php

Fix tests for transaction storage.

2021-03-14 16:08:49 +01:00

mail.php

Code cleanup.

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

queue.php

Update some copyrights.

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

services.php

Apply fixes from StyleCI

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

session.php

Update frontend.

2021-02-14 07:53:20 +01:00

twigbridge.php

Code cleanup.

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

upgrade.php

Add PHP7.4 instructions.

2020-07-03 06:19:39 +02:00

view.php

Make it easier to switch between v1/v2 layout.

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