| 
							
							
								 James Cole | c58eea6654 | Fine-tuning the import routine. | 2016-08-13 23:28:01 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | bbed5d0701 | First version of a web-based import status thing. | 2016-08-13 21:51:01 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 2947ec0002 | Small optimisations. | 2016-08-12 15:27:44 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 5c4d010bde | Code cleanup. | 2016-08-12 15:10:03 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 76649cb7de | Extended views and language. | 2016-08-12 10:07:53 +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 | 5826fec519 | Some new import stuff. | 2016-08-06 06:21:25 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 47376f1f35 | Fix a problem mentioned in issue #283 Signed-off-by: James Cole <thegrumpydictator@gmail.com> | 2016-08-05 19:29:44 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 09d63b584d | Save old data; bread crumbs | 2016-08-04 06:14:08 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 5f5469a7d4 | Moved some files around. | 2016-08-04 06:10:30 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 38800d61b0 | New user related code. | 2016-08-04 06:07:53 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 1186e95c51 | Admin view will show some IP addresses. Signed-off-by: James Cole <thegrumpydictator@gmail.com> | 2016-08-03 20:57:01 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 0db9852769 | This should fix a bug in split expenses. | 2016-08-02 19:12:18 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 541d9ebdd9 | Optimised some code. | 2016-07-30 16:29:04 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | c287bc139c | Check new list. | 2016-07-24 18:51:39 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 1392275b81 | Lots of new code for importer and some preferences. | 2016-07-24 18:47:55 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 87c0f1d86e | More CSV related updates. | 2016-07-23 21:37:06 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | cb9433f4b9 | This should fix #280 | 2016-07-17 08:50:22 +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 | 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 | 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 | 2c826451d1 | Fix delete routine and some NULLs | 2016-06-23 12:07:31 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 8ee1676f0a | New migrations. | 2016-06-18 07:36:15 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | ae649223d8 | Mobile add money to piggy routine | 2016-06-16 20:52:59 +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 | 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 | 6b976dd6b9 | Restore controller (#262) | 2016-06-06 09:22:28 +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 |  | 
			
				
					| 
							
							
								 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 | 7e6d3c9d6b | Various last minute bug fixes. Signed-off-by: James Cole <thegrumpydictator@gmail.com> | 2016-05-22 16:38:32 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 44960e8e42 | Various last minute bug fixes. | 2016-05-22 15:48:34 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 41430c3bb2 | Same bug, another line. | 2016-05-22 09:08:37 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 2f435019e0 | Fix bug. | 2016-05-22 09:04:16 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | c4818334e7 | Sharper spent in period. [skip ci] | 2016-05-20 18:29:51 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | a5d5f86aed | Some code cleanup and a better chart [skip ci] | 2016-05-20 18:26:43 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | a74a646777 | Code cleanup. Moving closer to new release. | 2016-05-20 17:53:03 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 87f9ca3bb2 | Removed some old configuration values. | 2016-05-20 17:28:07 +02:00 |  |