6325 Commits

Author	SHA1	Message	Date
James Cole	ccc82858ad	Fix drag/drop + sort	2020-06-09 17:16:21 +02:00
James Cole	18172b7fdb	Fix order, fix bar.	2020-06-09 10:33:55 +02:00
James Cole	b4aafefc2b	Fix NULL	2020-06-08 18:22:36 +02:00
James Cole	471cdefcff	Organise object groups	2020-06-07 16:38:15 +02:00
James Cole	16b0307b0a	Piggy bank can now have a group.	2020-06-07 11:31:01 +02:00
James Cole	2f63090e7c	Split controller	2020-06-07 11:30:02 +02:00
James Cole	8643034945	Upgrade to 7.4	2020-06-06 22:25:52 +02:00
James Cole	6cc4d14fcb	Remove import code.	2020-06-06 21:23:26 +02:00
James Cole	a35bccb940	Fix #3443	2020-06-06 12:14:55 +02:00
James Cole	f5c075936f	Better generation of installation ID.	2020-06-06 06:57:44 +02:00
James Cole	b19338e2f3	Add db connection info.	2020-06-06 06:34:43 +02:00
James Cole	c90c181785	Basic code for an object group select item thing.	2020-06-05 19:39:09 +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	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	f3ac8a5888	Add newlines and remove some unused translations.	2020-05-30 07:33:06 +02:00
James Cole	7535ca9a26	Merge branch 'develop' into pluralization	2020-05-29 20:55:31 +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	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	0c8229d689	Some language strings.	2020-05-29 06:07:03 +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	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	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
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	be58b1d2be	Enable the feature flag for telemetry.	2020-05-24 12:00:14 +02:00
James Cole	15e772d9dc	Update some (disabled) commands.	2020-05-24 11:24:28 +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	dbd68cedc9	Code for #3309	2020-05-22 13:52:33 +02: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	5ff1991cdc	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2020-05-19 11:19:13 +02:00