kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity
4,215 Commits 4 Branches 762 Tags
c123e1044ab05091a4d684c474f9d12e2dac2468
Commit Graph

4215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ca2301959c Merge pull request #298 from Bonno/develop 
Fixed wrong conversion to revenue account
 2016-08-29 14:49:46 +02:00
Bonno Nachtegaal-Karels
3285fae7f0 Fixed wrong conversion to revenue account 2016-08-29 14:39:43 +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