IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-02 13:39:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,828 Commits 6 Branches 450 Tags 764 MiB
baff9780de
Commit Graph

382 Commits

Author SHA1 Message Date
James Cole
3ef84dc1fc Cleanup and fix tests. 2016-03-02 13:13:33 +01:00
James Cole
4c35d52234 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop 
# By Robert Horlings
# Via James Cole (2) and Robert Horlings (1)
* 'develop' of https://github.com/JC5/firefly-iii:
  Small bugfix
  Small bugfix in AbnAmroImport specific
 2016-03-01 21:31:42 +01:00
James Cole
01be5e3e23 Tag report. 2016-03-01 21:31:25 +01:00
James Cole
46dc4102e0 Merge pull request #200 from roberthorlings/develop 
Small improvement in AbnAmroImport specific
 2016-02-25 16:24:57 +01:00
Robert Horlings
c624c4342f Small bugfix 2016-02-25 16:19:27 +01:00
Robert Horlings
ec1bb300e2 Small bugfix in AbnAmroImport specific 2016-02-25 14:54:06 +01:00
James Cole
6387114a18 New method to access files. 2016-02-23 16:15:37 +01:00
James Cole
28a4f724d5 Use Requests library to get help from Github. 2016-02-23 16:12:59 +01:00
James Cole
a3bf30a77b Remove file_get / file_put combi for #193 2016-02-23 09:12:21 +01:00
James Cole
cd66d2c7b0 Return 0 amount. [skip ci] 2016-02-18 10:06:34 +01:00
James Cole
f0f47530bf PHP7 type declarations. 2016-02-18 10:04:26 +01:00
James Cole
e7be4e3e49 PHP7 compatible type hinting [skip ci] 2016-02-18 07:21:48 +01:00
James Cole
f7d06b9759 Some more code cleanup. 2016-02-17 21:59:47 +01:00
James Cole
a178fed0c6 Code cleanup courtesy of Scrutiniser CI. 2016-02-17 21:55:00 +01:00
James Cole
b1c2f8faa1 Various code cleaning things. 2016-02-17 21:14:32 +01:00
James Cole
2ef1c54417 Code cleanup. [skip ci] 2016-02-17 17:19:57 +01:00
Robert Horlings
732e181312 Bugfix in parsing specific descriptions 2016-02-17 16:59:56 +01:00
James Cole
17dad27610 Catch type error. 2016-02-16 18:39:03 +01:00
James Cole
ee960d76c7 Possible fix for attachment helper 2016-02-16 13:30:50 +01:00
James Cole
dfb595193a Possible fix for attachment helper 2016-02-16 13:28:55 +01:00
James Cole
0a91a40c1b Merge branch 'develop' of github.com:JC5/firefly-iii into develop 2016-02-16 13:25:48 +01:00
James Cole
12f4305691 Possible fix for attachment helper 2016-02-16 13:25:03 +01:00
Robert Horlings
28d880a7c4 Ignoring eclipse specific files 2016-02-15 14:50:10 +01:00
James Cole
693ff3cc66 Various fixes. 2016-02-13 13:13:22 +01:00
James Cole
2e15f1e2a3 Removed todo comments. 2016-02-12 04:59:14 +01:00
James Cole
3dab683a45 New asset account number handler. For issue #107 2016-02-11 08:12:10 +01:00
James Cole
4cd7976f63 Changes to the CSV importer because I ran into small bugs. 2016-02-11 08:11:12 +01:00
James Cole
4658ef9918 Fix PHP7 related strict type check. 2016-02-11 07:02:27 +01:00
James Cole
2b6a1c9cb1 Fixes a bug in the CSV importer. 2016-02-11 06:49:39 +01:00
James Cole
2f278c8618 Just a test commit [skip ci] 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-02-08 21:10:33 +01:00
James Cole
9f29a2e04f Fixed something in the reports. 2016-02-08 20:59:09 +01:00
James Cole
ff5bf0c6e5 Opening balance does not count as an income or as an expense. It's just there. 2016-02-08 20:42:31 +01:00
James Cole
0eb8c2b7ba Make sure account has a start and end balance. 2016-02-08 20:40:47 +01:00
James Cole
9429d84cf8 Some code cleanup [skip ci] 2016-02-07 07:56:58 +01:00
James Cole
8fb3348a7c Added some (yet without function) information icons. [skip ci] [skip Scrutinizer] 2016-02-06 20:17:55 +01:00
James Cole
388d141d82 Fix for #172 2016-02-06 04:32:30 +01:00
James Cole
9465a6d2b5 This PHP7 thing is strict! 2016-02-05 19:57:17 +01:00
James Cole
c3f78b698d This PHP7 thing is strict! 2016-02-05 19:56:25 +01:00
James Cole
a4e699f781 Fix another php7 bug. 2016-02-05 19:54:25 +01:00
James Cole
df918e8529 Fixed all problems related to strict types. 2016-02-05 13:09:18 +01:00
James Cole
aa1193a9eb Fixed all problems related to strict types. 2016-02-05 12:28:05 +01:00
James Cole
8f7f263a48 Declare strict type. 2016-02-05 12:08:25 +01:00
James Cole
78bcd3e1bb Changed a lot of parameters. 2016-02-05 09:25:15 +01:00
James Cole
554640c345 These are the first commits that make FF require php 7. 2016-02-05 08:03:26 +01:00
James Cole
151e8e8f17 Experimenting with a negation for #159 2016-02-04 08:56:33 +01:00
James Cole
23f474b003 Don't add inactive unhit bills, see #159 2016-02-04 08:55:06 +01:00
James Cole
15104de84c This should clean up the monthly report a bit. See issue #159 2016-02-04 08:53:56 +01:00
James Cole
7343304284 Code cleanup. 2016-02-04 07:28:39 +01:00
James Cole
c1ecc62ac1 Replaced Session::get() with session() 2016-02-04 07:27:03 +01:00
James Cole
bd40615f8e Code cleanup. 2016-02-04 07:23:14 +01:00
James Cole
a818ab0942 Fixes #110 2016-01-30 09:41:48 +01:00
James Cole
a5ac713310 Importer will now fire custom rules. 2016-01-30 07:36:22 +01:00
James Cole
f50058e3c2 Renamed fiscal year start and end variable. 2016-01-29 17:13:54 +01:00
James Cole
ce9445168c Move the start and end date for the fiscal date ranges to fiscal-start and fiscal-end respectively. 2016-01-29 17:09:23 +01:00
James Cole
27b8b4b35a Use the fiscal helper's interface instead of the fiscal helper itself. 2016-01-29 17:08:06 +01:00
James Cole
168ed5ac56 Renamed some stuff, courtesy of sensiolabs. 2016-01-28 21:50:20 +01:00
James Cole
3d69dc786d Some minor code cleanup. 2016-01-27 21:52:21 +01:00
James Cole
57a3f20c13 Moved more code around. 2016-01-27 21:35:59 +01:00
James Cole
b019962f34 Moved a method. 2016-01-27 20:54:14 +01:00
James Cole
5c59c819b6 Moved method to new helper. 2016-01-27 20:48:35 +01:00
James Cole
390cace775 New account report helper to make the report helper a lot lighter. 2016-01-27 20:45:05 +01:00
James Cole
9155c13e08 A set of small fixes, courtesy of scrutinizer-ci 2016-01-27 18:31:44 +01:00
Graham Miller
5ee8d04800 Added modifications to reports enabling the custom fiscal year changes. 2016-01-27 13:38:34 +10:00
Graham Miller
eb31934fb7 Add a new helper to handle fiscal issues. 
Used initially to provide fiscal year support to the reports.
 2016-01-27 11:54:04 +10:00
James Cole
7b040e8583 Some changes to test coverage. 2016-01-22 21:08:04 +01:00
James Cole
9ce960b3d7 There are no converters that need the role of the current field. 2016-01-21 09:52:45 +01:00
James Cole
d211555beb Only fire post-processing specifix in the import routine. See issue #145 2016-01-20 21:24:27 +01:00
James Cole
9350557d10 Properly extend the current specifix to indicate they're all post-processors. See issue #145 2016-01-20 21:24:08 +01:00
James Cole
ea6c54cad0 Expand specifix to have a property that determines whether they fire before anything happens, or after. Could be expanded to allow for even more fine-grained control. See issue #145 2016-01-20 21:23:39 +01:00
James Cole
f3fff6f1c5 Code rearrangement. 2016-01-19 13:59:54 +01:00
James Cole
26fb03e6c8 Reformatted code according to scrutinizer-ci. 2016-01-19 09:11:15 +01:00
James Cole
eed3d021d9 Small cleanup. 2016-01-19 08:48:38 +01:00
Robert Horlings
10ea60daaf Improved SEPA description parsing 2016-01-18 15:42:56 +01:00
Robert Horlings
bd5d73d1e6 Removed transaction type from the description 2016-01-18 12:37:06 +01:00
Robert Horlings
cc712b0c75 Updated message identifier for unknown opposing account 2016-01-18 12:31:45 +01:00
Robert Horlings
a5ac84e1b9 Merge remote-tracking branch 'origin/develop' into feature/abn-amro-import-specifix 2016-01-18 09:09:35 +01:00
Robert Horlings
cbe1f762ca Fixing a bug with expense account being set to unknown 2016-01-18 09:09:30 +01:00
Robert Horlings
4909fcc8b4 Moved parsing of amount with decimal separator to Converter object 2016-01-17 15:37:49 +01:00
Robert Horlings
323c16ebe1 Implemented additional ABNAMRO description formats 2016-01-17 15:25:47 +01:00
James Cole
e834489206 Some cleaning up courtesy of PHPStorm. 2016-01-16 07:14:36 +01:00
James Cole
7bf75128a8 Some cleaning up courtesy of PHPStorm. 2016-01-15 23:12:52 +01:00
James Cole
7cb86add64 New phpdoc. 2016-01-15 22:13:38 +01:00
James Cole
fbc9720f7a Clean up some report methods. 2016-01-15 21:50:57 +01:00
James Cole
f69be86c74 Some code cleanup courtesy of PHPStorm. 2016-01-15 17:53:54 +01:00
Robert Horlings
2ff806dedc Initial version of ABN AMRO import specifix with amount correction and SEPA description parser 2016-01-15 16:48:09 +01:00
Robert Horlings
61a703e605 Implemented option to choose field delimiter in CSV import 2016-01-15 15:24:07 +01:00
James Cole
af29b31ea8 Remove "created by" message. 2016-01-09 15:38:48 +01:00
James Cole
e094871bc9 Merge branch 'release/3.6.1' into develop 
Conflicts:
	composer.lock
 2016-01-09 14:31:52 +01:00
James Cole
cf5cc626d7 Important bug fix. 2016-01-09 14:27:35 +01:00
James Cole
2980860377 Did some code cleanup. Comments and headers mostly. 2016-01-09 08:20:55 +01:00
James Cole
5eb0e18cae Cleaning up 2016-01-01 21:15:03 +01:00
James Cole
27cabb398e More queries filtered. 2016-01-01 21:07:15 +01:00
James Cole
64dbb14241 Method no longer used. 2016-01-01 20:05:14 +01:00
James Cole
bb4e2be9eb Method no longer used. 2016-01-01 20:04:44 +01:00
James Cole
59731878f6 Month report optimised. 2016-01-01 19:46:12 +01:00
James Cole
54ede8aa18 Code cleanup. 2016-01-01 13:54:23 +01:00
James Cole
b415b6b043 Some code cleanup. 2016-01-01 12:41:00 +01:00
James Cole
70c922cdc5 Code cleanup. 2016-01-01 11:32:08 +01:00
James Cole
068fc32cb2 Some query cleaning up. 2015-12-31 20:12:49 +01:00
James Cole
25747fbcf2 And optimised another chart. Amounts are slightly different. Will investigate 2015-12-31 08:31:28 +01:00