117 Commits

Author	SHA1	Message	Date
James Cole	a9c8c8384d	Merge branch 'hotfix/4.7.3.1' into develop	2018-05-14 19:24:54 +02:00
James Cole	4aaec0e379	Fix an issue where new users would be given a rule that always triggers.	2018-05-14 19:24:35 +02:00
James Cole	a3d0355ddd	Use new expanded for method.	2018-04-29 07:45:54 +02:00
James Cole	13b78bdc20	Code cleanup	2018-04-28 06:23:13 +02:00
James Cole	bb25132865	Fix tests	2018-04-27 11:29:09 +02:00
James Cole	f78b8f9267	Some code for #1272	2018-04-24 19:26:16 +02:00
James Cole	36a5f17af2	Code cleanup as described in #1272	2018-04-22 17:12:22 +02:00
James Cole	8032684ad0	Some code cleanup for #1272	2018-04-22 17:10:11 +02:00
James Cole	c2e8a67330	Code for #1367	2018-04-22 11:29:20 +02:00
James Cole	15a22f0bfc	Expand rules and bills.	2018-04-14 20:31:31 +02:00
James Cole	d8a00f4314	Various code for bills and rules.	2018-04-14 09:59:04 +02:00
James Cole	3fbd2f93c8	Code for #1324	2018-04-08 17:36:37 +02:00
James Cole	8f0e36a8e4	Code for #1324	2018-04-08 16:27:52 +02:00
James Cole	7b715925cf	Code for #1324	2018-04-07 22:23:16 +02:00
James Cole	a3c34e6b3c	Code cleanup	2018-04-02 15:10:40 +02:00
James Cole	720dcb0fe5	Fix #1300	2018-03-27 19:29:58 +02:00
James Cole	dd2f3c861b	Optimize imports.	2018-03-10 20:30:09 +01:00
James Cole	8bd76d1ff0	Various code cleanup.	2017-12-22 18:32:43 +01:00
James Cole	c7d4ff6f27	Expand test code.	2017-12-17 18:23:10 +01:00
James Cole	ff9ad859b3	Update copyright [skip ci]	2017-12-17 14:41:58 +01:00
James Cole	78335e5814	Expand tests, do code cleanup.	2017-12-17 14:30:53 +01:00
James Cole	b08af77c98	Fixed a lot of tests and associated code.	2017-12-17 14:06:14 +01:00
James Cole	9086259a65	Small code change for controllers.	2017-12-16 19:46:36 +01:00
James Cole	f35aa6a035	Remove GA event codes.	2017-12-11 14:52:30 +01:00
James Cole	ffca858b8d	Code clean up.	2017-11-15 12:25:49 +01:00
James Cole	57dcdfa0c4	Code clean up.	2017-11-15 11:33:07 +01:00
James Cole	649dca77f5	Code clean up.	2017-11-15 10:52:29 +01:00
James Cole	ac461d64a8	New copyright notice.	2017-10-21 08:40:00 +02:00
James Cole	7d921d648d	Remove exclamation mark.	2017-10-19 20:32:41 +02:00
James Cole	7e8e766ab4	Fix #902	2017-10-19 18:58:54 +02:00
James Cole	5e900736f8	Various code cleanup.	2017-09-14 17:40:02 +02:00
James Cole	233305ecb4	Change namespace of rules.	2017-09-13 07:49:58 +02:00
James Cole	3a3eb4e84f	Various code cleanup.	2017-09-09 06:41:45 +02:00
James Cole	aae26c5da9	Can edit rule group #794	2017-09-08 20:12:55 +02:00
koziolek	bbe8a97945	Fix reseting action type when editing rule ... firefly-iii/firefly-iii#799	2017-09-02 20:30:55 +02:00
James Cole	8bb7d5de3f	Various code clean up.	2017-07-23 08:16:11 +02:00
James Cole	09f838089b	Allow rule to be applied to transactions (not just group).	2017-07-16 13:04:45 +02:00
James Cole	22144b78ea	Strict comparisons.	2017-07-15 16:41:07 +02:00
James Cole	8cdc1f0014	Rename several twig files.	2017-06-02 12:59:14 +02:00
James Cole	1fb0a64f31	Various code cleanup [skip ci]	2017-03-24 15:15:12 +01:00
James Cole	222b3008d5	Expanded test coverage.	2017-03-24 11:07:38 +01:00
James Cole	8b4ef4e2da	Fix for #610	2017-03-04 13:08:16 +01:00
James Cole	f863c01a1d	Merge laravel 5.4 into develop.	2017-02-05 16:20:02 +01:00
James Cole	8a98204a69	Update app() calls	2017-02-05 16:16:15 +01:00
James Cole	3e510bd3f6	This fixes #549	2017-02-05 08:26:54 +01:00
James Cole	619500ca64	Various cod e clean up.	2016-12-28 13:02:56 +01:00
James Cole	83b404d01e	More tests.	2016-12-18 21:04:53 +01:00
James Cole	8deb92c3e5	More tests.	2016-12-18 19:34:03 +01:00
James Cole	f4887bbbf7	More routes and pages fixed.	2016-12-06 08:15:53 +01:00
James Cole	77e2cf40df	Removed more getJournals functions in favour of the collector.	2016-11-06 08:08:06 +01:00