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
16,782 Commits 4 Branches 773 Tags
4e618a4d0bb2297f9031bbf378c1f1cd2a38ac3e
Commit Graph

2960 Commits

Author SHA1 Message Date
James Cole
4e618a4d0b Remove phpstan comments. 2022-10-31 05:40:59 +01:00
James Cole
33f370359c Replace phpstan suggestions 2022-10-30 14:44:49 +01:00
James Cole
f53923f16c Use PSR-12 code style 2022-10-30 14:24:28 +01:00
James Cole
2eebcb21f1 Use PSR-12 code style 2022-10-30 14:24:19 +01:00
James Cole
914dc8596b remove old inspections 2022-10-30 12:12:35 +01:00
James Cole
d28326cc89 Restore todo's 2022-10-30 11:43:17 +01:00
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
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
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
b3740e643a Update copyright statements 2022-10-16 19:29:53 +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
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
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
ca8a65af60 Display audit logs 2022-10-02 14:37:50 +02:00
James Cole
5f11272d49 Merge branch 'develop' into 5.8-dev 2022-10-01 19:06:55 +02:00
James Cole
c4e46bf89b Fix issue in budget limits 2022-10-01 16:35:29 +02:00
James Cole
ee9b651f0f Add ability to invite users 2022-10-01 12:21:42 +02:00
James Cole
9bfa52f3ce Merge branch 'develop' into 5.8-dev 
And fix rule creation and edit etc
 2022-10-01 07:34:30 +02:00
James Cole
45d7042405 Add slack support to Firefly III 2022-09-24 12:14:27 +02:00
James Cole
665b78ebf5 Expand notifications. 2022-09-24 08:23:07 +02:00
James Cole
d2c52b47f1 Allow setting of notifications. 2022-09-18 16:49:15 +02:00
James Cole
c25b63d87b Fix #4198 2022-09-18 16:28:04 +02:00
James Cole
d9245f06f7 Add option to delete webhooks. 2022-09-18 05:49:56 +02:00
James Cole
625ad14d7d Add code to create webhook. 2022-09-17 16:54:13 +02:00
James Cole
ad9efde2d0 Expand webhook code. 2022-09-17 07:08:30 +02:00
James Cole
f0416f5322 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	config/firefly.php
 2022-09-11 08:59:34 +02:00
James Cole
9c2f771bae Fix https://github.com/firefly-iii/firefly-iii/issues/6333 2022-09-11 07:08:02 +02:00
James Cole
7104433a68 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Exceptions/Handler.php
#	config/firefly.php
 2022-09-07 18:35:01 +02:00
James Cole
3e96bb526c Store secret correctly. 2022-09-05 05:39:47 +02:00
James Cole
06b7f18d55 Make 2FA code + validation more robust. Thanks to @jtmoss3991, @timaschew and @Ottega. 2022-09-04 13:32:59 +02:00
James Cole
52e83c2ec2 Fix https://github.com/firefly-iii/firefly-iii/issues/6379 2022-08-28 06:37:03 +02:00
James Cole
70c08d6b50 Basic amount fix 2022-08-23 05:46:59 +02:00
James Cole
0b49e9b8a8 Basic amount fix 2022-08-23 05:46:43 +02:00
James Cole
4d12e6b58b New migration command. 2022-08-23 05:43:40 +02:00
James Cole
242fb3b498 Remove debug. 2022-07-25 05:57:11 +02:00
James Cole
c50a4ae993 Add debug 2022-07-25 05:52:51 +02:00
James Cole
38b505d036 Skip empty foreign currency 2022-07-25 05:50:02 +02:00
James Cole
b03a36b87f Add some debug info 2022-07-25 05:48:59 +02:00
James Cole
fa72912349 Add some debug to function 2022-07-25 05:47:26 +02:00
James Cole
7e98fac3b7 Better check on foreign currency. 2022-07-25 05:46:32 +02:00
James Cole
f14c8a2ec2 Add some debug 2022-07-25 05:44:41 +02:00
James Cole
d8506c4361 Fix https://github.com/firefly-iii/firefly-iii/issues/6260 2022-07-23 21:50:16 +02:00
James Cole
d49809c939 Fix https://github.com/firefly-iii/firefly-iii/issues/6260 2022-07-23 20:15:55 +02:00
James Cole
2bd068211b Fix #6168 2022-07-16 16:59:17 +02:00
James Cole
35f8ecf9bf Fix #6059 2022-05-17 18:16:03 +02:00
James Cole
2b615cf757 Fix bad call to method. 2022-05-02 19:35:35 +02:00