745 Commits

Author	SHA1	Message	Date
James Cole	55b6d711f3	Currency exchange rate will not be saved when rate is 0.	2018-03-30 06:33:04 +02:00
James Cole	be5c44af61	Update some code, add security txt file.	2018-03-28 19:37:59 +02:00
James Cole	992657b942	Code for #1257	2018-03-25 13:30:55 +02:00
James Cole	aad0864018	Various code cleanup [skip ci]	2018-03-10 22:38:20 +01:00
James Cole	9dc4c50527	Expand test coverage.	2018-03-03 14:24:06 +01:00
James Cole	5b8adbfd0c	Repository and test clean up.	2018-02-28 21:32:59 +01:00
James Cole	1b304bf85e	use journal repository instead of direct calls.	2018-02-25 19:09:05 +01:00
James Cole	9d457787f7	Specify times for SQLite database. #1192	2018-02-20 17:17:14 +01:00
James Cole	c6da990748	Expand decryption routine.	2018-02-17 10:47:18 +01:00
James Cole	45aa76afce	Expand collector to return single journals.	2018-02-16 16:43:48 +01:00
James Cole	22fdc81de2	Refactor transactions.	2018-02-13 21:04:15 +01:00
James Cole	95648c37b3	Various code cleanup.	2018-02-09 19:11:55 +01:00
James Cole	089300d57e	Update date related code to fix several issues with SQLite	2018-02-04 09:22:52 +01:00
James Cole	7c70732247	Some light refactoring. No changes.	2018-01-25 18:41:27 +01:00
James Cole	13df973873	Fix query cache.	2018-01-17 10:03:47 +01:00
James Cole	ccf1a6c182	Fix #1134	2018-01-17 09:22:45 +01:00
James Cole	57855b1930	Remove references to unused cache thing.	2018-01-16 21:09:27 +01:00
James Cole	4926011f3f	Fix #1085	2018-01-01 15:33:38 +01:00
James Cole	8bd76d1ff0	Various code cleanup.	2017-12-22 18:32:43 +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	54c449f11b	Some code to get #384 working.	2017-12-10 17:55:06 +01:00
James Cole	efaa69cba1	Updates to bill code for #1029	2017-12-02 07:10:36 +01:00
James Cole	7852f4df1f	Expand test coverage.	2017-11-26 09:54:09 +01:00
James Cole	f7b1168e7c	Code cleanup for scrutinizer.	2017-11-25 08:54:52 +01:00
James Cole	63d93968d0	Fix tests.	2017-11-15 15:30:15 +01:00
James Cole	0c1ff98c66	Remove reference to self.	2017-11-15 12:53:55 +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	aee17221eb	Code clean up.	2017-11-15 10:50:23 +01:00
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
James Cole	466ec92492	Remove some commented code.	2017-02-16 22:34:37 +01:00
James Cole	8f5289b7dc	Fixed some transaction list filter issues.	2017-02-15 21:55:50 +01:00
James Cole	395a7bb33c	This should fix the tests	2017-02-15 17:07:56 +01:00
James Cole	636b371b86	Fixes #553	2017-02-15 16:20:16 +01:00
James Cole	4c2d9e0eee	Small code cleanup.	2017-02-11 15:52:55 +01:00
James Cole	5e47492318	Clean up budget report partial	2017-02-11 10:05:58 +01:00
James Cole	aa2d78f36a	Expand filter	2017-02-11 09:34:04 +01:00
James Cole	3914796e4e	Experimental new transfer filter.	2017-02-10 17:21:44 +01:00
James Cole	dba92d73c4	Include new line at the end of the file.	2017-02-05 19:51:58 +01:00
James Cole	8a98204a69	Update app() calls	2017-02-05 16:16:15 +01:00
James Cole	2c786e6a38	Small fixes to collector because constructor is gone.	2017-01-30 17:09:44 +01:00
James Cole	c7341c9194	Also extend collector.	2017-01-30 16:57:00 +01:00
James Cole	be868d37f2	Fixed some issues with the monthly report and missing amounts.	2017-01-19 21:54:27 +01:00
James Cole	08ac27cccf	Fix some scrutiniser issues.	2017-01-14 19:43:33 +01:00
James Cole	a872cf7061	Renamed the other method.	2017-01-05 09:10:04 +01:00
James Cole	2d8ca363db	Gave method old name back.	2017-01-05 09:08:35 +01:00
James Cole	4241ae035e	Add two new “spentInPeriod” methods that use the collector and not big queries.	2017-01-05 09:07:04 +01:00
James Cole	dbebfe7c07	Remove unused method.	2017-01-05 08:32:31 +01:00
James Cole	c34fb7f037	Cleaned up the category and budget pie charts.	2017-01-03 17:02:17 +01:00
James Cole	27cd9fac8a	This fixes #513 [skip ci]	2017-01-02 08:07:28 +01:00
James Cole	a5036c86dc	Updated test database.	2016-12-30 13:47:23 +01:00
James Cole	ac86e75233	Updated various files for #506	2016-12-30 13:45:02 +01:00
James Cole	02bbdcc251	Fix reports and charts for #508	2016-12-30 08:41:48 +01:00
James Cole	a37f70947b	Various code cleanup.	2016-12-28 16:45:44 +01:00
James Cole	619500ca64	Various cod e clean up.	2016-12-28 13:02:56 +01:00
James Cole	94e51952f4	More fields for query.	2016-12-28 06:09:48 +01:00
James Cole	1aee3d8e2c	Various code cleanup	2016-12-27 20:52:00 +01:00
James Cole	f2f9f8fbab	Various bug fixes and extensions to test routine.	2016-12-25 11:50:42 +01:00
James Cole	8fb9577660	Add some debug, fix balance report bug.	2016-12-22 21:45:04 +01:00
James Cole	b6aa79bb38	Various code cleanup. Removed executable flags, added newlines.	2016-12-22 19:42:45 +01:00
James Cole	e247aace8d	Various code cleanup.	2016-12-15 17:16:46 +01:00
James Cole	848cfabcba	Rearrange code [skip ci]	2016-12-14 18:59:12 +01:00
James Cole	2ca584f097	Fix test.	2016-12-06 09:12:04 +01:00
James Cole	687da83feb	Remove unused collections [skip ci]	2016-12-06 09:09:05 +01:00
James Cole	628c7cd055	Many more route fixes.	2016-12-06 08:59:08 +01:00
James Cole	f4887bbbf7	More routes and pages fixed.	2016-12-06 08:15:53 +01:00
James Cole	6b56c2bf7c	Many new renamed routes that will break half of Firefly.	2016-12-05 21:58:23 +01:00
James Cole	d91b9e71d5	Remove unused code.	2016-12-05 20:44:20 +01:00
James Cole	344916d57e	Catch encrypted opposing accounts. [skip ci]	2016-12-05 20:39:17 +01:00
James Cole	f4b9b7ae84	Various report updates and code cleanup.	2016-12-04 18:02:19 +01:00
James Cole	b032825342	Building report from issue #386	2016-12-03 21:03:20 +01:00
James Cole	8377a2a0de	Building report from issue #386	2016-12-03 20:38:13 +01:00
James Cole	b33aa733c7	Fix some minor scrutinizer issues.	2016-11-28 20:38:03 +01:00
James Cole	d6c7ff0ccb	Chart for budget report will also include split journals.	2016-11-26 07:18:20 +01:00
James Cole	28f655dba1	This code makes sure the budget report also includes split expenses.	2016-11-26 07:09:02 +01:00
James Cole	8baea2feb9	Code for #385	2016-11-20 18:31:29 +01:00
James Cole	78f297e18f	Fixed some display bugs for split journals.	2016-11-20 14:17:16 +01:00
James Cole	9340ca09e6	Fixed #408	2016-11-20 12:08:43 +01:00
James Cole	94875adb6c	Various code cleanup.	2016-11-20 11:43:19 +01:00
James Cole	50b72cf229	More chart optimisations.	2016-11-19 13:37:44 +01:00
James Cole	ee6b72afa5	Fix some bugs related to cash accounts.	2016-11-19 12:57:35 +01:00
James Cole	781621960d	Make sure chart is displayed.	2016-11-19 09:26:32 +01:00
James Cole	e15ea04186	Join two charts, simpler code.	2016-11-19 07:27:54 +01:00
James Cole	750b9d8038	Reduce number of queries.	2016-11-12 21:06:48 +01:00
James Cole	6d60d64a82	Some extended code for the category report.	2016-11-12 06:48:38 +01:00
James Cole	5d4f1bc76d	First working example of category report. No content, just place holders. #396	2016-11-10 06:23:21 +01:00
James Cole	a08dfe1e3c	Add interface for journal collector.	2016-11-08 20:36:09 +01:00
James Cole	77e2cf40df	Removed more getJournals functions in favour of the collector.	2016-11-06 08:08:06 +01:00
James Cole	ee6e047596	Do not order the count query.	2016-11-05 18:55:09 +01:00
James Cole	962cad33e2	Code cleanup.	2016-11-05 18:43:18 +01:00
James Cole	1e2124c5ed	Moved more stuff to the journal collector.	2016-11-05 18:08:44 +01:00
James Cole	37435da459	Moved more stuff to the journal collector.	2016-11-05 17:47:50 +01:00
James Cole	13e1292bb7	Automated code cleanup [skip ci]	2016-11-05 11:47:21 +01:00
James Cole	43afdb021a	Move collecting journals to the collector.	2016-11-05 11:24:15 +01:00
James Cole	aeca2ef3b2	Move some code around	2016-11-05 10:42:31 +01:00
James Cole	46649fe228	Solved group thing.	2016-11-05 10:26:57 +01:00
James Cole	98160e9b63	Expand use of journal collector.	2016-11-05 08:46:55 +01:00
James Cole	9c5d192d90	Journal collector may not have been a bad idea after all!	2016-11-05 08:27:25 +01:00
James Cole	e24f5ec9f3	Multi year report move to AJAX. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-11-02 20:08:11 +01:00
James Cole	2ddd4314f1	Extend help pages.	2016-11-02 14:33:57 +01:00
James Cole	b980b5baea	Small optimisations. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-11-02 07:23:11 +01:00
James Cole	5be317d73c	sprintf ALL THE THINGS ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-11-02 07:04:14 +01:00
James Cole	124ecb1372	New budget table for multi year report. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-11-02 04:55:44 +01:00
James Cole	ed33a054ad	This update will make the help method fall back to the English content, if it is available.	2016-10-31 18:31:52 +01:00
James Cole	e2d187d74b	Various small bug fixes.	2016-10-24 18:01:15 +02:00
James Cole	48b0620629	New help thing.	2016-10-23 17:33:53 +02:00
James Cole	90f2e27f1f	Refactoring income and expense reports.	2016-10-09 09:32:12 +02:00
James Cole	a1f797c4d1	Moved a method around.	2016-10-08 16:04:05 +02:00
James Cole	d0c92a2244	Clean up account report helper.	2016-10-08 15:59:58 +02:00
James Cole	49af6522a8	Some code cleanup.	2016-10-07 05:44:21 +02:00
Sander Kleykens	5c239c91db	Convert raw XORs to a construct compatible with Laravel's query builder	2016-10-06 22:27:10 +02:00
James Cole	9920504232	Fixes #346	2016-10-06 05:26:38 +02:00
James Cole	b355c18e0c	Some code cleanup and copyright cleanup. [skip ci]	2016-10-05 06:52:15 +02:00
James Cole	bb7c26b77c	Some issues fixed for scrutiniser.	2016-09-25 08:20:17 +02:00
James Cole	5ca9099654	Some code fixes.	2016-09-17 09:50:40 +02:00
James Cole	d25d0454fc	Code clean up	2016-09-16 12:15:58 +02:00
James Cole	a9444ac702	Code cleanup. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-26 09:30:52 +02:00
James Cole	d0c6afc3a9	Various code clean up. [skip ci]	2016-08-26 08:21:31 +02:00
James Cole	a2e14f8b8d	Various code clean up. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-24 19:33:58 +02:00
James Cole	541d9ebdd9	Optimised some code.	2016-07-30 16:29:04 +02:00
James Cole	9ffc0936ee	Merge branch 'feature/new-csv-import' into develop ... # Conflicts: # app/Helpers/Csv/Importer.php	2016-06-23 12:15:19 +02:00
James Cole	8ee1676f0a	New migrations.	2016-06-18 07:36:15 +02:00
James Cole	6267930938	Work on new chart for year report.	2016-06-16 20:52:30 +02:00
James Cole	beda6ec3a9	Removed old CSV stuff.	2016-06-10 15:25:24 +02:00
James Cole	8da4abf655	Restore helpers (#262)	2016-06-06 09:22:20 +02:00
James Cole	288e713f94	Remove all code related to the CSV importer in preparation of #262 ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-05-22 20:18:16 +02:00
James Cole	f8eb1fa44a	Merge branch 'release/3.9.0' ... Signed-off-by: James Cole <thegrumpydictator@gmail.com> # Conflicts: # app/Helpers/Csv/Converter/BillName.php	2016-05-22 16:46:11 +02:00
James Cole	44960e8e42	Various last minute bug fixes.	2016-05-22 15:48:34 +02:00
James Cole	d54e264a91	Cannot create empty tags. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-05-20 15:09:25 +02:00
James Cole	0105456828	Copyright notices. [skip ci] ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-05-20 12:42:21 +02:00
James Cole	563ede822f	Copyright notices. [skip ci] ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-05-20 12:27:31 +02:00
James Cole	3c3a83330d	More moving stuff around.	2016-05-20 11:02:07 +02:00
James Cole	724f423692	Move some stuff around.	2016-05-20 09:45:24 +02:00
James Cole	65b8882ed4	Clean up repository.	2016-05-20 09:25:17 +02:00
James Cole	8c1ae76c7a	More tight report thing [skip ci]	2016-05-19 13:39:36 +02:00
James Cole	e23c6521b9	Add expenses. [skip ci]	2016-05-18 14:19:33 +02:00
James Cole	95b7da89f0	Some code cleanup.	2016-05-18 07:01:27 +02:00
James Cole	e113736887	Should fix issue #263	2016-05-17 12:45:31 +02:00
James Cole	5ab8cb38d3	Small change in report [skip ci]	2016-05-16 12:47:43 +02:00
James Cole	5a43e6cb9f	Better query for no budget. [skip ci]	2016-05-16 07:13:54 +02:00
James Cole	4effc95c5f	Fixed some report bugs.	2016-05-15 19:23:19 +02:00
James Cole	962965b5b7	Code cleanup.	2016-05-15 18:36:40 +02:00
James Cole	eedf6a07f0	Fixed the income report.	2016-05-15 17:46:53 +02:00
James Cole	6a750a998f	Remove category chart from report controller.	2016-05-15 16:13:05 +02:00
James Cole	bd818b2dea	Code clean up.	2016-05-15 15:39:22 +02:00
James Cole	4870945af2	Remove references to unused library.	2016-05-14 21:55:43 +02:00
James Cole	771926c779	No longer needed.	2016-05-14 14:02:37 +02:00
James Cole	863227c55c	Some refactoring.	2016-05-14 13:51:33 +02:00
James Cole	20e1e50032	Refactoring.	2016-05-13 15:53:39 +02:00