13353 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	0449430ec3	I messed up	2020-06-14 19:24:23 +02:00
James Cole	dd5a179ba1	More stuff for new layout.	2020-06-14 19:17:45 +02:00
James Cole	7c1139e42b	First set of code for new layout based on AdminLTE 3.0	2020-06-14 15:51:20 +02:00
James Cole	caddf3d1c6	Fix #3461	2020-06-13 13:48:52 +02:00
James Cole	54d5778bf3	Add attachment to recurring.	2020-06-12 20:56:58 +02:00
James Cole	b1732d0de8	New possibilities for date range triggers #3403	2020-06-12 07:49:39 +02:00
James Cole	48b5f749a1	Fix logout for #3184	2020-06-11 17:55:38 +02:00
James Cole	a63b8322db	Updates for #3184	2020-06-11 06:55:13 +02:00
James Cole	2130eef971	Update .env.example for #3184	2020-06-11 06:54:42 +02:00
James Cole	5b829b514f	Include notes in export.	2020-06-09 17:40:09 +02:00
James Cole	1bac3258da	Merge pull request #3455 from sephrat/debug_translation ... Translate debug page	2020-06-09 15:18:17 +00:00
James Cole	d7181100ee	Merge pull request #3454 from sephrat/translations ... Translations tweaks	2020-06-09 15:17:30 +00:00
James Cole	ccc82858ad	Fix drag/drop + sort	2020-06-09 17:16:21 +02:00
Florian Dupret	5dd6b23b09	Translate debug page	2020-06-09 13:51:01 +02:00
James Cole	6a08f52fa5	Update packages and order.	2020-06-09 11:09:23 +02:00
James Cole	18172b7fdb	Fix order, fix bar.	2020-06-09 10:33:55 +02:00
James Cole	3eccc56c7a	Better column	2020-06-09 08:48:28 +02:00
Florian Dupret	f7545af17a	Missing translation on budgets index page	2020-06-09 08:37:40 +02:00
Florian Dupret	aa4da1e2e1	Telemetry count pluralization	2020-06-09 08:35:10 +02:00
James Cole	b4aafefc2b	Fix NULL	2020-06-08 18:22:36 +02:00
James Cole	8304ee21f3	Fix #3450	2020-06-07 21:42:52 +02:00
James Cole	ca6479ede6	Update version.	2020-06-07 16:38:25 +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	60fa0d7244	Merge tag '5.2.8' into develop ... 5.2.8	2020-06-06 12:19:11 +02:00
James Cole	389ffa820f	Merge branch 'release/5.2.8'	2020-06-06 12:19:11 +02:00
James Cole	28d6885178	Update meta files for 5.2.8	2020-06-06 12:18:42 +02:00
James Cole	00f579909e	Update meta files.	2020-06-06 12:16:32 +02:00
James Cole	a35bccb940	Fix #3443	2020-06-06 12:14:55 +02:00
James Cole	1cba62aa42	Cleanup changelog, forgot some unused entries.	2020-06-06 07:26:22 +02:00
James Cole	0974591a8f	Merge tag '5.2.7' into develop ... 5.2.7	2020-06-06 07:18:38 +02:00
James Cole	326bef66ee	Merge branch 'release/5.2.7'	2020-06-06 07:18:36 +02:00
James Cole	67ba8cee09	Updated meta files.	2020-06-06 07:15:56 +02:00
James Cole	08107f7103	Fix translations.	2020-06-06 07:09:27 +02:00
James Cole	f5c075936f	Better generation of installation ID.	2020-06-06 06:57:44 +02:00
James Cole	d493820cc8	Migrate default env file to MySQL	2020-06-06 06:40:59 +02:00
James Cole	af4a006192	New translations.	2020-06-06 06:40:44 +02:00
James Cole	946e3fb540	New changelog.	2020-06-06 06:37:20 +02:00
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