IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-11 05:24:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,428 Commits 9 Branches 1,129 Tags
a2275ae111de01866cff920f9e90cc2c18793c47
Commit Graph
2383 Commits
Author SHA1 Message Date
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
Robert Horlings a4d7bf4ebe Implemented job to execute rulegroup on existing transactions 2016-02-18 20:15:50 +01:00
Robert Horlings 50e5c21735 Moved JournalCollector to other package to encourage reuse 2016-02-18 20:01:53 +01:00
James Cole 2ddacf48d4 Removed unused parameter and added caching. [skip ci] 2016-02-18 10:12:07 +01:00
James Cole cd66d2c7b0 Return 0 amount. [skip ci] 2016-02-18 10:06:34 +01:00
James Cole 2e7c26c539 New chart called "net worth". 2016-02-18 10:04:53 +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 31d6789ff0 Type hinting. 2016-02-18 06:54:50 +01:00
James Cole bdcb7372a5 More phpdoc. 2016-02-18 06:45:10 +01:00
James Cole b8df2226ae New phpdoc. 2016-02-18 06:38:37 +01:00
James Cole 106bae5c97 Move factories to separate folder. 2016-02-18 06:34:16 +01:00
James Cole 651297fa0b Method can be private. 2016-02-18 06:29:04 +01:00
James Cole 1b2873fc5f Some phpdoc. 2016-02-18 06:28:46 +01:00
James Cole f82a2b3bc5 Some phpdoc. 2016-02-18 06:24:47 +01:00
James Cole 4cb616ebeb Some PHP7 compatible type definitions 2016-02-18 06:24:39 +01:00
James Cole 1bcc975d7b Some new phpDoc and refactoring. 2016-02-18 06:15:01 +01:00
James Cole 98fd5b8858 Invert stuff so chart works again. 2016-02-17 22:35:57 +01:00
James Cole 6f08482aaf Some simplification. 2016-02-17 22:02:32 +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