18004 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	784cc3d52d	Fix #7642	2023-06-12 06:31:03 +02:00
James Cole	2ab3fb3a71	Merge pull request #7644 from firefly-iii/fix-7630 ... Fix #7630	2023-06-12 06:24:46 +02:00
James Cole	ff765d4687	Fix #7630	2023-06-12 06:24:30 +02:00
James Cole	f6e778e1d4	Merge branch 'release/v6.0.13' v6.0.13	2023-06-11 18:19:07 +02:00
James Cole	ed36604050	Merge tag 'v6.0.13' into develop ... v6.0.13	2023-06-11 18:19:07 +02:00
James Cole	cbf8c6e80d	Release v6.0.13 fixes an issue with the authentication controllers.	2023-06-11 18:18:46 +02:00
James Cole	f11db0de61	Merge tag 'v6.0.12' into develop ... v6.0.12	2023-06-11 16:34:31 +02:00
James Cole	34f16dcdd5	Merge branch 'release/v6.0.12' v6.0.12	2023-06-11 16:34:30 +02:00
James Cole	f18aae39b8	chore: Meta files for new release	2023-06-11 16:34:06 +02:00
James Cole	924171e7b9	Merge pull request #7640 from firefly-iii/fix-7613 ... Fix #7613	2023-06-11 16:15:40 +02:00
James Cole	6b580212bf	Fix #7613	2023-06-11 16:15:22 +02:00
James Cole	208ae1cae7	Merge pull request #7639 from firefly-iii/fix-7619 ... Fix #7619	2023-06-11 16:12:41 +02:00
James Cole	3aa7fe47de	Fix #7619	2023-06-11 16:12:13 +02:00
James Cole	5318082467	Merge pull request #7638 from firefly-iii/chore2 ... Fix CSS again	2023-06-11 15:51:42 +02:00
James Cole	941ec095e5	Fix CSS again	2023-06-11 15:51:17 +02:00
James Cole	d5ebd8e57c	Merge pull request #7637 from firefly-iii/chore ... Chore: Update version and better colors.	2023-06-11 12:21:11 +02:00
James Cole	ebe087984d	Chore: Update version and better colors.	2023-06-11 12:20:57 +02:00
James Cole	fa993e02dd	Merge pull request #7634 from firefly-iii/fix-missing-var ... Fix: missing variable	2023-06-10 21:42:09 +02:00
James Cole	44df77f45a	Fix: missing variable	2023-06-10 21:41:45 +02:00
James Cole	0f8f95de9a	Merge pull request #7628 from firefly-iii/fix-7618 ... Fix 7618	2023-06-10 16:21:40 +02:00
James Cole	f32283d2f1	Fix #7618	2023-06-10 16:21:01 +02:00
James Cole	14f8695599	Merge pull request #7627 from firefly-iii/fix-forms ... Fix forms	2023-06-10 16:09:00 +02:00
James Cole	f8b48f7455	Fix forms	2023-06-10 16:08:32 +02:00
James Cole	70e2aab073	Merge pull request #7623 from firefly-iii/fix-7620 ... Fix #7620	2023-06-10 13:15:33 +02:00
James Cole	12db745f17	Fix #7620	2023-06-10 13:15:06 +02:00
James Cole	8a48cc690f	Merge pull request #7612 from firefly-iii/logo-tune-2 ... Another small tune	2023-06-06 12:42:44 +02:00
James Cole	eb313c65a5	Another small tune	2023-06-06 12:42:20 +02:00
James Cole	07d6cbc194	Merge pull request #7611 from firefly-iii/logo-tune ... chore: tune the logo	2023-06-06 12:38:50 +02:00
James Cole	8975a462c4	Merge pull request #7610 from firefly-iii/fix-form ... fix: expand form elements with ID	2023-06-06 06:19:42 +02:00
James Cole	2e4f07d058	fix: expand form elements with ID	2023-06-06 06:19:24 +02:00
James Cole	74a2935fea	Merge pull request #7600 from firefly-iii/upgrade-html ... Upgrade html	2023-06-04 15:16:47 +02:00
James Cole	3d02468828	fix: replace deprecated package	2023-06-04 15:16:17 +02:00
James Cole	0438fb5a2e	fix: remove and replace old form functions	2023-06-04 10:09:45 +02:00
James Cole	a4f9a6fd42	fix: replace deprecated form.model with html	2023-06-04 10:09:24 +02:00
James Cole	a0be4c9daa	chore: tune the logo	2023-06-04 07:53:56 +02:00
James Cole	2dc003bd85	Merge pull request #7597 from firefly-iii/logo-expansion ... feat: Expand logo in startup scripts	2023-06-04 06:58:52 +02:00
James Cole	78aa8bd838	feat: Expand logo in startup scripts	2023-06-04 06:58:35 +02:00
James Cole	f55fde2b52	Merge pull request #7596 from firefly-iii/fix-yaml ... fix qodana yaml	2023-06-04 06:33:21 +02:00
James Cole	232572549e	fix qodana yaml	2023-06-04 06:33:05 +02:00
James Cole	d07705c329	Merge pull request #7595 from firefly-iii/qodana-fix ... chore: fix various qodana issues	2023-06-04 06:30:45 +02:00
James Cole	688ca8e374	chore: fix various qodana issues	2023-06-04 06:30:22 +02:00
James Cole	160c364d2a	Merge pull request #7594 from firefly-iii/missing-bracket ... fix: extra bracket breaks code.	2023-06-04 06:14:38 +02:00
James Cole	2b3e6bfbb9	Merge pull request #7593 from josephbadow/fix-urls-envexample-#7580 ... Fix URLs in .env.example #7580	2023-06-04 06:13:49 +02:00
James Cole	5a55d1db24	fix: extra bracket breaks code.	2023-06-04 06:13:24 +02:00
josephbadow	bd252dbc16	amend links in .env.example to point to correct documentation pages	2023-06-03 22:16:59 +02:00
James Cole	30124855e3	Merge pull request #7592 from firefly-iii/fix-7589 ... First attempt to fix #7589	2023-06-03 21:20:15 +02:00
James Cole	463ebd296f	First attempt to fix #7589	2023-06-03 21:17:49 +02:00
James Cole	2e7a17560d	Merge branch 'main' into develop	2023-06-03 17:19:14 +02:00
James Cole	374d5a074d	Merge pull request #7591 from firefly-iii/fix-command-output ... chore: fix command output	2023-06-03 17:18:21 +02:00
James Cole	88b294d873	chore: fix command output	2023-06-03 17:18:04 +02:00