Commit Graph
7475 Commits
Author SHA1 Message Date
James Cole ad9efde2d0 Expand webhook code. 2022-09-17 07:08:30 +02:00
James Cole 10f2cf2481 Update webhooks 2022-09-17 07:07:25 +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 6589f88883 Fix https://github.com/firefly-iii/firefly-iii/issues/6421 2022-09-11 06:58:16 +02:00
James Cole ecf5cc62f9 Fix https://github.com/firefly-iii/firefly-iii/issues/6287 2022-09-08 06:22: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 8659c7efbd Skip error 2022-09-04 13:31:46 +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 322b6d19d8 Add new roles. 2022-08-14 15:41:06 +02:00
James Cole 4d1b21f70d Merge branch 'develop' into 5.8-dev
# Conflicts:
#	composer.lock
2022-08-03 05:40:31 +02:00
James Cole cc6a7b181a Convert to deposit means the journal loses its bill. 2022-08-02 05:39:04 +02:00
James Cole c460ccfad5 Conversion to transfer means that the original journal loses the bill. 2022-08-02 05:38:24 +02:00
James Cole 75ea1c4f4b Return amount as string 2022-08-01 19:51:45 +02:00
James Cole 39a928d7f4 Merge branch 'develop' into 5.8-dev 2022-07-26 20:28:32 +02:00
James Cole 858480929c Fix null pointer 2022-07-25 19:43:47 +02:00
James Cole 242fb3b498 Remove debug. 2022-07-25 05:57:11 +02:00
James Cole 47469c7082 Fix transformer. 2022-07-25 05:56:21 +02:00
James Cole 18f2633810 Add debug 2022-07-25 05:54:40 +02:00
James Cole c50a4ae993 Add debug 2022-07-25 05:52:51 +02:00
James Cole 2db32ce44f Better transformer. 2022-07-25 05:51:59 +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 443b76388e Expand frontend 2022-07-25 05:42:49 +02:00
James Cole 4e394d6017 Merge branch 'develop' into 5.8-dev 2022-07-24 08:16:27 +02:00
James Cole 76dadd1cab Fix https://github.com/firefly-iii/firefly-iii/issues/6260 2022-07-24 05:44:35 +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 ea808b441b Add first budget view 2022-07-23 20:13:24 +02:00
James Cole a464ad015f Merge branch 'develop' into 5.8-dev 2022-07-23 19:26:15 +02:00
James Cole e8ec13ca5f Fix https://github.com/firefly-iii/firefly-iii/issues/6260 2022-07-23 16:47:05 +02:00
Rick Cuddy 203ae2812f Use Piggy Bank's start date in monthly suggestion #6254 2022-07-22 20:12:32 +10:00
James Cole 20ab457222 Various new stuff 2022-07-21 16:41:28 +02:00
James Cole eb8f595541 Fix transaction lists. 2022-07-17 08:51:53 +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 b4feb27118 Fix #6118 2022-07-17 07:18:50 +02:00
James Cole d26a5a6e9c Fix https://github.com/firefly-iii/firefly-iii/issues/6150 2022-07-16 17:15:44 +02:00
James Cole 29dce924cf Accounts could not share number. Fix #6165 2022-07-16 17:11:14 +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
James Cole 56ff25285c Expand frontend and API 2022-07-05 19:12:22 +02:00
James Cole 196c504b3d Fix nullpointer 2022-07-03 08:45:08 +02:00