kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 10:47:00 +00:00
Code Issues Projects Releases Wiki Activity
17,360 Commits 4 Branches 773 Tags
b9d174238b017d7f5a8e1ac1d8dacfc02034ff5d
Commit Graph

17360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole
eff631276e Merge branch 'develop' into 5.8-dev 2022-12-26 06:24:50 +01:00
James Cole
89ab62fff2 Fix #6743 2022-12-26 06:23:06 +01:00
James Cole
bdf7d3978f Fix #6742 2022-12-26 06:17:22 +01:00
James Cole
3fbaed2fdc Merge branch 'develop' into 5.8-dev 2022-12-25 09:23:02 +01:00
James Cole
a4f3be5397 Merge tag '5.7.16' into develop 
5.7.16
 2022-12-25 07:48:17 +01:00
James Cole
265d973811 Merge branch 'release/5.7.16' 5.7.16 2022-12-25 07:48:15 +01:00
James Cole
e22ed9a69b Update changelog. 2022-12-25 07:47:35 +01:00
James Cole
80762616f3 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Api/V1/Controllers/Models/AvailableBudget/DestroyController.php
#	config/firefly.php
#	frontend/package.json
#	frontend/src/i18n/fr_FR/index.js
#	frontend/src/i18n/pt_BR/index.js
#	frontend/src/i18n/ru_RU/index.js
#	frontend/src/i18n/sl_SI/index.js
#	frontend/src/i18n/zh_CN/index.js
#	frontend/yarn.lock
#	public/v3/index.html
#	public/v3/js/1473.9b55dc17.js
#	public/v3/js/150.35592a2c.js
#	public/v3/js/1501.3980515e.js
#	public/v3/js/1543.010ec22e.js
#	public/v3/js/1730.207e6e59.js
#	public/v3/js/1864.d9ea853e.js
#	public/v3/js/1951.a5d70097.js
#	public/v3/js/2106.33b7eabd.js
#	public/v3/js/2124.bfc4091d.js
#	public/v3/js/2194.4baebc21.js
#	public/v3/js/2372.f07615ae.js
#	public/v3/js/2407.747d87e4.js
#	public/v3/js/2476.8af9976c.js
#	public/v3/js/2686.5e278d64.js
#	public/v3/js/2700.1251f369.js
#	public/v3/js/3232.0964e736.js
#	public/v3/js/3903.4e461032.js
#	public/v3/js/4640.601878ff.js
#	public/v3/js/4782.e1382ab6.js
#	public/v3/js/4851.3c27e6c7.js
#	public/v3/js/5221.fded0f96.js
#	public/v3/js/5266.e820dd38.js
#	public/v3/js/5348.109b8049.js
#	public/v3/js/5439.d75e5cb4.js
#	public/v3/js/5724.8b5fcafb.js
#	public/v3/js/576.e26ddde9.js
#	public/v3/js/6072.21c05085.js
#	public/v3/js/6323.69d55ffd.js
#	public/v3/js/6676.60b155c0.js
#	public/v3/js/6691.80040366.js
#	public/v3/js/6719.f9d4744f.js
#	public/v3/js/6826.74ed4602.js
#	public/v3/js/6882.c5970da7.js
#	public/v3/js/6919.cc55656e.js
#	public/v3/js/7044.96c481ac.js
#	public/v3/js/7083.c223af4f.js
#	public/v3/js/7222.86a095eb.js
#	public/v3/js/7480.b9bd8fed.js
#	public/v3/js/7499.c362f695.js
#	public/v3/js/7544.47af6552.js
#	public/v3/js/7552.ebdf1aef.js
#	public/v3/js/7586.29cf8776.js
#	public/v3/js/7697.4338f28d.js
#	public/v3/js/773.ff7cb3ef.js
#	public/v3/js/7919.910d5ebb.js
#	public/v3/js/7956.3e1c81cf.js
#	public/v3/js/8044.169b21f8.js
#	public/v3/js/8218.966b669d.js
#	public/v3/js/8344.119567b0.js
#	public/v3/js/8376.477a5508.js
#	public/v3/js/8387.a4c1d7d6.js
#	public/v3/js/8405.62235b41.js
#	public/v3/js/8493.48ada210.js
#	public/v3/js/8611.3ab24e6d.js
#	public/v3/js/8907.233f4719.js
#	public/v3/js/8928.8127fcdf.js
#	public/v3/js/9009.d0e97de6.js
#	public/v3/js/9038.06ad98ab.js
#	public/v3/js/9069.e81f039c.js
#	public/v3/js/9287.bc57ab91.js
#	public/v3/js/9597.0c124ce8.js
#	public/v3/js/9606.ce293dd2.js
#	public/v3/js/app.13f6ce91.js
#	public/v3/js/chunk-common.98b27fd7.js
#	public/v3/js/vendor.92714ea3.js
#	resources/assets/js/locales/fr.json
#	resources/assets/js/locales/ru.json
#	resources/assets/js/locales/sl.json
#	resources/assets/js/locales/zh-cn.json
#	resources/lang/de_DE/firefly.php
#	resources/lang/nl_NL/firefly.php
#	resources/lang/pt_BR/firefly.php
#	resources/lang/sl_SI/firefly.php
#	resources/lang/zh_CN/firefly.php
 2022-12-24 17:34:20 +01:00
James Cole
fcecd5c85e Accept null values. 2022-12-24 17:31:21 +01:00
James Cole
2780cf4b20 Rebuild frontend 2022-12-24 10:20:32 +01:00
James Cole
7e63700ca2 Update JSON and JS 2022-12-24 10:18:50 +01:00
James Cole
2d9a3f5fc6 Updated translations 2022-12-24 09:53:54 +01:00
James Cole
f5bbd445d2 Update meta files for new release. 2022-12-24 08:58:55 +01:00
James Cole
12008fb0e9 Fix API endpoint 2022-12-24 08:44:33 +01:00
James Cole
5f6c84ab4c Reset after deletion 2022-12-24 08:44:22 +01:00
James Cole
8b9936044b Update packages 2022-12-24 06:21:35 +01:00
James Cole
db478711ed Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Api/V1/Controllers/Chart/AccountController.php
#	app/Api/V1/Controllers/Insight/Expense/AccountController.php
#	app/Api/V1/Controllers/Insight/Expense/BillController.php
#	app/Api/V1/Controllers/Insight/Expense/BudgetController.php
#	app/Api/V1/Controllers/Insight/Expense/CategoryController.php
#	app/Api/V1/Controllers/Insight/Expense/PeriodController.php
#	app/Console/Commands/Upgrade/MigrateToGroups.php
#	app/Http/Controllers/Account/IndexController.php
#	app/Http/Controllers/Budget/AvailableBudgetController.php
#	app/Http/Controllers/Budget/BudgetLimitController.php
#	app/Http/Controllers/Budget/EditController.php
#	app/Http/Controllers/Chart/AccountController.php
#	app/Http/Controllers/Json/FrontpageController.php
#	app/Http/Controllers/PiggyBank/EditController.php
 2022-12-24 06:15:26 +01:00
James Cole
63184ac298 Add strict type 2022-12-24 05:52:34 +01:00
James Cole
5f6772260d Remove null exceptions 2022-12-24 05:48:04 +01:00
James Cole
22a237d316 Add passport settings 2022-12-24 05:47:50 +01:00
James Cole
c47980a737 Remove many references to (float) 2022-12-24 05:06:39 +01:00
James Cole
e43372b2ce Fix error 2022-12-21 19:12:47 +01:00
James Cole
395b6ecb76 Make sure cache is cleared after transaction deletion. 2022-12-21 19:11:52 +01:00
James Cole
328a1e256e Merge pull request #6725 from firefly-iii/dependabot/composer/develop/fakerphp/faker-1.21.0 2022-12-19 13:29:01 +01:00
James Cole
4a31f9ce7e Merge pull request #6726 from firefly-iii/dependabot/composer/develop/laravel/framework-9.44.0 2022-12-19 13:28:49 +01:00
James Cole
345f4903a9 Merge pull request #6727 from firefly-iii/dependabot/npm_and_yarn/develop/jquery-3.6.2 2022-12-19 13:28:29 +01:00
dependabot[bot]
3fe5e5ea8c Bump jquery from 3.6.1 to 3.6.2 
Bumps [jquery](https://github.com/jquery/jquery) from 3.6.1 to 3.6.2.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.6.1...3.6.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-19 03:00:53 +00:00
dependabot[bot]
b0da22ddf2 Bump laravel/framework from 9.43.0 to 9.44.0 
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.43.0 to 9.44.0.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/9.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v9.43.0...v9.44.0)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-19 03:00:37 +00:00
dependabot[bot]
388ee14dfc Bump fakerphp/faker from 1.20.0 to 1.21.0 
Bumps [fakerphp/faker](https://github.com/FakerPHP/Faker) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/FakerPHP/Faker/releases)
- [Changelog](https://github.com/FakerPHP/Faker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/FakerPHP/Faker/compare/v1.20.0...v1.21.0)

---
updated-dependencies:
- dependency-name: fakerphp/faker
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-19 03:00:27 +00:00
James Cole
2c53c72024 Merge pull request #6715 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.20 2022-12-12 05:49:48 +01:00
dependabot[bot]
de260adca4 Bump postcss from 8.4.19 to 8.4.20 
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.19 to 8.4.20.
- [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.19...8.4.20)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-12 03:00:40 +00:00
James Cole
33f764088e Script and code cleanup. 2022-12-11 10:43:52 +01:00
James Cole
23a8835758 Add some debug info 2022-12-11 10:32:25 +01:00
James Cole
034647a5ca Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	composer.lock
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
 2022-12-11 10:29:01 +01:00
James Cole
d8813120a7 Update packages. 2022-12-11 10:24:19 +01:00
James Cole
989fd1adba Rebuild frontend 2022-12-11 10:22:51 +01:00
James Cole
a5f4793e81 Add strict type. 2022-12-11 10:21:35 +01:00
James Cole
9529721368 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Factory/TransactionJournalFactory.php
#	app/Providers/EventServiceProvider.php
#	app/Repositories/PiggyBank/ModifiesPiggyBanks.php
#	app/Support/Search/OperatorQuerySearch.php
#	app/Support/Steam.php
#	app/TransactionRules/Actions/UpdatePiggybank.php
#	composer.json
#	composer.lock
#	config/search.php
#	frontend/yarn.lock
#	resources/lang/en_US/firefly.php
 2022-12-11 07:37:33 +01:00
James Cole
86243131cd Merge branch 'main' into develop 2022-12-11 07:30:17 +01:00
James Cole
344cbe4fb7 Pass on the journal and update rules. 2022-12-11 07:29:06 +01:00
James Cole
44af5473a8 Unify piggy bank events. Does not save a link to the journal (yet) 2022-12-11 07:17:59 +01:00
James Cole
f33f9c797b Merge pull request #6685 from nebulade/patch-2 
Also pick email address from apache filtered headers
 2022-12-11 06:22:08 +01:00
James Cole
352eedb136 Fix https://github.com/firefly-iii/firefly-iii/pull/6701 2022-12-11 06:21:08 +01:00
James Cole
c8d6ef3782 Fix https://github.com/firefly-iii/firefly-iii/pull/6701 2022-12-11 06:20:45 +01:00
James Cole
922a5fa9c7 Fix https://github.com/firefly-iii/firefly-iii/pull/6701 2022-12-11 06:20:27 +01:00
James Cole
c125984d55 Remove cache. 2022-12-11 06:20:18 +01:00
James Cole
a60c3165f1 Update stale.yml 2022-12-07 20:26:14 +01:00
James Cole
363c849c50 Update stale.yml 2022-12-07 20:25:27 +01:00
James Cole
36c9782c8f Merge pull request #6698 from firefly-iii/dependabot/composer/develop/symfony/http-client-6.0.16 
Bump symfony/http-client from 6.0.15 to 6.0.16
 2022-12-05 13:01:38 +01:00
James Cole
49847a91e3 Merge pull request #6699 from firefly-iii/dependabot/composer/develop/laravel/framework-9.42.2 
Bump laravel/framework from 9.41.0 to 9.42.2
 2022-12-05 13:01:26 +01:00