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,091 Commits 9 Branches 1,163 Tags
efe9933721a6c0fdb3d6574659962c65724aee11
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole efe9933721 Import storage routine is creating the first transaction journals. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-11 08:00:02 +02:00
James Cole 200366f5be Extended the validator and created more code to handle exceptions. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-10 18:49:16 +02:00
James Cole c9bd72337d Some notes on the import process. 2016-08-06 09:31:32 +02:00
James Cole d4510440b8 Split the importer and the setup routine. 2016-08-06 06:28:21 +02:00
James Cole 5a9cf698f7 Configuration for import routine. 2016-08-06 06:21:46 +02:00
James Cole 5826fec519 Some new import stuff. 2016-08-06 06:21:25 +02:00
James Cole 7035600984 Add some logging for #283 2016-08-05 21:50:49 +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 bcfe2c6410 Fixes #284 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-05 18:52:16 +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 d870e0f42e Fix split query. 2016-08-02 19:42:41 +02:00
James Cole 0db9852769 This should fix a bug in split expenses. 2016-08-02 19:12:18 +02:00
James Cole 7e3f9048fe Fixed some fields in split thing. 2016-08-01 20:14:23 +02:00
James Cole 1ba88f182b Various CSV bugs and a config bug fixed. 2016-07-31 17:17:45 +02:00
James Cole c8f5a6b7ad Ignore deleted columns. 2016-07-30 20:04:24 +02:00
James Cole d26bbf3cdc Handling import values. This is a dead end but it seemed a good idea. 2016-07-30 19:09:58 +02:00
James Cole 0de72b6914 Ignore result.html 2016-07-30 16:29:49 +02:00
James Cole e41c89bd59 Does not belong. 2016-07-30 16:29:17 +02:00
James Cole 541d9ebdd9 Optimised some code. 2016-07-30 16:29:04 +02:00
James Cole 1e724712e0 Bug fix in converter 2016-07-29 21:42:12 +02:00
James Cole 3682467ae3 Each CSV converter can set the certainty of their conversion. 2016-07-29 21:40:58 +02:00
James Cole 7707c81b2d Each CSV converter can set the certainty of their conversion. 2016-07-29 21:29:46 +02:00
James Cole e434de72a3 Expand fields. 2016-07-26 20:40:46 +02:00
James Cole ce191fa6d3 Fix split deposit. 2016-07-26 20:26:46 +02:00
James Cole 90865a5284 Fix recursive. 2016-07-24 19:24:02 +02:00
James Cole 684f6e0b5c Don't need these. 2016-07-24 19:07:47 +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 a4a723cfc6 Fixed import error. 2016-07-20 15:57:42 +02:00
James Cole 921e2c06f4 Beta warning for import thing. 2016-07-20 15:47:30 +02:00
James Cole cb9433f4b9 This should fix #280 2016-07-17 08:50:22 +02:00
James Cole 1be6af820e No map for tags. 2016-07-17 08:35:04 +02:00
James Cole 3b686b6d1c New but empty converters. 2016-07-16 08:25:39 +02:00
James Cole 697566fe42 New importers. 2016-07-16 07:58:25 +02:00
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
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 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