IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-09-03 20:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,137 Commits 9 Branches 1,163 Tags
4c015e2d1253cde17fad3440fdd92b42dbe496c8
Commit Graph
4137 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
3.9.0 		2016-05-22 16:46:11 +02:00
James Cole afc794513f last minute composer update [skip ci] 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-05-22 16:43:47 +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 480e70dfac Sharper spent in period. [skip ci] 2016-05-20 18:30:48 +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 78afb771b1 Code cleanup [skip ci] 2016-05-20 17:58:10 +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