13235 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	be58b1d2be	Enable the feature flag for telemetry.	2020-05-24 12:00:14 +02:00
James Cole	61733f6553	Forgot to remove debug variable.	2020-05-24 11:47:44 +02:00
James Cole	15e772d9dc	Update some (disabled) commands.	2020-05-24 11:24:28 +02:00
James Cole	ae7b81bf86	Merge pull request #3390 from sephrat/master ... Fix typos and minor text inconsistency	2020-05-24 09:19:02 +00:00
Florian Dupret	2c9ac0982a	Fix minor typos	2020-05-24 09:59:34 +02:00
Florian Dupret	2df390065b	Minor fix: fix rule action/trigger labels consistency	2020-05-24 09:53:54 +02:00
sephrat	247c9aebf3	Merge pull request #1 from firefly-iii/master ... keep up with main repo	2020-05-24 09:51:01 +02:00
James Cole	0783500eaa	Fix #3309	2020-05-23 19:54:02 +02:00
James Cole	c2e542004d	Add some debug.	2020-05-23 08:14:13 +02:00
James Cole	806ad918f0	Include original collection time.	2020-05-22 20:24:56 +02:00
James Cole	84406a74c3	Merge tag '5.2.6' into develop ... 5.2.6	2020-05-22 17:54:03 +02:00
James Cole	09990acaa2	Merge branch 'release/5.2.6'	2020-05-22 17:54:02 +02:00
James Cole	a73247ec8c	Some last minute translations.	2020-05-22 17:53:09 +02:00
James Cole	e98d43dd65	New meta files for 5.2.6	2020-05-22 14:15:57 +02:00
James Cole	dbd68cedc9	Code for #3309	2020-05-22 13:52:33 +02:00
James Cole	e6e8200912	Merge pull request #3381 from bpatath/feature/add-single-sign-on ... Feature/add single sign on	2020-05-22 04:27:39 +00:00
bpatath	7b1380366b	Register SSO middleware if enabled in configuration	2020-05-21 21:05:03 +02:00
bpatath	1eda806c17	Fix outdated AdLdap2 configuration files	2020-05-21 21:04:17 +02:00
James Cole	782ecca6a9	Warning if people disabled update checking. Every 4 weeks.	2020-05-20 06:40:18 +02:00
James Cole	e6338705a7	Fix #3376	2020-05-19 19:37:12 +02:00
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