13272 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	d31bb1f9b6	Regenerated JSON files for all languages. #3404	2020-05-29 06:39:48 +02:00
James Cole	b64979e45a	New strings in all languages for #3404	2020-05-29 06:39:24 +02:00
James Cole	3dd3d2cabb	Clean up strings #3404	2020-05-29 06:34:39 +02:00
James Cole	94e7c3527f	Refactor strings #3404	2020-05-29 06:30:42 +02:00
James Cole	1a71d22146	Add strings to i18n #3404	2020-05-29 06:28:34 +02:00
James Cole	fdc3b80f1f	Refactor strings #3404	2020-05-29 06:28:24 +02:00
James Cole	b978de78e4	Refactor strings #3404	2020-05-29 06:22:13 +02:00
James Cole	8b6bd296e1	Refactor string identifiers #3404	2020-05-29 06:19:56 +02:00
James Cole	4d075feed6	Merge pull request #3404 from sephrat/js_translations ... Make new profile settings translatable	2020-05-29 06:18:29 +02:00
James Cole	e0e16489a1	Merge branch 'develop' into js_translations	2020-05-29 06:18:22 +02:00
James Cole	deeb4933fc	Reformat for readability (PHPStorm)	2020-05-29 06:16:42 +02:00
James Cole	be8a0ddb3e	Merge pull request #3393 from bpatath/feature/add-ssl-to-mysql ... Add SSL conf to MySQL and LDAP	2020-05-29 06:13:16 +02:00
James Cole	49b1a6d844	Alignment	2020-05-29 06:12:24 +02:00
James Cole	3c1361e377	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2020-05-29 06:09:27 +02:00
James Cole	a7ab5b7504	A note about telemetry for the next release.	2020-05-29 06:07:12 +02:00
James Cole	0c8229d689	Some language strings.	2020-05-29 06:07:03 +02:00
bpatath	8aa7776072	Replace unnused MySQL SSL mode	2020-05-28 09:26:42 +02:00
bpatath	f427267f5b	Add SSL configuration for LDAP	2020-05-28 09:26:42 +02:00
bpatath	3195dd0db0	Add SSL configuration for MySQL	2020-05-28 09:26:42 +02:00
Florian Dupret	f8963179c3	Make new profile settings translatable	2020-05-27 16:17:24 +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