Commit Graph

15414 Commits

Author SHA1 Message Date
James Cole
3e31752a8f
Add some boxes. 2021-06-19 09:09:08 +02:00
James Cole
4ba55e8546
Update sonar properties. 2021-06-19 08:19:07 +02:00
James Cole
0d80582874
Update translations and account index code. 2021-06-19 08:18:54 +02:00
James Cole
3e88bf4692
Merge pull request #4841 from alex6480/develop
Localize expand and collapse button for splits
2021-06-19 08:10:01 +02:00
James Cole
baae9955c8
Fix bad HTML tag 2021-06-18 06:06:54 +02:00
James Cole
4a77b9c8d5
Rename file 2021-06-17 18:24:09 +02:00
James Cole
f17b6dbdf3
Fix icons. 2021-06-17 18:19:43 +02:00
James Cole
8d454ed92a
Merge pull request #4855 from vonsogt/patch-1
Update api.php
2021-06-16 08:40:22 +02:00
VREEdom
3f9661d9b4
Update api.php
to avoid getting error:
```
Unable to prepare route [api/v1/insight/transfer/asset] for serialization. Another route has already been assigned name [api.v1.insight.income.asset].
```
2021-06-16 13:38:42 +07:00
alex6480
4846d102f2
Merge branch 'develop' into develop 2021-06-15 15:25:07 +02:00
Alex
53947eced8 Update translations in resources/lang 2021-06-15 15:22:51 +02:00
James Cole
f4d6d8efa1
Merge pull request #4854 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.3.3
Bump postcss from 8.3.2 to 8.3.3
2021-06-14 10:59:42 +02:00
dependabot[bot]
2d4c537c54
Bump postcss from 8.3.2 to 8.3.3
Bumps [postcss](https://github.com/postcss/postcss) from 8.3.2 to 8.3.3.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.3.2...8.3.3)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-14 08:44:35 +00:00
James Cole
c681d2742b
Merge pull request #4853 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.3.2
Bump postcss from 8.3.0 to 8.3.2
2021-06-14 09:12:45 +02:00
dependabot[bot]
2047fa00a9
Bump postcss from 8.3.0 to 8.3.2
Bumps [postcss](https://github.com/postcss/postcss) from 8.3.0 to 8.3.2.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.3.0...8.3.2)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-14 05:03:10 +00:00
James Cole
eb9d3f04b9
Merge branch 'main' into develop 2021-06-14 06:11:29 +02:00
James Cole
b19f69dc2a
Update lock.yml 2021-06-13 06:33:20 +00:00
James Cole
5262c0240e
Various code cleanup. 2021-06-13 08:10:30 +02:00
James Cole
c98706fac0
Various code cleanup. 2021-06-13 07:04:18 +02:00
James Cole
85204de9aa
Various code cleanup. 2021-06-12 19:32:34 +02:00
James Cole
4614625f82
Remove TODO's. 2021-06-12 14:14:49 +02:00
James Cole
91b08d1772
Rename variable. 2021-06-12 13:15:01 +02:00
James Cole
cd9d1cf4ab
Fix #4846 2021-06-12 08:46:06 +02:00
James Cole
10597e3bef
Clean up code. 2021-06-12 08:40:35 +02:00
James Cole
5854dff37e
More robust error display 2021-06-12 07:39:38 +02:00
James Cole
fbc3a2fb6a
Bad message. 2021-06-12 07:39:30 +02:00
James Cole
c290aaa774
Remove some debug logging 2021-06-12 07:39:23 +02:00
James Cole
def456bd9b
Make sure LDAP is persisted in validation 2021-06-12 07:39:16 +02:00
James Cole
1f83ebc6c7
Update example env file. 2021-06-12 07:38:58 +02:00
James Cole
6a928a3321
Update configuration. Not sure about the environment variable. 2021-06-12 06:35:19 +02:00
James Cole
39ad131b55
update packages. 2021-06-12 06:34:19 +02:00
James Cole
00a122833a
update default config 2021-06-12 06:34:10 +02:00
James Cole
c593515ec6
Remove old filter. 2021-06-12 06:29:04 +02:00
James Cole
6dde89d1eb
Add migrations. 2021-06-12 06:28:44 +02:00
James Cole
351bb81e78
Add LDAP stuff to user model. 2021-06-12 06:28:17 +02:00
James Cole
5ea7c66c83
update changelog 2021-06-12 06:27:14 +02:00
James Cole
8c171fa4d1
Merge branch 'feature/ldap' into develop
# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php
#	composer.json
#	composer.lock
#	config/firefly.php
2021-06-12 06:26:45 +02:00
James Cole
310448e9bb
Update API version 2021-06-12 06:20:43 +02:00
James Cole
aba56b331d
Message also in v2. 2021-06-11 20:55:15 +02:00
James Cole
8832387b84
Remove TODO's. 2021-06-11 20:39:01 +02:00
James Cole
0d7d3f45f0
Security alert thing. 2021-06-11 20:19:59 +02:00
James Cole
fdf379b88b
Set version to alpha version. 2021-06-11 20:04:41 +02:00
James Cole
8a9a36b512
Merge branch 'feature/webhooks' into develop
# Conflicts:
#	app/Events/UpdatedTransactionGroup.php
2021-06-11 20:00:40 +02:00
James Cole
e9f2d6b5ea
Replace icons. 2021-06-11 19:50:05 +02:00
James Cole
460161d9a5
Rebuild frontend. 2021-06-11 19:44:01 +02:00
James Cole
204d5ee1e3
Fix issue with searching for external_id 2021-06-11 17:31:13 +02:00
James Cole
c4a00fbc9a
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-06-11 17:30:23 +02:00
James Cole
41c22c18fe
Merge pull request #4850 from vonsogt/patch-1
Update menu-sidebar.twig
2021-06-11 08:00:55 +02:00
VREEdom
374aea4e09
Update menu-sidebar.twig
Small changes for the Classification in the menu-sidebar.
When route `groups` is active add class `menu-open` by adding this code `{{ activeRoutePartial('groups') }}`
2021-06-11 12:14:04 +07:00
James Cole
ebe37495c0
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2021-06-11 06:14:02 +02:00