kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity
4,492 Commits 4 Branches 771 Tags
b1244ffa015b86129ae0fa0c7482cd7e059ce990
Commit Graph

4492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
5379e03447 Merge pull request #311 from sandermulders/fix/nullable-values 
add migration that correctly sets nullable for description fields on rules and rule_groups
 2016-09-12 16:52:14 +02:00
Sander Mulders
539058e32d Fix for #310: add migration that correctly sets nullable for description fields on rules and rule_groups 2016-09-12 14:24:01 +02:00
James Cole
11b6b5a63c Merge branch 'release/3.10.3' into develop 2016-09-11 08:17:42 +02:00
James Cole
1155096226 Merge branch 'release/3.10.3' 3.10.3 2016-09-11 08:17:41 +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
fa110279de Merge branch 'release/3.10.2' 3.10.2 2016-08-29 19:32:49 +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