564 Commits

Author	SHA1	Message	Date
James Cole	78009c1cc0	New strings for reconciled transactions. #736	2017-11-08 09:40:38 +01:00
James Cole	d2ab03061f	Various code cleanup.	2017-11-05 19:49:20 +01:00
James Cole	33d89d52c2	Code that allows transaction reconciliation. #736	2017-11-05 19:48:43 +01:00
James Cole	bb46d034cd	Various cleanup in transaction and journal display code.	2017-11-04 07:10:21 +01:00
James Cole	5722622251	Modify search for #963	2017-10-30 17:28:43 +01:00
James Cole	c900716fe6	Merge branch 'develop' of github.com:JC5/firefly-iii into develop	2017-10-27 13:00:36 +02:00
James Cole	a5dd334b71	Log some errors for #960	2017-10-27 12:59:43 +02:00
James Cole	ac461d64a8	New copyright notice.	2017-10-21 08:40:00 +02:00
James Cole	de15ca01e3	Fix #895	2017-10-19 20:51:15 +02:00
James Cole	401ae92a62	Various fixes for #916	2017-10-14 07:58:29 +02:00
James Cole	9a8ddf5c05	Some debug for #916	2017-10-08 10:14:26 +02:00
James Cole	3e39deec36	Updated website boxes.	2017-09-27 08:45:27 +02:00
James Cole	37250cbde3	Various code cleanup.	2017-09-16 09:24:48 +02:00
James Cole	3a3eb4e84f	Various code cleanup.	2017-09-09 06:41:45 +02:00
James Cole	a50945ad53	Fix #814	2017-09-05 20:50:19 +02:00
James Cole	b8d4776671	Remove unused code.	2017-08-26 21:28:14 +02:00
James Cole	b955486f14	Updated export routine.	2017-08-18 14:45:42 +02:00
James Cole	c39c5492ea	Simplify controllers	2017-07-30 13:42:30 +02:00
James Cole	f67d5f1197	Fix bug in filter.	2017-07-30 10:21:45 +02:00
James Cole	7b03b0c5fc	Some PHP 7.1 compatible code.	2017-07-23 19:06:24 +02:00
James Cole	f85ab74e2b	Code cleanup and tests.	2017-07-23 08:32:51 +02:00
James Cole	8bb7d5de3f	Various code clean up.	2017-07-23 08:16:11 +02:00
James Cole	f16a186faf	Option to re-enable intro boxes.	2017-07-23 07:30:05 +02:00
James Cole	22144b78ea	Strict comparisons.	2017-07-15 16:41:07 +02:00
James Cole	5cf8f2f4f4	Add sort flag for #698	2017-07-14 17:25:03 +02:00
James Cole	71a41bc00d	Add newlines [skip ci]	2017-07-07 08:09:42 +02:00
James Cole	c382fb1577	Add debug info for #671	2017-06-12 19:58:32 +02:00
James Cole	5329e026dc	Fixed various currency displays.	2017-06-06 07:18:09 +02:00
James Cole	c4039b53e6	Various code cleanup.	2017-06-05 11:12:50 +02:00
James Cole	a487c7b4b2	Make sure amounts are formatted, and fixed some issues.	2017-06-04 23:39:26 +02:00
James Cole	771ebde295	Update journal collector so currency information is taken from the transaction.	2017-06-04 08:49:37 +02:00
James Cole	78faf7e14c	Forgot call to sprintf. [skip ci]	2017-04-29 08:33:32 +02:00
James Cole	98f84c2c37	Introducing filters to the journal collector.	2017-04-29 08:22:56 +02:00
James Cole	7e11691ea4	Update code to work with filters.	2017-04-28 20:08:25 +02:00
James Cole	c83dfc44d6	Update internal filters.	2017-04-28 20:08:04 +02:00
James Cole	0307b58d17	Small changes to make code more testable.	2017-04-28 18:04:57 +02:00
James Cole	42322055f9	New filters to clean up the journal collector.	2017-04-28 18:02:54 +02:00
James Cole	595596d73f	Apparently this is changed in PHPStorm’s formatting templates so there you go [skip ci].	2017-04-09 07:44:22 +02:00
James Cole	ea984281b0	Should fix tests.	2017-03-30 18:42:02 +02:00
James Cole	92cd3d60b9	Forgot two files.	2017-03-29 21:21:10 +02:00
James Cole	1fb0a64f31	Various code cleanup [skip ci]	2017-03-24 15:15:12 +01:00
James Cole	9515ce6807	Expand tests.	2017-03-19 17:54:21 +01:00
James Cole	2116486fe0	Various code cleanup	2017-02-25 17:39:50 +01:00
James Cole	8c6972d12d	Various code cleanup.	2017-02-25 05:57:01 +01:00
James Cole	40c38af766	Final code for tag report.	2017-02-24 21:09:20 +01:00
James Cole	fc2cee7a54	Fixes tests.	2017-02-24 21:01:33 +01:00
James Cole	3d4feff7de	More code for the tag report.	2017-02-24 20:27:26 +01:00
James Cole	f63c6875cd	Initial code base for tag report.	2017-02-24 20:01:35 +01:00
James Cole	b5032a7597	Added a new helper function.	2017-02-19 07:34:39 +01:00
James Cole	5d0cdc4ffa	Various code cleanup.	2017-02-17 06:42:36 +01:00