13254 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Florian Dupret	e93292d98c	Fix identation from 7105d34	2020-06-04 08:34:46 +02:00
Florian Dupret	7105d34fb3	Fix wrong reconciliation difference with "select all" button	2020-06-04 08:32:17 +02:00
James Cole	d3cd657501	Merge pull request #3395 from sephrat/master ... Make email notifications translatable (#3387)	2020-05-27 14:00:49 +00:00
Florian Dupret	6c6bb2cd1e	Email translations cleanup	2020-05-27 09:34:52 +02:00
Florian Dupret	1771b3964e	Email view cleanup: confirm account is obsolete	2020-05-26 18:50:48 +02:00
Florian Dupret	351c0ee2d7	Email notifications are now translatable	2020-05-26 12:01:39 +02:00
James Cole	1c9c380c8c	Expand debug	2020-05-26 06:28:42 +02:00
James Cole	24455bf980	Fix #3133	2020-05-26 06:28:02 +02:00
James Cole	e21b40b46c	Remove unused var	2020-05-26 06:27:43 +02:00
James Cole	29eabf9c8a	Bad type.	2020-05-25 19:40:22 +02:00
James Cole	60e20ceeb1	Add another telemetry entry	2020-05-25 19:30:38 +02:00
Florian Dupret	37b35661be	most email notifications translatable	2020-05-25 19:24:21 +02:00
Florian Dupret	b54bb20617	Make admin test email translatable	2020-05-25 13:13:33 +02:00
James Cole	19ce6b71e2	Some notes.	2020-05-24 16:58:17 +02:00
James Cole	b68663c977	Fix submission command.	2020-05-24 12:32:02 +02:00
James Cole	ac385e2647	Will now accept other values too.	2020-05-24 12:20:21 +02:00
James Cole	bc70174f44	Remove and cleanup commands.	2020-05-24 12:17:53 +02:00
James Cole	b8668b44a0	Enable feature telemetry	2020-05-24 12:12:06 +02:00
James Cole	86a87cc951	More text in .env.example	2020-05-24 12:01:40 +02:00
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