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,221 Commits 9 Branches 1,163 Tags
5ca9099654c192d67c740c5e132061f33aebadba
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 5ca9099654 Some code fixes. 2016-09-17 09:50:40 +02:00
James Cole 6e33e26ddf Update copyright notices, update German language. 2016-09-17 07:57:32 +02:00
James Cole 04461a4ab8 Updated composer.lock [skip ci] 2016-09-17 07:22:39 +02:00
James Cole a4b9bbff54 Update AdminLTE template. 2016-09-17 07:19:09 +02:00
James Cole 4ad4252a77 Extend exclude path. Trigger a new inspection. 2016-09-17 07:10:29 +02:00
James Cole aac0c9ab98 Various layout updates and tiny upgrade fixes [skip ci] 2016-09-16 13:29:56 +02:00
James Cole c123e1044a Expand config so people won't get errors here [skip ci] 2016-09-16 12:19:29 +02:00
James Cole d25d0454fc Code clean up 2016-09-16 12:15:58 +02:00
James Cole f38984398d Code clean up [skip ci] 2016-09-16 12:07:45 +02:00
James Cole a07799cfa4 MySQL 5.7 compatible query fixing. [skip ci] 2016-09-16 11:16:31 +02:00
James Cole 7c52f297ee MySQL 5.7 compatible query fixing. [skip ci] 2016-09-16 11:06:21 +02:00
James Cole 50a3279b30 MySQL 5.7 compatible query fixing. [skip ci] 2016-09-16 11:04:24 +02:00
James Cole 0ea14eb987 MySQL 5.7 compatible grouping. [skip ci] 2016-09-16 11:01:35 +02:00
James Cole cf1b98e569 MySQL 5.7 compatible grouping. 2016-09-16 10:55:26 +02:00
James Cole 63fb435002 Expand code. 2016-09-16 10:50:19 +02:00
James Cole 2f8263f53a Possible fix for reports [skip ci] 2016-09-16 09:36:08 +02:00
James Cole fb649779d6 Do not need to sort. Fix MySQL 5.7 compatibility. 2016-09-16 09:31:40 +02:00
James Cole bb58f605f7 Some new login / logout routes 2016-09-16 09:21:36 +02:00
James Cole fccdf56c5d Fixed some query things. 2016-09-16 09:09:54 +02:00
James Cole bd53410c71 Some changes in login routes for 5.3 2016-09-16 09:02:35 +02:00
James Cole 7d63f124c4 Fixing some login routes 2016-09-16 07:22:57 +02:00
James Cole 9ffc5d857c Fixed some db bugs. These will only pop up when developing. 2016-09-16 07:16:09 +02:00
James Cole 2f93784acd More code for 5.3 2016-09-16 07:05:34 +02:00
James Cole d00fbe4eb3 More code for 5.3 2016-09-16 06:48:38 +02:00
James Cole 51d9f041ae Changes for login routes. 2016-09-16 06:43:13 +02:00
James Cole b872ab8b86 New code and new routes for 5.3 2016-09-16 06:40:45 +02:00
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