kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity
16,751 Commits 4 Branches 760 Tags
b21461c824a714499b84086fa7625171813f2c4f
Commit Graph

16751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole
b21461c824 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	resources/views/auth/login.twig
#	resources/views/auth/mfa.twig
#	resources/views/auth/passwords/email.twig
#	resources/views/auth/passwords/reset.twig
#	resources/views/auth/register.twig
 2022-10-24 19:35:47 +02:00
James Cole
d4738b21ab Make sure form elements are not spell checked. 2022-10-23 17:36:26 +02:00
James Cole
2f66315416 Fix #6556 2022-10-23 14:53:13 +02:00
James Cole
f4af19e121 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
#	resources/assets/js/locales/pt-br.json
#	resources/lang/pt_BR/firefly.php
#	yarn.lock
 2022-10-23 14:49:54 +02:00
James Cole
abdb717b37 Can no longer set currency of expense / revenue accounts. 2022-10-23 14:46:26 +02:00
James Cole
e229bd8121 Updated translations. 2022-10-22 07:34:05 +02:00
James Cole
d31fa743d0 Add ability to set some transaction flags. Fixes #6526 2022-10-22 07:30:12 +02:00
James Cole
4ad666d964 Add button to remove unused accounts. 2022-10-19 19:57:22 +02:00
James Cole
a91f6fbfaf Merge tag '5.7.14' into develop 
5.7.14
 2022-10-18 21:13:43 +02:00
James Cole
f7b66a048a Merge branch 'release/5.7.14' 5.7.14 2022-10-18 21:13:43 +02:00
James Cole
f3566c609a Meta files for new release. 2022-10-18 21:13:14 +02:00
James Cole
904320b9b8 Fix bulk update rules 2022-10-18 20:41:48 +02:00
James Cole
35c1ce6504 Fix negative budget limits 2022-10-18 20:37:33 +02:00
James Cole
a96c830e3e Merge branch 'develop' into 5.8-dev 2022-10-17 05:42:49 +02:00
James Cole
ddefdd5ec5 Add instructions to .env.example 2022-10-17 05:42:35 +02:00
James Cole
9e41cd9c8c Fix spelling 2022-10-17 05:42:05 +02:00
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' 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