12784 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	c86faaa165	Experimental commit from new email address	2020-01-23 19:56:38 +01:00
James Cole	68c71cb2f9	Update email address in the readme and a selection of code.	2020-01-23 19:44:52 +01:00
James Cole	ad2994a47c	Add copyright template.	2020-01-23 19:38:39 +01:00
James Cole	1e4b4c66fc	Update readme.md	2020-01-22 20:09:58 +01:00
James Cole	28c9069441	Merge pull request #3041 from JC5/develop ... Develop	2020-01-22 17:31:50 +01:00
James Cole	200e0054ba	Fix <P> tag in readme.	2020-01-22 17:30:39 +01:00
James Cole	ad3280c7ef	Merge pull request #1 from firefly-iii/develop ... Develop	2020-01-22 17:29:46 +01:00
James Cole	04824c9c8c	Add screenshots from other devices.	2020-01-22 11:39:37 +01:00
James Cole	a8df0c292c	Merge pull request #3039 from tomershvueli/install-on-cloudron ... Add link to install Firefly III on Cloudron in Get Started	2020-01-22 05:41:29 +01:00
Tomer Shvueli	fcb57a911b	Update readme.md	2020-01-21 16:58:59 -05:00
Tomer Shvueli	cd756ffee5	Update readme.md	2020-01-21 16:58:35 -05:00
Tomer Shvueli	db6533b3de	Update readme.md	2020-01-21 16:58:14 -05:00
Tomer Shvueli	c78455ce6c	Merge branch 'develop' into install-on-cloudron	2020-01-21 16:57:41 -05:00
Tomer S	6a7c7e1e26	Add link to install Firefly III on Cloudron in Get Started	2020-01-21 16:55:02 -05:00
James Cole	882d78afd3	Merge pull request #3038 from JC5/develop ... Write new readme.	2020-01-21 20:55:32 +01:00
James Cole	00ed8a17f4	Write new readme.	2020-01-21 20:54:51 +01:00
James Cole	fc7c2c298e	Merge pull request #3037 from JC5/develop ... Add missing function that resulted in 404's.	2020-01-21 18:04:06 +01:00
James Cole	7b204c0c2d	Add missing function that resulted in 404's.	2020-01-21 18:02:49 +01:00
James Cole	afcd6cffda	Merge pull request #3036 from JC5/develop ... Fixes #2998	2020-01-21 17:59:20 +01:00
James Cole	4f86aaf198	Fixes 2998	2020-01-21 17:58:31 +01:00
James Cole	e055f1720e	Merge pull request #3035 from JC5/develop ... Fix #3026	2020-01-21 17:49:04 +01:00
James Cole	fd24fe35a6	See what style CI will do.	2020-01-21 17:45:39 +01:00
James Cole	d27b3fafe9	Fix issue with ISO week numbers.	2020-01-21 17:44:35 +01:00
James Cole	5a9a35dab8	Merge pull request #3031 from JC5/develop ... Develop	2020-01-20 20:54:21 +01:00
James Cole	a4c0ee7350	Code to fix issue with missing button information.	2020-01-20 20:52:23 +01:00
James Cole	c8e4bc00c5	Try to fix an annoying bug in budget overview in default report.	2020-01-20 20:21:40 +01:00
James Cole	47e1d9371c	Merge pull request #3030 from JC5/develop ... Fix issue 3027	2020-01-20 19:55:37 +01:00
James Cole	9ae1f460b2	Fix issue https://github.com/firefly-iii/firefly-iii/issues/3027 by filtering the transaction types included in the report.	2020-01-20 19:48:40 +01:00
James Cole	d49efca791	Merge pull request #3018 from JC5/develop ... Fix #3016	2020-01-19 18:11:21 +01:00
James Cole	154ac8b73c	Enable cache again.	2020-01-19 18:09:34 +01:00
James Cole	9b420c461f	Fix for https://github.com/firefly-iii/firefly-iii/issues/3016	2020-01-19 18:07:54 +01:00
James Cole	f6e5a399cf	Merge tag '5.0.0' into develop ... 5.0.0	2020-01-18 06:10:18 +01:00
James Cole	8bc6ca0ec0	Merge branch 'release/5.0.0'	2020-01-18 06:10:17 +01:00
James Cole	63d8068ba6	Update some code for the new release.	2020-01-18 06:09:52 +01:00
James Cole	11160adf08	Update composer.lock	2020-01-17 20:50:56 +01:00
James Cole	924899f763	Update translations, fix version.	2020-01-17 20:44:54 +01:00
James Cole	458bdc5fd4	Update changelog.	2020-01-17 04:40:44 +01:00
James Cole	1c458704d6	Small composer update.	2020-01-17 04:33:12 +01:00
James Cole	ff44dbaea0	Update analytics code.	2020-01-17 04:30:44 +01:00
James Cole	3852dbeacc	Update composer.lock	2020-01-13 16:55:56 +01:00
James Cole	94bb3f43ed	#2993	2020-01-13 16:55:41 +01:00
James Cole	534f4de520	Fix an issue where users were unable to create revenue / expense account combinations with the same name. #2987	2020-01-11 17:31:32 +01:00
James Cole	8c36a371be	Remove https.	2020-01-11 09:58:35 +01:00
James Cole	2416fd6773	Remove experimental simple nonce.	2020-01-11 06:24:53 +01:00
James Cole	77fa3af87e	Use a very simple nonce to see if Edge stops complaining.	2020-01-11 06:15:08 +01:00
James Cole	5da8b2ec9e	Some CSP tuning.	2020-01-11 06:14:10 +01:00
James Cole	c55bfc0b8c	Improve config of CSP headers.	2020-01-11 05:28:20 +01:00
James Cole	97dffaa8a9	Update readme.	2020-01-11 05:10:24 +01:00
James Cole	8857e3553d	Fix for #2980	2020-01-10 17:12:38 +01:00
James Cole	925f63c8e1	Experimental switch of parameters and different urls	2020-01-09 20:43:32 +01:00