3329 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robert Horlings	2eb7d8ba91	Merge branch 'feature/test-triggers' of github.com:roberthorlings/firefly-iii into feature/test-triggers	2016-02-17 16:26:29 +01:00
Robert Horlings	7ec5cce2c8	Implemented filter not to return all transactions when testing filters	2016-02-17 16:23:43 +01:00
Robert Horlings	8fdc6c11e1	Merge branch 'develop' into feature/test-triggers	2016-02-17 16:14:07 +01:00
James Cole	1a110de597	Throw errors instead of abort()	2016-02-17 15:52:46 +01:00
James Cole	317aa591c3	Need to "use" the TriggerFactory!	2016-02-17 15:46:58 +01:00
James Cole	0d44f82c86	Code cleanup. [skip ci]	2016-02-17 15:38:21 +01:00
James Cole	9cac61dc33	Better description for matchesAnything	2016-02-17 15:37:05 +01:00
James Cole	52481a6e8b	Code formatting.	2016-02-17 15:29:26 +01:00
James Cole	b3e18f4e56	Merge pull request #189 from roberthorlings/feature/trigger-matches-anything ... Check for triggers that match anything	2016-02-17 15:28:39 +01:00
James Cole	aa25ac774e	Merge pull request #190 from roberthorlings/feature/trigger-action-factories ... Introduction of factories to create rule actions and rule triggers	2016-02-17 15:27:38 +01:00
Robert Horlings	af7da586aa	Cleanup of processor after introduction of factories	2016-02-17 13:26:38 +01:00
Robert Horlings	b671da900a	Implemented action factory analogue to trigger factory	2016-02-17 13:24:56 +01:00
Robert Horlings	d8bb83e8c4	Moved creation of Trigger objects to factory for reuse	2016-02-17 13:20:51 +01:00
Robert Horlings	bc3d64a2ff	Moved creation of Trigger objects to factory for reuse	2016-02-17 13:16:46 +01:00
Robert Horlings	70e72c246d	Added method to RuleTrigger object as well	2016-02-17 13:03:02 +01:00
Robert Horlings	7c8c82edd7	Added method for triggers to check whether they match all transactions	2016-02-17 13:02:27 +01:00
Robert Horlings	5dc556f0af	Updated frontend to access the 'test-rules' functionality	2016-02-17 12:11:00 +01:00
Robert Horlings	c8c69f1a66	Implemented controller method and helper object to find matching transactions	2016-02-17 12:10:38 +01:00
James Cole	985019e117	Merge pull request #188 from roberthorlings/bugfix/fixed-missing-tags ... Added closing li tags	2016-02-17 10:31:51 +01:00
Robert Horlings	b9620b3a21	Refactored method to check whether a transaction is triggered by a list of triggers	2016-02-17 10:24:40 +01:00
Robert Horlings	e7bb4a8ec6	Implemented option to specify pagesize when retrieving journals	2016-02-17 10:17:16 +01:00
Robert Horlings	bb5f935d7a	Added closing li tags	2016-02-17 10:13:21 +01:00
James Cole	17dad27610	Catch type error.	2016-02-16 18:39:03 +01:00
James Cole	ee960d76c7	Possible fix for attachment helper	2016-02-16 13:30:50 +01:00
James Cole	dfb595193a	Possible fix for attachment helper	2016-02-16 13:28:55 +01:00
James Cole	0a91a40c1b	Merge branch 'develop' of github.com:JC5/firefly-iii into develop	2016-02-16 13:25:48 +01:00
James Cole	12f4305691	Possible fix for attachment helper	2016-02-16 13:25:03 +01:00
James Cole	dd865b0dfb	Remove IDE specific files from .gitignore. [skip ci]	2016-02-15 19:49:33 +01:00
James Cole	7cbfa9fcd4	Merge pull request #182 from roberthorlings/develop ... Small fix for importing amounts with comma as decimal separator	2016-02-15 19:48:27 +01:00
Robert Horlings	28d880a7c4	Ignoring eclipse specific files	2016-02-15 14:50:10 +01:00
James Cole	e83d45fce5	Expand manifest.json [skip ci]	2016-02-14 16:17:01 +01:00
James Cole	693ff3cc66	Various fixes.	2016-02-13 13:13:22 +01:00
James Cole	706b095f95	Forgot to actually return the created array.	2016-02-12 17:50:12 +01:00
James Cole	8e2e96d513	Config for code climate.	2016-02-12 17:45:33 +01:00
James Cole	28bce44f69	More code cleanup.	2016-02-12 17:41:12 +01:00
James Cole	53d88dfd50	Clean up code.	2016-02-12 17:37:11 +01:00
James Cole	42daf7ed32	Clean up some code.	2016-02-12 17:34:42 +01:00
James Cole	e5402ea7c1	Fixed a sum.	2016-02-12 15:01:32 +01:00
James Cole	05e8d6b578	Removed superfluous sentence in registration mail.	2016-02-12 14:16:51 +01:00
James Cole	505f340917	Some clean up in the error handler.	2016-02-12 14:15:49 +01:00
James Cole	46856c9394	Remove entrust package.	2016-02-12 05:49:53 +01:00
James Cole	c63a2ad39d	Updated test data.	2016-02-12 05:32:16 +01:00
James Cole	68a7078614	Clean up TestData	2016-02-12 05:29:41 +01:00
James Cole	2e15f1e2a3	Removed todo comments.	2016-02-12 04:59:14 +01:00
James Cole	a790838222	Remove total downloads. [skip ci]	2016-02-12 04:51:40 +01:00
James Cole	cd14360d62	Merge pull request #178 from zjean/develop ... Respect the base href in ajax calls.	2016-02-11 21:24:53 +01:00
zjean	74c94a60a6	Respect the base href in ajax calls.	2016-02-11 19:57:26 +01:00
James Cole	56cbc7683e	Try changes to the handler	2016-02-11 14:20:18 +01:00
James Cole	bf778d2fca	Try changes to the handler	2016-02-11 14:17:58 +01:00
James Cole	6e5bca8306	Try changes to the handler	2016-02-11 14:17:11 +01:00