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
|
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 |
|
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
|
749ce2ca9b
|
Merge branch 'develop' into 5.8-dev
|
2022-10-01 07:15:17 +02:00 |
|
James Cole
|
4474a71e65
|
Attempted fix for #6475
|
2022-09-30 20:07:01 +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
|
67126e46b9
|
Add webhook code and rebuild.
|
2022-09-18 10:45:38 +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
|
39a928d7f4
|
Merge branch 'develop' into 5.8-dev
|
2022-07-26 20:28:32 +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
|
4e394d6017
|
Merge branch 'develop' into 5.8-dev
|
2022-07-24 08:16:27 +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
|
6b6107fb00
|
Merge branch 'develop' into 5.8-dev
# Conflicts:
# config/firefly.php
# frontend/src/i18n/nb_NO/index.js
# frontend/src/i18n/nl_NL/index.js
# frontend/src/i18n/ru_RU/index.js
|
2022-07-17 08:18:18 +02:00 |
|
James Cole
|
2bd068211b
|
Fix #6168
|
2022-07-16 16:59:17 +02:00 |
|
James Cole
|
9493046212
|
Add strict types, add debug info
|
2022-07-16 09:25:10 +02:00 |
|
Sander Dorigo
|
b12d72bef6
|
New code for API 2
|
2022-06-23 09:33:43 +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 |
|
James Cole
|
50f87a210a
|
Replace uri with url
|
2022-04-12 18:19:30 +02:00 |
|