IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-09-03 20:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
18,114 Commits 9 Branches 1,163 Tags
c788395508e0c513e47db6beeace7fe60a829c89
Commit Graph
18114 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole fe4e00dc5c Fix #7792 2023-07-29 06:52:21 +02:00
James Cole 1a1b0ee27d Fix https://github.com/firefly-iii/firefly-iii/issues/7787 2023-07-29 06:17:09 +02:00
James Cole 298c4ec654 Merge tag 'v6.0.19' into develop 
v6.0.19
 2023-07-28 16:17:25 +02:00
James Cole c6e3fa2cc6 Merge branch 'release/v6.0.19' v6.0.19 2023-07-28 16:17:24 +02:00
James Cole 61484dcfee Merge branch 'main' into develop 2023-07-28 16:16:51 +02:00
James Cole 99009cff88 Meta files for new release. 2023-07-28 16:14:55 +02:00
James Cole 673f68b07c A simple command that outputs the Firefly III version. 2023-07-26 07:30:44 +02:00
James Cole d1232192ce Fix exchange rate seeder 2023-07-26 07:08:34 +02:00
James Cole b2084a94e5 Expand layout 2023-07-26 07:08:00 +02:00
James Cole ddcb246955 Add options 2023-07-26 07:07:53 +02:00
James Cole 8796168580 Merge branch 'develop' into adminlte4 
# Conflicts:
#	yarn.lock
 2023-07-25 16:12:58 +02:00
James Cole dde7bcfc4c Expand code for exchange rates 2023-07-25 09:01:44 +02:00
James Cole a6503fda39 Lots of new code. 2023-07-24 18:58:35 +02:00
James Cole 455e311661 Merge pull request #7776 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.27 2023-07-24 05:40:41 +02:00
James Cole a4a919d7b7 Merge pull request #7775 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-1.10.26 2023-07-24 05:40:31 +02:00
James Cole a90ce3c944 Merge pull request #7774 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.6.5 2023-07-24 05:40:23 +02:00
James Cole a6d179b883 Merge pull request #7773 from firefly-iii/dependabot/composer/develop/mockery/mockery-1.6.4 2023-07-24 05:40:14 +02:00
James Cole 1b29e5e628 Merge pull request #7772 from firefly-iii/dependabot/composer/develop/spatie/laravel-html-3.2.2 2023-07-24 05:40:06 +02:00
dependabot[bot] e8fd496bca chore(deps-dev): bump postcss from 8.4.26 to 8.4.27 
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.26 to 8.4.27.
- [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.4.26...8.4.27)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-24 03:25:17 +00:00
dependabot[bot] 3d61e27a47 chore(deps-dev): bump phpstan/phpstan from 1.10.25 to 1.10.26 
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.25 to 1.10.26.
- [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.25...1.10.26)

---
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-07-24 03:05:09 +00:00
dependabot[bot] f9a55ce3d8 chore(deps): bump doctrine/dbal from 3.6.4 to 3.6.5 
Bumps [doctrine/dbal](https://github.com/doctrine/dbal) from 3.6.4 to 3.6.5.
- [Release notes](https://github.com/doctrine/dbal/releases)
- [Commits](https://github.com/doctrine/dbal/compare/3.6.4...3.6.5)

---
updated-dependencies:
- dependency-name: doctrine/dbal
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-24 03:05:02 +00:00
dependabot[bot] c432757942 chore(deps-dev): bump mockery/mockery from 1.6.2 to 1.6.4 
Bumps [mockery/mockery](https://github.com/mockery/mockery) from 1.6.2 to 1.6.4.
- [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.2...1.6.4)

---
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-07-24 03:04:57 +00:00
dependabot[bot] da740ccbef chore(deps): bump spatie/laravel-html from 3.2.1 to 3.2.2 
Bumps [spatie/laravel-html](https://github.com/spatie/laravel-html) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/spatie/laravel-html/releases)
- [Changelog](https://github.com/spatie/laravel-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/spatie/laravel-html/compare/3.2.1...3.2.2)

---
updated-dependencies:
- dependency-name: spatie/laravel-html
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-24 03:04:52 +00:00
James Cole f1173263b6 Fall back on default layout if no page is present (yet) 2023-07-23 08:33:37 +02:00
James Cole 68da1a7039 Rebuild css and js 2023-07-23 08:31:41 +02:00
James Cole 64414edf58 Rename and move files 2023-07-23 08:28:57 +02:00
James Cole 6b136d2c8c Remove unused assets 2023-07-23 08:26:41 +02:00
James Cole 752a877b91 Move more to v2 2023-07-23 08:26:12 +02:00
James Cole d11c36e476 Merge branch 'develop' into adminlte4 2023-07-23 08:20:39 +02:00
James Cole b13232f06b Rename some things from v4 to v2 2023-07-23 08:18:42 +02:00
James Cole cf6ed5af32 Remove missing CSS 2023-07-23 07:10:42 +02:00
James Cole be531d777e Continued work on v4 2023-07-23 07:10:31 +02:00
James Cole 190508fa54 Basic set of stuff working! 2023-07-22 16:42:33 +02:00
James Cole 2c2dddc071 It works! 2023-07-22 07:51:02 +02:00
James Cole c60858de5c Merge branch 'develop' into adminlte4 
# Conflicts:
#	composer.lock
#	yarn.lock
 2023-07-21 18:26:19 +02:00
James Cole 6ab332e4fb fix: nullpointer 2023-07-20 12:55:45 +02:00
James Cole 9df43cc710 Merge pull request #7761 from firefly-iii/dependabot/npm_and_yarn/frontend/word-wrap-1.2.4 
chore(deps): bump word-wrap from 1.2.3 to 1.2.4 in /frontend
 2023-07-19 13:29:08 +02:00
dependabot[bot] 79d1b15d86 chore(deps): bump word-wrap from 1.2.3 to 1.2.4 in /frontend 
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-19 10:39:48 +00:00
James Cole 923debb299 Fix notification nullpointer 2023-07-18 18:15:17 +02:00
James Cole f5fef8c036 Fix https://github.com/firefly-iii/firefly-iii/issues/7757 2023-07-18 18:15:07 +02:00
James Cole 982134c077 fix: prevent the demo user from changing the slack URL 2023-07-18 07:15:41 +02:00
James Cole 07aeb6cd20 Merge branch 'release/v6.0.18' v6.0.18 2023-07-18 07:01:55 +02:00
James Cole 30cca355ba Merge tag 'v6.0.18' into develop 
v6.0.18
 2023-07-18 07:01:55 +02:00
James Cole d17cc15037 Meta files for new release 2023-07-18 07:00:10 +02:00
James Cole efade857bb Fix https://github.com/firefly-iii/firefly-iii/issues/7694 2023-07-18 06:44:58 +02:00
James Cole 15ac6a1195 Fix https://github.com/firefly-iii/firefly-iii/issues/7706 2023-07-18 06:38:11 +02:00
James Cole a45a050e7d Fix https://github.com/firefly-iii/firefly-iii/issues/7749 2023-07-18 06:30:45 +02:00
James Cole e435ff8b1c Remove debug, add fix for https://github.com/orgs/firefly-iii/discussions/7655#discussioncomment-6468397 2023-07-18 06:18:04 +02:00
James Cole 788dae1477 fix: notifications 2023-07-17 20:33:26 +02:00
James Cole 2bb4cc7954 Fix: add route 2023-07-17 20:26:47 +02:00