3466 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
James Cole	7e8fea6ed3	Forgot a bracket	2016-02-11 14:14:47 +01:00
James Cole	43ff3e11ed	Some changes to the error handler	2016-02-11 14:13:23 +01:00
James Cole	f1750e3c35	Will inform about the logged in user	2016-02-11 12:54:16 +01:00
James Cole	8b1fe26c84	A route that displays an error. Seems quite useless, I know	2016-02-11 12:49:04 +01:00
James Cole	df45298c1f	Fixed bug in sumOfEverything() function	2016-02-11 11:21:50 +01:00
James Cole	27ad428b5e	Weird letter.	2016-02-11 08:13:57 +01:00
James Cole	2da33bae43	Some code used for #164	2016-02-11 08:13:04 +01:00
James Cole	3dab683a45	New asset account number handler. For issue #107	2016-02-11 08:12:10 +01:00
James Cole	d08fa37ccf	Expanded error handling.	2016-02-11 08:11:26 +01:00
James Cole	4cd7976f63	Changes to the CSV importer because I ran into small bugs.	2016-02-11 08:11:12 +01:00
James Cole	569e8b6180	Better sort for CSV import column roles.	2016-02-11 07:03:12 +01:00
James Cole	9a443bd08e	New translations.	2016-02-11 07:02:57 +01:00
James Cole	efb37ae709	Field 'name' is not used. Also added some other new stuff.	2016-02-11 07:02:48 +01:00