IntenseFinance/firefly-iii
3
0 Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-10-13 17:02:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,499 Commits 12 Branches 1,280 Tags
4a88e241b5048302051a4368699e48ed4d7e53f1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 4a88e241b5 Code cleanup. 2016-03-03 09:05:09 +01:00
James Cole 8da0317b19 Fixed tag repository and provider. 2016-03-03 09:03:55 +01:00
James Cole 297c2e244d Created / updated rule repository and provider. 2016-03-03 09:02:04 +01:00
James Cole a51d752a35 Update rule group repository and provider. 2016-03-03 09:00:15 +01:00
James Cole 7800b0a7f5 Update piggy bank repository / provider. 2016-03-03 08:58:15 +01:00
James Cole 5ce4104644 Update transaction journal repository / provider 2016-03-03 08:55:43 +01:00
James Cole b4f1bbf793 Updated export job repository 2016-03-03 08:53:05 +01:00
James Cole ca33bea6b7 Update category repository. 2016-03-03 08:50:17 +01:00
James Cole 42d20ff693 Updated budget provider and budget repository. 2016-03-03 08:44:20 +01:00
James Cole 22a14416ad Forgot to include classes for bill service provider. 2016-03-03 08:41:29 +01:00
James Cole 98bd9bdaa0 New bill repository provider. 2016-03-03 08:40:25 +01:00
James Cole 13bac92a24 Adapted attachment repository. 2016-03-03 08:38:24 +01:00
James Cole d9eb14d6e5 New attachment service provider. 2016-03-03 08:36:36 +01:00
James Cole 6ec0471e8b Code cleanup. 2016-03-03 08:31:31 +01:00
James Cole 8008311d9c Added a new argument to the constructor of the account repository which should correctly inject the user. 2016-03-03 08:31:18 +01:00
James Cole fcf16051a2 Some general code cleanup. 2016-03-03 08:29:56 +01:00
James Cole 3a236456cd Fix tag report thing. [skip ci] 2016-03-02 20:44:55 +01:00
James Cole 2606d77c62 Fix show tag [skip ci] 2016-03-02 20:40:43 +01:00
James Cole 3d2f33c120 Clean up some views. 2016-03-02 20:38:17 +01:00
James Cole 4f14969464 Add cache to journal support. 2016-03-02 20:19:39 +01:00
James Cole 7234f011ec Clean up method relying on old transaction journal code. 2016-03-02 20:11:28 +01:00
James Cole 5b949d6e00 Move some stuff around. 2016-03-02 19:41:22 +01:00
James Cole 2fd476ada8 Fixed search as well. 2016-03-02 13:56:56 +01:00
James Cole 2e7703bc97 Fixed two crashes. 2016-03-02 13:55:48 +01:00
James Cole 9b69a6addd Lots of todo's [skip ci] 2016-03-02 13:51:56 +01:00
James Cole 500243b0b3 This fixes most of the tests. 2016-03-02 13:37:28 +01:00
James Cole 3ef84dc1fc Cleanup and fix tests. 2016-03-02 13:13:33 +01:00
James Cole b04d68d087 Stop on failure for easy log debug thing. 2016-03-02 12:57:35 +01:00
James Cole 715c381eb2 No longer need this left join. 2016-03-02 12:53:20 +01:00
James Cole ca32ae4561 Fix is / is not already joined. 2016-03-02 12:52:36 +01:00
James Cole 6b277c5e67 Fix bill overview. 2016-03-02 12:47:15 +01:00
James Cole 1ac64fd0b3 Last updates, fixes the main list. 2016-03-02 12:33:07 +01:00
James Cole f2c1dd41d0 Expanded Amount and expanded TransactionJournal to include source and destination information. 2016-03-02 12:25:00 +01:00
James Cole 869360f26c Some unrelated phpdoc. 2016-03-02 12:24:38 +01:00
James Cole dbdc334931 Clean up frontpage query call (first of many...) 2016-03-02 12:09:45 +01:00
James Cole b317d1a171 First attempt at scopeExpanded(), included some new fields in QUERYFIELDS. 2016-03-02 12:09:34 +01:00
James Cole b00c7b0ce3 New constant that defines which fields a journal query is expected to load. 2016-03-02 12:03:53 +01:00
James Cole a61eafeac2 Will now look for new field "transaction_type_type" 2016-03-02 12:03:04 +01:00
James Cole 5978b1c421 Removed cache from typeIcon 2016-03-02 12:02:01 +01:00
James Cole 9f16799453 Re-added phpdoc. 2016-03-02 11:59:39 +01:00
James Cole 74fe0ee4e4 Add some todo things, removed "withrelevantdata". This breaks FF 2016-03-02 11:58:31 +01:00
James Cole e8880232b3 Removed "transaction_type" 2016-03-02 11:57:02 +01:00
James Cole 556e9f1df7 Removed "source_account" attribute. 2016-03-02 11:56:47 +01:00
James Cole beb301e781 Removed "destination_account" 2016-03-02 11:54:03 +01:00
James Cole 056c809754 Removed amount_positive. This breaks the other half. 2016-03-02 11:53:23 +01:00
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 8ddb357e5a Refer to correct var [skip ci] 2016-03-02 07:06:19 +01:00
James Cole 560c10898f Extra spaces for clarity [skip ci] 2016-03-02 07:05:43 +01:00
James Cole 04f5214bb7 Fix multiplier for single tag. 2016-03-02 07:04:48 +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 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
James Cole 69a8cad47b Attachment download (issue #193) 2016-02-25 14:53:26 +01:00
James Cole bcaca0eca3 Queue name, default queue name. 2016-02-24 20:51:50 +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 dd1b4e21f5 New table for #196 2016-02-24 20:14:09 +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
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 ce0ca23d79 Rename field export start and end date. 2016-02-23 19:57:35 +01:00
James Cole 35863c8d3a This should fix the tests. 2016-02-23 17:55:56 +01:00
James Cole dad73ce9df Added a translation. 2016-02-23 16:16:03 +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 55ab39ca55 Old cover script. 2016-02-23 16:15:26 +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
James Cole 9b3131b95e Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop 
# By Robert Horlings
# Via Robert Horlings (2) and James Cole (1)
* 'develop' of https://github.com/JC5/firefly-iii:
  Added button to specify parameters and execute the job
  Added missing imports for job
  Implemented job to execute rulegroup on existing transactions
  Moved JournalCollector to other package to encourage reuse
 2016-02-23 15:47:39 +01:00
James Cole 356ec276bc Updated composer stuff. 2016-02-23 12:04:00 +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 537b4ae003 Fix translation. 2016-02-23 07:27:52 +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
James Cole 28fd719ce3 New file systems. 2016-02-23 06:17:04 +01:00
James Cole 317075aa6d Oops. 2016-02-20 18:48:06 +01:00
James Cole eaf2efc510 Updated favicons. 2016-02-20 18:47:06 +01:00