13315 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	09226e6f12	New translations.	2020-05-19 13:29:47 +02:00
James Cole	5ff1991cdc	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2020-05-19 11:19:13 +02:00
James Cole	4ebb6de520	Reset rule order on index. #3376	2020-05-19 11:18:58 +02:00
James Cole	1ba7d65582	Warning if demo user.	2020-05-18 21:21:34 +02:00
James Cole	4e6063a4f8	Demo user can't set locale	2020-05-18 21:19:45 +02:00
James Cole	85476f3549	Fix some strings.	2020-05-18 21:17:59 +02:00
James Cole	ef9714b7e0	Fix #3374	2020-05-18 14:50:07 +02:00
James Cole	8d20029557	Fix #3368	2020-05-17 19:17:19 +02:00
James Cole	0f04b44ca1	Fix #	2020-05-17 06:49:26 +02:00
James Cole	44ed45502e	Change in error handling.	2020-05-16 16:57:48 +02:00
James Cole	5bcafe1311	Change in error handling.	2020-05-16 16:57:26 +02:00
James Cole	5a771ccc5f	Run yarn again #3363	2020-05-16 16:56:08 +02:00
James Cole	c6145b4a3b	Auto generated JSON files for new strings in other languages. #3363	2020-05-16 16:35:23 +02:00
James Cole	b20aeca849	Auto-generated translation files from crowdin #3363	2020-05-16 16:33:57 +02:00
James Cole	793918f2f3	Add new strings to global translation files. #3363	2020-05-16 16:30:17 +02:00
James Cole	5d410e577e	Merge pull request #3365 from sephrat/master ... Fix #3363	2020-05-16 14:27:39 +00:00
James Cole	9ec786ec3a	Merge branch 'develop' into master	2020-05-16 14:27:31 +00:00
Florian Dupret	e532b4d4fc	Fix #3363	2020-05-16 15:01:19 +02:00
James Cole	58585d03c6	Fix rounding thing.	2020-05-16 13:09:37 +02:00
James Cole	a4f66b3d86	Date before and after triggers	2020-05-16 12:55:54 +02:00
James Cole	c847621874	First "date is" trigger for #3049	2020-05-16 12:11:06 +02:00
James Cole	86f14885eb	Added a rule action that will delete the transactions it matches.	2020-05-16 11:21:26 +02:00
James Cole	173e196bc8	Some experimental fixes for #3011	2020-05-16 10:45:40 +02:00
James Cole	7505db871f	Update packages.	2020-05-16 06:59:51 +02:00
James Cole	946dde8957	Add ability to store recurring telemetry. Not enabled.	2020-05-16 06:59:41 +02:00
James Cole	9a52cfbfbe	Add some debug info	2020-05-16 06:59:15 +02:00
James Cole	b248bd6d0c	Remove code.	2020-05-15 19:59:23 +02:00
James Cole	3fff9ad0a2	Updated translations.	2020-05-15 19:31:19 +02:00
James Cole	a695a1bba2	Fix #3355	2020-05-12 20:40:28 +02:00
James Cole	91e384aae8	Fix #3350	2020-05-10 20:08:16 +02:00
James Cole	1ac95b6fa7	Move getCash lower, add IBAN as name when no name is submitted. Search will pick up the rest.	2020-05-09 18:03:32 +02:00
James Cole	6757b6211d	https://github.com/firefly-iii/firefly-iii/issues/3348	2020-05-09 17:47:25 +02:00
James Cole	4dfb78837e	Slightly smarter menu.	2020-05-09 14:51:04 +02:00
James Cole	af50ad3db4	New action	2020-05-09 14:47:47 +02:00
James Cole	01cb94aabc	Room for better translation	2020-05-09 14:47:33 +02:00
James Cole	5ffc5060b9	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2020-05-07 06:44:27 +02:00
James Cole	43d7c956a4	Fix #3344	2020-05-07 06:44:01 +02:00
James Cole	863b07951a	Fix #3339	2020-05-05 20:53:56 +02:00
James Cole	2101717edb	Can return without split.	2020-05-05 20:32:04 +02:00
James Cole	e7ac1476c5	Merge pull request #3336 from maksimkurb/develop ... WIP: Fix #3335 Reconciliation account currency is wrong when base account has non-default currency	2020-05-05 20:30:05 +02:00
Maxim Kurbatov	5d24c1fee1	#3335 Update language files for reconciliation account name	2020-05-05 22:10:11 +04:00
Maxim Kurbatov	53eb863f9d	Fix #3335 Reconciliation account currency is wrong when base account has non-default currency	2020-05-05 22:07:42 +04:00
James Cole	3c3ba637b5	Make sure demo user can't upload attachments.	2020-05-05 07:44:33 +02:00
James Cole	be8286b15c	Fix some things in recurring transactions.	2020-05-04 10:26:01 +02:00
James Cole	6f6087995d	Add info on expired recurring transactions.	2020-05-04 10:12:38 +02:00
James Cole	2ff8a35171	Add debug.	2020-05-04 10:06:13 +02:00
James Cole	7f8ed7abb6	Merge branch 'release/5.2.5'	2020-05-04 08:59:55 +02:00
James Cole	2ff0c37c12	Merge tag '5.2.5' into develop ... 5.2.5	2020-05-04 08:59:55 +02:00
James Cole	c593936b32	New meta files for upcoming release.	2020-05-04 08:56:51 +02:00
James Cole	c54204ede9	Fix #3330	2020-05-03 19:38:03 +02:00