305 Commits

Author	SHA1	Message	Date
James Cole	0574a706c8	Error in decrypt error (yes)	2016-09-20 07:57:04 +02:00
James Cole	d25d0454fc	Code clean up	2016-09-16 12:15:58 +02:00
James Cole	f38984398d	Code clean up [skip ci]	2016-09-16 12:07:45 +02:00
James Cole	fccdf56c5d	Fixed some query things.	2016-09-16 09:09:54 +02:00
James Cole	e4fef6dfc3	Fixed an import bug where a new transaction validation rule would break storing of the transaction, while the import would not notice this error happening. The importer will now also correctly set a date on the "import tag" and will not tag an incomplete journal as already imported. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-11 08:08:01 +02:00
James Cole	629baf9de5	Added invoice date ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-10 18:36:52 +02:00
James Cole	176752e219	Code for optional fields #301 ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-09-09 11:19:40 +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	4c015e2d12	Re-arrange code. No changes.	2016-08-26 06:44:24 +02:00
James Cole	5aadb29905	Add some forgotten code to the mobile piggy bank controller things. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-24 20:06:45 +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	da5e48d769	More language lines. Add a check for double lines.	2016-08-14 09:10:47 +02:00
James Cole	bbed5d0701	First version of a web-based import status thing.	2016-08-13 21:51:01 +02:00
James Cole	2775690fc8	Extend model to allow for more data during the import.	2016-08-13 18:53:16 +02:00
James Cole	5c4d010bde	Code cleanup.	2016-08-12 15:10:03 +02:00
James Cole	0aaf9a6fda	Extend rule set for import.	2016-08-11 18:44:11 +02:00
James Cole	186b704509	Lots of new code to test the import routine. ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-08-11 10:21:32 +02:00
James Cole	7035600984	Add some logging for #283	2016-08-05 21:50:49 +02:00
James Cole	1392275b81	Lots of new code for importer and some preferences.	2016-07-24 18:47:55 +02:00
James Cole	162c762973	First set of data mappers.	2016-07-02 20:40:23 +02:00
James Cole	cbe3fb73a8	Catch decrypt exceptions.	2016-06-27 16:36:28 +02:00
James Cole	b947ff50ed	Fix chart thing.	2016-06-27 16:11:49 +02:00
James Cole	18d2741814	More code for the new CSV import	2016-06-27 15:15:46 +02:00
James Cole	3d201db6fc	More code for import.	2016-06-24 14:24:34 +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	fbf9e00208	Change preferences info.	2016-06-23 12:08:14 +02:00
James Cole	8ee1676f0a	New migrations.	2016-06-18 07:36:15 +02:00
James Cole	5a79bc0a99	Initial code base for new CSV import.	2016-06-10 21:00:00 +02:00
James Cole	5c7df5c04d	Copyright notices. [skip ci] ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-05-20 12:41:23 +02:00
James Cole	7dd858be39	Fix bugs.	2016-05-20 11:27:41 +02:00
James Cole	66d7fd7d4c	Declare strict types.	2016-05-20 08:57:45 +02:00
James Cole	dda3082c7e	Some code cleanup.	2016-05-20 08:00:35 +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	20e1e50032	Refactoring.	2016-05-13 15:53:39 +02:00
James Cole	aa59227786	Fixed transactions and attachments.	2016-05-13 09:55:06 +02:00
James Cole	7c39a04c4b	Cleanup.	2016-05-11 17:33:22 +02:00
James Cole	934656c954	Some small changes.	2016-05-11 07:57:16 +02:00
James Cole	d233a2df3c	Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop ... * 'develop' of https://github.com/JC5/firefly-iii: Should fix frontpage. # Conflicts: # app/Models/TransactionJournal.php # app/Repositories/Account/AccountRepository.php	2016-05-11 06:08:05 +02:00
James Cole	7c7740d3ba	Should fix frontpage.	2016-05-10 09:33:23 +02:00
James Cole	cda6cfb4cd	Fix more charts.	2016-05-09 20:15:26 +02:00
James Cole	27f5fe18df	Moving stuff around, optimising charts.	2016-05-06 10:32:26 +02:00
James Cole	6d944ec98f	More cleanup for budgets.	2016-05-06 06:15:46 +02:00
James Cole	dd8b500efd	These budget charts are the worst, I'm telling you.	2016-05-05 21:25:20 +02:00
James Cole	eb3d2b1749	Building split transactions and fixing tests.	2016-05-05 18:59:46 +02:00
James Cole	1fd7852309	Fix query thing.	2016-04-30 20:24:47 +02:00
James Cole	9baadd3793	Use other method of collecting query fields. #142	2016-04-29 21:52:15 +02:00
James Cole	42c3d1fa68	Expanding support for split transactions #142	2016-04-29 21:36:59 +02:00