4050 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	5130ba7ea4	Working IBAN account import thing.	2016-07-15 22:37:47 +02:00
James Cole	c9e46a4dd1	Lots of import related code.	2016-07-15 22:26:08 +02:00
James Cole	f5b3dc36e3	Fix view.	2016-07-05 09:02:01 +02:00
James Cole	f1e8d1cf1e	Show bill average.	2016-07-05 08:57:45 +02:00
James Cole	e8e7ab01d2	Merge branch 'develop' of github.com:JC5/firefly-iii into develop	2016-07-04 12:38:22 +02:00
James Cole	9244994233	Fix bug that would report wrong file size to browser.	2016-07-04 12:37:33 +02:00
James Cole	ae768a8525	Works up until actual import.	2016-07-02 23:08:47 +02:00
James Cole	162c762973	First set of data mappers.	2016-07-02 20:40:23 +02:00
James Cole	57b5981904	Fix #266 for period-chart.	2016-07-02 17:42:27 +02:00
James Cole	275d19e71d	Fix #266 for all-chart.	2016-07-02 17:39:58 +02:00
James Cole	189b11befa	Extra page number check for issue #276	2016-07-02 17:36:46 +02:00
James Cole	a56a5fc228	New code for import routine.	2016-07-02 17:33:57 +02:00
James Cole	cbe3fb73a8	Catch decrypt exceptions.	2016-06-27 16:36:28 +02:00
James Cole	3d58fbebec	Should not have committed this.	2016-06-27 16:25:17 +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	93a54780ab	Fixes a bug in the 2FA activation thing.	2016-06-24 21:58:57 +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	2c826451d1	Fix delete routine and some NULLs	2016-06-23 12:07:31 +02:00
James Cole	617a5c0606	Fix date range.	2016-06-23 08:01:15 +02:00
James Cole	8331a7e34a	Rename stuff.	2016-06-18 07:37:12 +02:00
James Cole	8ee1676f0a	New migrations.	2016-06-18 07:36:15 +02:00
James Cole	5dc8620c43	More new migrations.	2016-06-17 14:06:38 +02:00
James Cole	d2733a4df0	First attempt at rewriting all migrations.	2016-06-17 06:03:42 +02:00
James Cole	ae649223d8	Mobile add money to piggy routine	2016-06-16 20:52:59 +02:00
James Cole	6267930938	Work on new chart for year report.	2016-06-16 20:52:30 +02:00
James Cole	bdee8cde77	This fixes #273	2016-06-16 08:04:22 +02:00
James Cole	e63f216905	Fix small bug in reorder routine.	2016-06-15 09:58:33 +02:00
James Cole	ec18165698	Fixed #267	2016-06-11 07:38:30 +02:00
James Cole	307e6a2337	Renamed fields #267	2016-06-11 06:36:46 +02:00
James Cole	b80d8cf774	Move date picker stuff to new method.	2016-06-11 06:33:51 +02:00
James Cole	7a5ef6013a	Fix #271	2016-06-11 06:31:56 +02:00
James Cole	13b92c47d9	Translations and fixes.	2016-06-11 06:31:40 +02:00
James Cole	5a79bc0a99	Initial code base for new CSV import.	2016-06-10 21:00:00 +02:00
James Cole	beda6ec3a9	Removed old CSV stuff.	2016-06-10 15:25:24 +02:00
James Cole	c619b8730b	Implemented #264	2016-06-07 12:22:46 +02:00
James Cole	c14ec8b006	New change log.	2016-06-07 12:22:30 +02:00
James Cole	08ff08685c	Small updates for 3.9.1	2016-06-06 20:25:01 +02:00
James Cole	8091dbfdfa	Restore views (#262)	2016-06-06 09:28:35 +02:00
James Cole	8dc106b79a	Restore config (#262)	2016-06-06 09:28:25 +02:00
James Cole	7527433738	Restore provider (#262)	2016-06-06 09:25:29 +02:00
James Cole	1502e08a7a	Restore routes (#262)	2016-06-06 09:24:51 +02:00
James Cole	c9679f1d4f	Restore bread crumbs (#262)	2016-06-06 09:23:55 +02:00
James Cole	6b976dd6b9	Restore controller (#262)	2016-06-06 09:22:28 +02:00
James Cole	8da4abf655	Restore helpers (#262)	2016-06-06 09:22:20 +02:00
James Cole	2e26193333	This should fix #266	2016-05-24 16:08:43 +02:00
James Cole	ada43bc0dd	Fix #265	2016-05-24 11:28:24 +02:00
James Cole	a447c886c4	Basic for for #262 ... Signed-off-by: James Cole <thegrumpydictator@gmail.com>	2016-05-22 21:11:30 +02:00