Commit Graph

2404 Commits

Author SHA1 Message Date
James Cole
fa47eac9ff Removed "amount" attribute. This breaks half of Firefly III. 2016-03-02 11:52:52 +01:00
James Cole
bf4a7846dd Removed boolean for left join that was never called more than twice anyway. 2016-03-02 11:52:17 +01:00
James Cole
b0cc6dd714 - Removed php doc.
- Added book_date and rent_date as fillable fields.
2016-03-02 11:50:37 +01:00
James Cole
d6e2d8e4a2 Add some extra filters [skip ci] 2016-03-02 11:48:53 +01:00
James Cole
bbfc962727 Include tags in multi year report [skip ci] 2016-03-02 07:08:08 +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
James Cole
cf31049c51 Merge pull request #199 from roberthorlings/bugfix/import-amount-comma
Small bugfix
2016-02-25 16:20:28 +01:00
Robert Horlings
c624c4342f Small bugfix 2016-02-25 16:19:27 +01:00
James Cole
701d7baca8 #193 2016-02-25 15:17:24 +01:00
James Cole
8e45959483 #193 forgot to change file size thing. 2016-02-25 15:06:01 +01:00
James Cole
6858d67897 #193 2016-02-25 15:04:17 +01:00
James Cole
9b23cbd2c2 #193 2016-02-25 15:02:05 +01:00
Robert Horlings
ec1bb300e2 Small bugfix in AbnAmroImport specific 2016-02-25 14:54:06 +01:00
James Cole
69a8cad47b Attachment download (issue #193) 2016-02-25 14:53:26 +01:00
James Cole
a1f79e58db Include time in job. 2016-02-24 20:44:39 +01:00
James Cole
2cc5fdcf62 Include time and date for errors. 2016-02-24 20:42:05 +01:00
James Cole
91eb052c22 Use a job to send the error email instead of inline. #196 2016-02-24 20:13:55 +01:00
James Cole
ecefcfabc0 This is a partial fix for issue #151. It does not filter on account selection. 2016-02-24 17:37:08 +01:00
James Cole
8e42e71528 End of month... 2016-02-24 16:01:08 +01:00
James Cole
a2275ae111 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:
  Bugfix for a bug when adding a tag in a rule
  Bugfix in redirect after creating a new rule
2016-02-24 14:49:42 +01:00
James Cole
3976803d8f Same method of determining the applicable range as the "no category" view. Thanks to @roberthorlings in issue #151 2016-02-24 14:49:36 +01:00
Robert Horlings
1732acfee2 Bugfix for a bug when adding a tag in a rule 2016-02-24 14:06:11 +01:00
Robert Horlings
9ce9caba02 Bugfix in redirect after creating a new rule 2016-02-24 10:21:04 +01:00
James Cole
07f4995c8f First start of new report. 2016-02-23 20:23:10 +01:00
James Cole
8200c7248a Helper for help text. 2016-02-23 20:22:53 +01:00
James Cole
bd9f1d5398 Rename export date range in other forms. Makes the rule group runner by @roberthorlings more consistent. 2016-02-23 19:59:41 +01:00
James Cole
35863c8d3a This should fix the tests. 2016-02-23 17:55:56 +01:00
James Cole
f716692591 New route and method. Work in progress. 2016-02-23 16:15:53 +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
f2d06bcea1 Fix bread crumb 2016-02-23 16:03:05 +01:00
James Cole
4d1771614a Code reformat 2016-02-23 16:02:44 +01:00
James Cole
61efabb3b5 Added sub title 2016-02-23 16:02:37 +01:00
James Cole
b00458c2b9 Small code format thing. 2016-02-23 15:55:09 +01:00
James Cole
594f9822c7 Fix parameters, re-order. 2016-02-23 15:54:13 +01:00
Robert Horlings
59127e4029 Added button to specify parameters and execute the job 2016-02-23 14:18:09 +01:00
Robert Horlings
7edf70a77b Added missing imports for job 2016-02-23 14:17:41 +01:00
Robert Horlings
3fd90a37fb Merge branch 'develop' into feature/rules-on-existing-transactions 2016-02-23 13:17:07 +01:00
James Cole
ad8d945c1d Make sure all the users accounts are included so internal transfers are ignored. [skip ci] 2016-02-23 09:22:18 +01:00
James Cole
a3bf30a77b Remove file_get / file_put combi for #193 2016-02-23 09:12:21 +01:00
James Cole
3f829a3114 Restore original functionality. 2016-02-23 07:31:01 +01:00
James Cole
08b4c9ea5c Use export disk for zip file. 2016-02-23 07:27:29 +01:00
James Cole
6b00f5a97d Updated config file maker. 2016-02-23 07:07:14 +01:00
James Cole
d259df9a47 Fixed a small documentation bug. 2016-02-23 07:05:18 +01:00
James Cole
aeaebd082f Cleaned up upload collector. 2016-02-23 07:05:08 +01:00
James Cole
0c9c0f2032 Simplified the attachment collector. 2016-02-23 06:54:51 +01:00
James Cole
155801ab2b Some extra logging. 2016-02-23 06:54:16 +01:00
James Cole
deeeb06488 Added debug info to the export routine. 2016-02-23 06:39:01 +01:00