12768 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
James Cole	987730b36b	Config for locking old issues.	2020-01-09 20:40:30 +01:00
James Cole	4752dea460	Fix the same typo's in Firefly III's example env file. https://github.com/firefly-iii/docker/pull/1 Courtesy of @techash	2020-01-09 20:09:22 +01:00
James Cole	d57f764fb8	Routine for #2983	2020-01-09 20:04:42 +01:00
James Cole	2d0a57e7e4	More debug and some thinking comments	2020-01-09 19:59:53 +01:00
James Cole	f78729fc8a	Add lots of debug.	2020-01-09 19:52:47 +01:00
James Cole	7362a36a98	Add logs.	2020-01-09 19:45:13 +01:00
James Cole	cf067d0bd2	Some extra debugging.	2020-01-09 19:42:28 +01:00
James Cole	2efe5b07e2	#2981 whoops	2020-01-09 19:29:43 +01:00
James Cole	42de629646	Fix #2981	2020-01-09 19:28:23 +01:00
James Cole	220230e981	Fix #2983	2020-01-09 19:26:45 +01:00
James Cole	7f002eb6a9	Be backwards compatible.	2020-01-09 17:04:10 +01:00
James Cole	8c6f8460a2	Be backwards compatible.	2020-01-09 17:03:59 +01:00
James Cole	7f0ac79c5c	Merge tag '5.0.0-beta.1' into develop ... 5.0.0-beta.1	2020-01-09 06:39:13 +01:00
James Cole	4ff2c19fa9	Merge branch 'release/5.0.0-beta.1'	2020-01-09 06:39:12 +01:00
James Cole	cfeaeb7877	Update changelog.	2020-01-09 06:38:38 +01:00
James Cole	298371f680	Update libraries.	2020-01-09 06:33:10 +01:00