11532 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	9f3c114d57	Add JSON decrypt for #2125	2019-03-02 09:18:26 +01:00
James Cole	c51c1b8098	Some basic date tests	2019-03-02 08:05:15 +01:00
James Cole	143fe2a71f	Fix #2125	2019-03-01 17:56:52 +01:00
James Cole	3379b723cf	Last attempt I hope for #2125	2019-02-28 19:56:41 +01:00
James Cole	39321b320e	Improve search speed.	2019-02-27 19:08:09 +01:00
James Cole	fe738fd321	Another fix for #2125	2019-02-27 18:55:56 +01:00
James Cole	95720673d2	Merge pull request #2130 from lastlink/patch-1 ... add missing rollback for 477 migration	2019-02-26 18:33:20 +01:00
lastlink	963be4a4fa	add missing rollback for 477 migration	2019-02-26 00:16:05 -05:00
James Cole	61db419485	Fixes #2125	2019-02-25 20:57:29 +01:00
James Cole	cb17b09b24	Merge pull request #2120 from lastlink/fix/pwaApple ... missing meta tag for ios	2019-02-25 07:23:50 +01:00
Mr. Funk	0f1236a597	missing meta tag for ios	2019-02-24 15:12:58 -05:00
James Cole	ac26427a63	Merge branch 'master' into develop ... * master: Don't change ARM PHP settings.	2019-02-24 10:56:28 +01:00
James Cole	491903778a	Don't change ARM PHP settings.	2019-02-24 10:56:08 +01:00
James Cole	405c3e110a	Merge tag '4.7.14' into develop ... 4.7.14	2019-02-24 07:28:00 +01:00
James Cole	5464bfac19	Merge branch 'release/4.7.14'	2019-02-24 07:28:00 +01:00
James Cole	ad31cc1c1f	Fixes #2119 and bump version.	2019-02-24 07:27:24 +01:00
James Cole	3aa79fb1e4	Merge tag '4.7.13' into develop ... 4.7.13	2019-02-23 21:27:05 +01:00
James Cole	e3de03e50d	Merge branch 'release/4.7.13'	2019-02-23 21:27:04 +01:00
James Cole	d8b4af34e0	Update files for release 4.7.13	2019-02-23 14:32:24 +01:00
James Cole	222d8e071a	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop ... * 'develop' of github.com:firefly-iii/firefly-iii: New check for journals with 0.00 amount.	2019-02-23 12:36:17 +01:00
James Cole	36c2f27d59	New check for journals with 0.00 amount.	2019-02-23 07:47:41 +01:00
James Cole	5d43faab96	Refactor script locations to clear up root directory.	2019-02-20 07:04:24 +01:00
James Cole	07048cb5fb	Fix #2100	2019-02-19 20:19:30 +01:00
James Cole	38c79c3dc4	Upgrade fix for Softaculous.	2019-02-19 19:59:02 +01:00
James Cole	7610d9e0db	Update Dockerfiles to increase PHP execution time.	2019-02-19 07:10:13 +01:00
James Cole	e4f3d0a0ea	Some new strings.	2019-02-18 19:47:48 +01:00
James Cole	fdf147d9c6	Merge branch 'hotfix/4.7.12.1'	2019-02-16 23:01:29 +01:00
James Cole	f7e418f517	Merge tag '4.7.12.1' into develop ... 4.7.12.1	2019-02-16 23:01:29 +01:00
James Cole	738f6ed232	Fix #2093	2019-02-16 23:01:14 +01:00
James Cole	12217d9850	Merge tag '4.7.12' into develop ... 4.7.12	2019-02-16 19:35:01 +01:00
James Cole	87c8b3d7c6	Merge branch 'release/4.7.12'	2019-02-16 19:35:00 +01:00
James Cole	fd571abbb0	Slight change in build script.	2019-02-16 19:33:33 +01:00
James Cole	64ae56757e	Updated meta files.	2019-02-16 19:22:16 +01:00
James Cole	7d75f00696	New translations.	2019-02-16 19:22:05 +01:00
James Cole	451c86e431	Final touches for #2085	2019-02-16 19:04:36 +01:00
James Cole	c8c71da903	Extra debug log. #2061	2019-02-16 14:27:54 +01:00
James Cole	423f3a9296	Fix build script.	2019-02-16 14:02:04 +01:00
James Cole	7658b7d9a6	Apply fix for #2070	2019-02-16 11:45:08 +01:00
James Cole	0d0906c5e2	Fix for #2070	2019-02-16 11:43:05 +01:00
James Cole	e0aa7f3ff5	Various code cleanup.	2019-02-16 08:05:48 +01:00
James Cole	59fdf5b77a	Updates to the login procedure [skip ci]	2019-02-16 07:20:25 +01:00
James Cole	e28cfade8d	Push and build stuff.	2019-02-15 17:15:42 +01:00
James Cole	19710c3eab	Update LDAP config for #2085	2019-02-15 07:39:12 +01:00
James Cole	0782354160	Updated LDAP code #2085	2019-02-15 07:22:51 +01:00
James Cole	22bc6d507e	Fix issue with upgrade.	2019-02-13 17:54:46 +01:00
James Cole	bf3c74e65f	Add required PHP extensions to composer.json.	2019-02-13 17:54:36 +01:00
James Cole	71fb9d8fa5	Code cleaning stuff.	2019-02-13 17:38:41 +01:00
James Cole	9a461fc7b7	Fix for #2082	2019-02-13 17:34:03 +01:00
James Cole	e0d87aa11e	First part of a large code cleanup commit.	2019-02-12 21:49:28 +01:00
James Cole	b273af341c	Update version.	2019-02-12 21:01:19 +01:00