IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-23 09:26:29 -06:00
Code Issues Packages Projects Releases Wiki Activity
16,735 Commits 3 Branches 443 Tags 722 MiB
b3740e643a
Commit Graph

16735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole
b3740e643a
Update copyright statements 2022-10-16 19:29:53 +02:00
James Cole
55ac76f663
Update copyright. 2022-10-16 19:22:26 +02:00
James Cole
49560ca6a6
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
 2022-10-16 19:13:15 +02:00
James Cole
fd37054493 Merge tag '5.7.13' into develop 
5.7.13
 2022-10-16 16:10:14 +02:00
James Cole
bf589e5c57 Merge branch 'release/5.7.13' 2022-10-16 16:10:13 +02:00
James Cole
e97018cf2e
Update composer 2022-10-16 16:08:56 +02:00
James Cole
5038ed7708
Update build files 2022-10-16 16:07:48 +02:00
James Cole
02081b09a2
Meta files for new release. 2022-10-16 15:52:22 +02:00
James Cole
a74d345ac2
Make doubly sure special characters are removed from the notes. 2022-10-16 15:18:11 +02:00
James Cole
e472c3520d
Add comments about floats 2022-10-16 14:44:11 +02:00
James Cole
39654249e4
Merge branch 'develop' into 5.8-dev 2022-10-11 11:07:11 +02:00
James Cole
69929bee31
Merge pull request #6531 from firefly-iii/dependabot/composer/develop/laravel/passport-11.2.1 2022-10-10 06:06:10 +02:00
James Cole
b276b24a79
Merge pull request #6532 from firefly-iii/dependabot/npm_and_yarn/develop/axios-1.1.2 2022-10-10 06:05:59 +02:00
dependabot[bot]
1b99dbab0a
Bump laravel/passport from 11.2.0 to 11.2.1 
Bumps [laravel/passport](https://github.com/laravel/passport) from 11.2.0 to 11.2.1.
- [Release notes](https://github.com/laravel/passport/releases)
- [Changelog](https://github.com/laravel/passport/blob/11.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/passport/compare/v11.2.0...v11.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-10 03:56:14 +00:00
James Cole
1ea0fa318c
Merge pull request #6530 from firefly-iii/dependabot/composer/develop/laravel/framework-9.34.0 2022-10-10 05:55:30 +02:00
James Cole
4066fc643f
Merge pull request #6529 from firefly-iii/dependabot/composer/develop/spatie/laravel-ignition-1.5.1 2022-10-10 05:55:21 +02:00
dependabot[bot]
b7975c6a88
Bump axios from 0.27.2 to 1.1.2 
Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.1.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.27.2...v1.1.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-10 03:01:59 +00:00
dependabot[bot]
1e88b1eb88
Bump laravel/framework from 9.33.0 to 9.34.0 
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.33.0 to 9.34.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.33.0...v9.34.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-10-10 03:01:30 +00:00
dependabot[bot]
88490de38f
Bump spatie/laravel-ignition from 1.5.0 to 1.5.1 
Bumps [spatie/laravel-ignition](https://github.com/spatie/laravel-ignition) from 1.5.0 to 1.5.1.
- [Release notes](https://github.com/spatie/laravel-ignition/releases)
- [Changelog](https://github.com/spatie/laravel-ignition/blob/main/CHANGELOG.md)
- [Commits](https://github.com/spatie/laravel-ignition/compare/1.5.0...1.5.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-10 03:01:22 +00:00
James Cole
77759d5580
Update text, remove entry. 2022-10-09 07:09:55 +02:00
James Cole
22971ded84
Fix bad composer file 2022-10-08 10:11:51 +02:00
James Cole
841edcfffb
Rebuild frontend 2022-10-08 07:04:41 +02:00
James Cole
05fe503456
Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	frontend/src/i18n/tr_TR/index.js
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
#	resources/assets/js/locales/bg.json
#	resources/assets/js/locales/cs.json
#	resources/assets/js/locales/de.json
#	resources/assets/js/locales/el.json
#	resources/assets/js/locales/en-gb.json
#	resources/assets/js/locales/en.json
#	resources/assets/js/locales/es.json
#	resources/assets/js/locales/fi.json
#	resources/assets/js/locales/fr.json
#	resources/assets/js/locales/hu.json
#	resources/assets/js/locales/it.json
#	resources/assets/js/locales/ja.json
#	resources/assets/js/locales/nb.json
#	resources/assets/js/locales/nl.json
#	resources/assets/js/locales/pl.json
#	resources/assets/js/locales/pt-br.json
#	resources/assets/js/locales/pt.json
#	resources/assets/js/locales/ro.json
#	resources/assets/js/locales/ru.json
#	resources/assets/js/locales/sk.json
#	resources/assets/js/locales/sv.json
#	resources/assets/js/locales/tr.json
#	resources/assets/js/locales/vi.json
#	resources/assets/js/locales/zh-cn.json
#	resources/assets/js/locales/zh-tw.json
#	resources/lang/bg_BG/firefly.php
#	resources/lang/fr_FR/firefly.php
#	resources/lang/nl_NL/firefly.php
#	resources/lang/ru_RU/firefly.php
 2022-10-08 07:03:40 +02:00
James Cole
030b6cb281
Rebuild frontend 2022-10-08 06:50:17 +02:00
James Cole
896c15a7a1
Update meta data and translations. 2022-10-08 06:47:56 +02:00
James Cole
b176308dbd
Higher amounts. 2022-10-08 06:05:59 +02:00
James Cole
da71d6172c
Fix rule booboo 2022-10-08 05:57:12 +02:00
James Cole
f1457fcda6
New stuff 2022-10-06 06:23:12 +02:00
James Cole
a39553256e
Merge branch 'develop' into 5.8-dev 2022-10-06 06:18:25 +02:00
James Cole
553a9be3d5
Fix https://github.com/firefly-iii/firefly-iii/issues/6510 2022-10-06 06:17:49 +02:00
James Cole
187e1914e3
Merge pull request #6502 from D7032E-Group-6/develop 
Issue #5234 fix
 2022-10-06 06:09:51 +02:00
Nathan PERIER
fc83565d02 Added translations for the new options 2022-10-05 15:23:22 +02:00
James Cole
7e94f246e3
New translations. 2022-10-04 20:49:29 +02:00
James Cole
44637dfaab
Merge 2022-10-04 20:31:57 +02:00
James Cole
bab4c05e5f
Fix https://github.com/firefly-iii/firefly-iii/issues/6471 2022-10-04 19:12:57 +02:00
Nathan PERIER
5b43a2e99f Added options for month to date and year to date 2022-10-04 15:17:11 +02:00
James Cole
ee2b87d5fe
Fix sentences. 2022-10-03 20:26:26 +02:00
James Cole
c9f7e96450
Merge pull request #6491 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.17 
Bump postcss from 8.4.16 to 8.4.17
 2022-10-03 06:03:07 +02:00
James Cole
ea361365f0
Merge pull request #6490 from firefly-iii/dependabot/npm_and_yarn/develop/vue/compiler-sfc-3.2.40 
Bump @vue/compiler-sfc from 3.2.39 to 3.2.40
 2022-10-03 06:02:57 +02:00
James Cole
5dfb35064a
Merge pull request #6489 from firefly-iii/dependabot/composer/develop/nunomaduro/collision-6.3.1 
Bump nunomaduro/collision from 6.3.0 to 6.3.1
 2022-10-03 06:02:48 +02:00
James Cole
5522e4f514
Merge pull request #6488 from firefly-iii/dependabot/composer/develop/laravel/framework-9.33.0 
Bump laravel/framework from 9.31.0 to 9.33.0
 2022-10-03 06:02:40 +02:00
James Cole
c1367d12a6
Merge pull request #6487 from firefly-iii/dependabot/composer/develop/symfony/http-client-6.0.13 
Bump symfony/http-client from 6.0.12 to 6.0.13
 2022-10-03 06:02:29 +02:00
James Cole
db2485f97a
Clean up rule form. 2022-10-03 05:49:25 +02:00
dependabot[bot]
321c8fca67
Bump postcss from 8.4.16 to 8.4.17 
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.16 to 8.4.17.
- [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.16...8.4.17)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-03 03:01:52 +00:00
dependabot[bot]
73b98612a5
Bump @vue/compiler-sfc from 3.2.39 to 3.2.40 
Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc) from 3.2.39 to 3.2.40.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits/v3.2.40/packages/compiler-sfc)

---
updated-dependencies:
- dependency-name: "@vue/compiler-sfc"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-03 03:01:36 +00:00
dependabot[bot]
671e93c50f
Bump nunomaduro/collision from 6.3.0 to 6.3.1 
Bumps [nunomaduro/collision](https://github.com/nunomaduro/collision) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/nunomaduro/collision/releases)
- [Changelog](https://github.com/nunomaduro/collision/blob/v7.x/CHANGELOG.md)
- [Commits](https://github.com/nunomaduro/collision/compare/v6.3.0...v6.3.1)

---
updated-dependencies:
- dependency-name: nunomaduro/collision
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-03 03:01:02 +00:00
dependabot[bot]
553c3ec17e
Bump laravel/framework from 9.31.0 to 9.33.0 
Bumps [laravel/framework](https://github.com/laravel/framework) from 9.31.0 to 9.33.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.31.0...v9.33.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-10-03 03:00:58 +00:00
dependabot[bot]
94b933c7a4
Bump symfony/http-client from 6.0.12 to 6.0.13 
Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.0.12 to 6.0.13.
- [Release notes](https://github.com/symfony/http-client/releases)
- [Changelog](https://github.com/symfony/http-client/blob/6.1/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-client/compare/v6.0.12...v6.0.13)

---
updated-dependencies:
- dependency-name: symfony/http-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-03 03:00:45 +00:00
James Cole
38bdd6c36c
Final fix, I hope. 2022-10-02 20:27:21 +02:00
James Cole
536e054961
Fix sloppy variable names 2022-10-02 20:23:11 +02:00