IntenseFinance/firefly-iii
3
0 Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-10-13 17:02:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,195 Commits 12 Branches 1,280 Tags
3d25fd79ca55c24530d97fba7355cb0693a4b343
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 3d25fd79ca First set of upgrade to 5.3 stuff. 2016-09-16 06:19:40 +02:00
James Cole 3aad78e6ef Lots of updated libraries. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-15 19:14:55 +02:00
James Cole 7d5bb72b0c Fix for #312 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-15 19:14:22 +02:00
James Cole 46e5aae8bb Fix changelog. [skip ci] 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-15 19:00:22 +02:00
James Cole c1a2892788 New changelog. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-14 20:40:12 +02:00
James Cole 2078183e0d Update version and composer file. 2016-09-14 20:37:12 +02:00
James Cole fab1d53714 Simplified upgrade instructions. 2016-09-14 20:35:45 +02:00
James Cole 3fe831c7d8 Bit of code cleanup courtesy of PHPStorm. 2016-09-13 19:20:09 +02:00
James Cole 6958f71cfd @fuf discovered a bug where FF3 will fall back to the hard-coded system default currency and not the set default currency. See #307 2016-09-13 19:19:58 +02:00
James Cole a7351f348d Fixed a bug mentioned by @vissert and added some logging for @sandermulders 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-12 18:43:10 +02:00
James Cole 11b6b5a63c Merge branch 'release/3.10.3' into develop 2016-09-11 08:17:42 +02:00
James Cole 2920dd356e Updated translations. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-11 08:17:35 +02:00
James Cole 9c3dac8170 Config for new version. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-11 08:13:22 +02:00
James Cole 49f9909b15 New changelog. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-11 08:13:14 +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 2da087401e Extend audit report 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-10 18:37:16 +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 29a930dae5 Updated translations. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-09 11:36:19 +02:00
James Cole d920537dd2 Updated translations. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-09 11:29:19 +02:00
James Cole 106b04a5da Update composer.lock [skip ci] 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-09 11:19:50 +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 8d19f60091 Various translation updates. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-09 11:19:19 +02:00
James Cole e937aa2f74 Fix a bug in piggy bank display [skip ci] 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-09 06:17:50 +02:00
James Cole c3ccc4ccdf This should fix #308 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-08 21:10:24 +02:00
James Cole 6c5cd705c0 Some code for new optional fields, see #301 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-04 16:21:51 +02:00
James Cole ce003f217b Removed unused "budget maximum" preference 2016-09-03 21:13:08 +02:00
James Cole 8c7ef49eb6 New code by @vissert that allows category edit (see #282) 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-03 05:01:48 +02:00
James Cole 29af4bd1b9 This fixes #303 2016-09-03 04:54:57 +02:00
James Cole 2ce5142b06 Small fix for #303 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-01 19:01:08 +02:00
James Cole f3a8a25872 Fixed #303 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-09-01 18:31:39 +02:00
James Cole 598e97d028 Forgot to escape things, which causes havoc in the Dutch translation. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-31 18:50:46 +02:00
James Cole 8fdeaf73cc Update composer.lock [skip ci] 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-29 19:32:03 +02:00
James Cole a7ffdf062a Update changelog. [skip ci] 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-29 19:26:31 +02:00
James Cole 3bad92dd6d Upgrade instructions and new version. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-29 19:25:21 +02:00
James Cole 2e88024bca Close #290 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-29 19:21:40 +02:00
James Cole 312079657b Include files from new import routine in export routine. 2016-08-28 07:05:42 +02:00
James Cole 18c183afd6 Remove form tags in favour of raw html. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-27 09:38:58 +02:00
James Cole f424d9cf20 Update change log 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-27 04:37:04 +02:00
James Cole 5c3da9fd9e New language files. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-27 04:34:59 +02:00
James Cole 1f321fadd4 Removed some form-tags in favour of plain HTML 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-27 04:18:02 +02:00
James Cole 65f5d27b12 New pages for administration. More settings will be web-based. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-27 04:00:48 +02:00
James Cole cdb591de7f Remove unnecessary setting. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-27 04:00:19 +02:00
James Cole a0ea3882e1 Various code cleanup. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-27 03:50:35 +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 e7a0a5937c Extend git ignore. [skip ci] 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-26 07:41:13 +02:00
James Cole 08992b5298 Extend test-import data set to contain some rules. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-26 07:38:00 +02:00
James Cole 6490a4240d Remove references to ImportResult. Add the application of user rules. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-26 07:37:47 +02:00
James Cole 43a7544dd7 Catch empty (null) descriptions. Which never happens. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-26 07:37:27 +02:00
James Cole 0fe70dae17 Referring to Auth::user will not work from the command line. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-26 07:37:09 +02:00
James Cole 7079e76886 Remove some commented code. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-26 07:36:33 +02:00
James Cole 0ec021c375 No need to grab journals we don't need. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-26 07:36:26 +02:00
James Cole ff3396e286 Removed the ImportResult class because it was lame. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-26 07:36:13 +02:00
James Cole 78912903ce Change signature of importstorage. 2016-08-26 06:47:12 +02:00
James Cole 4c015e2d12 Re-arrange code. No changes. 2016-08-26 06:44:24 +02:00
James Cole 172634a55a Add some comments. 2016-08-26 06:43:38 +02:00
James Cole 58ca7d551a Rename import procedure method name 2016-08-26 06:43:23 +02:00
James Cole fd8ed4c9aa Fixed a bug in strict typing. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-25 19:19:12 +02:00
James Cole 6775fc58c8 Change log and updated config. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-25 11:20:13 +02:00
James Cole 9f250fc61b Renamed migration. 2016-08-25 11:16:17 +02:00
James Cole 94609f1419 Clean up some code. 2016-08-25 06:44:48 +02:00
James Cole 53402aa5e2 Update composer file. 2016-08-25 06:44:41 +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 d4f8c41d80 This should fix a bug in the verification routine. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-08-24 19:36:09 +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 98c4ac955a Finetune user feedback during import and add a tag to collect transactions. 2016-08-14 11:31:09 +02:00
James Cole 70b63e1736 Better report for finished import. 2016-08-14 10:11:49 +02:00
James Cole 106665a468 Better reporting for double imported rows. See also #164 2016-08-14 09:49:04 +02:00
James Cole da5e48d769 More language lines. Add a check for double lines. 2016-08-14 09:10:47 +02:00
James Cole 85f484e73c Divide by zero. 2016-08-14 09:10:08 +02:00
James Cole d287ae97f8 Prep for translations in JS. 2016-08-14 08:34:59 +02:00
James Cole 117bb602dc Extend ImportObject with row hash. 2016-08-14 08:34:51 +02:00
James Cole e440d55034 Finetune import status page. 2016-08-14 08:10:42 +02:00
James Cole 7f5b94fe43 Fixed a bug in the verify routine. 2016-08-13 23:31:42 +02:00
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 2775690fc8 Extend model to allow for more data during the import. 2016-08-13 18:53:16 +02:00
James Cole 1fd9f6e724 First user interface elements and routes for web import. 2016-08-13 16:38:58 +02:00
James Cole 3d63903128 Make sure import errors end up where the user can read them. 2016-08-13 16:29:24 +02:00
James Cole ef876a165a Some better feedback in the import process. 2016-08-13 14:22:40 +02:00
James Cole c4d6aaeef3 Extend scrutinizer config. 2016-08-12 16:06:27 +02:00
James Cole 37b735c2e3 Remove code climate config 2016-08-12 16:06:17 +02:00
James Cole 62d30c7b0e Fix migration (call to empty table name) 2016-08-12 16:06:11 +02:00
James Cole 99b3e24836 Code optimalization 2016-08-12 15:50:52 +02:00
James Cole ffb699cb06 Clean up code. 2016-08-12 15:34:15 +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 955306d877 Remove travis file and fix NULL error in sqlite. 2016-08-12 14:50:25 +02:00
James Cole 015935ed55 Implemented ABN Amro specific import code. 2016-08-12 12:55:52 +02:00
James Cole 48f4cceb19 Mention new version. 2016-08-12 10:47:09 +02:00
James Cole 9850220aac Add new languages. 2016-08-12 10:46:22 +02:00
James Cole c4ac1460f0 Expanded translations 2016-08-12 10:44:27 +02:00
James Cole b9e1e01337 New translations. 2016-08-12 10:34:45 +02:00
James Cole 76649cb7de Extended views and language. 2016-08-12 10:07:53 +02:00
James Cole 5e310776b4 New change log 2016-08-12 09:50:54 +02:00
James Cole 4d7fa11172 Upgrade instructions for 3.10 2016-08-12 09:35:09 +02:00
James Cole 28962007c1 More code for new importer 2016-08-12 09:27:09 +02:00
James Cole 2111873bcf Fixed a bug in tag creation. 2016-08-11 19:01:23 +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