13312 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	b19338e2f3	Add db connection info.	2020-06-06 06:34:43 +02:00
James Cole	d4a44e6089	Hold the DB changes for now.	2020-06-05 19:44:40 +02:00
James Cole	c90c181785	Basic code for an object group select item thing.	2020-06-05 19:39:09 +02:00
James Cole	b75178a184	New view for #3415	2020-06-05 18:40:02 +02:00
James Cole	a77187135f	Fixed #3297	2020-06-05 06:34:55 +02:00
James Cole	61e24a41a2	Add groups, and the option for objects to be linked to one (or more) groups. #3128	2020-06-05 06:25:39 +02:00
James Cole	07c7bf1d49	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2020-06-04 18:08:53 +02:00
James Cole	d4cb72cb77	Updated strings.	2020-06-04 18:08:18 +02:00
James Cole	948cdf7e5e	Merge pull request #3428 from sephrat/fix-reconcile-difference ... Fix reconcile difference	2020-06-04 12:23:28 +02:00
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	29847c9711	Updated strings.	2020-06-04 06:49:44 +02:00
James Cole	3db778a2b1	Fix #3425	2020-06-04 06:31:34 +02:00
James Cole	361f78542a	Add time for #3419	2020-06-04 06:26:14 +02:00
James Cole	15d0e04431	Add timeout for #3427	2020-06-04 06:20:52 +02:00
James Cole	b968ef416a	Fix #3419	2020-06-02 19:11:17 +02:00
James Cole	6191362fe0	Merge pull request #3420 from sephrat/fix#3409 ... Display account names only once when displaying split transactions	2020-06-02 17:59:52 +02:00
Florian Dupret	6d8fd79922	Fix #3409 - Split transactions show source/destination accounts several times	2020-06-01 17:51:07 +02:00
James Cole	0227879a69	Merge pull request #3417 from sephrat/pluralization ... Fix typo from #3413	2020-06-01 11:41:49 +02:00
Florian Dupret	e4d2b121c1	Merge branch 'pluralization' of https://github.com/sephrat/firefly-iii into pluralization	2020-06-01 08:25:27 +02:00
Florian Dupret	f8941ab507	Fix string displayed twice	2020-06-01 08:15:19 +02:00
James Cole	f3ac8a5888	Add newlines and remove some unused translations.	2020-05-30 07:33:06 +02:00
James Cole	64ac3927ec	Pluralization.	2020-05-29 21:00:10 +02:00
James Cole	a558613189	Merge pull request #3413 from sephrat/pluralization ... String pluralization	2020-05-29 20:55:56 +02:00
James Cole	7535ca9a26	Merge branch 'develop' into pluralization	2020-05-29 20:55:31 +02:00
James Cole	03670e2dfe	New translations.	2020-05-29 19:53:49 +02:00
Florian Dupret	be797f5353	pluralization wave 2	2020-05-29 19:07:51 +02:00
Florian Dupret	da38df6e4b	pluralization wave 1	2020-05-29 18:00:29 +02:00
James Cole	2d53eb300a	Some more info in changelog.	2020-05-29 16:08:31 +02:00
James Cole	523ea78166	Error strings.	2020-05-29 07:55:59 +02:00
James Cole	3b33730e48	Remove VSCode	2020-05-29 06:45:01 +02:00
James Cole	351272cc27	Merge pull request #3408 from sephrat/issue/3407 ... Fix #3407	2020-05-29 06:44:34 +02:00
James Cole	a293827739	Reformat translations.	2020-05-29 06:43:42 +02:00
James Cole	ead2cf92d3	Merge pull request #3405 from sephrat/error_pages_translation ... Make error pages translatable	2020-05-29 06:41:55 +02:00
James Cole	dea9e21382	Merge branch 'develop' into error_pages_translation	2020-05-29 06:41:47 +02:00
James Cole	69725eb8c3	Rebuild JS #3404	2020-05-29 06:40:45 +02:00
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