IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-09-03 20:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,894 Commits 9 Branches 1,163 Tags
0e66939408f318c37cdbc95234932d7bdc2c2758
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 0e66939408 Various code cleanup. 2016-11-26 10:53:20 +01:00
James Cole 22d2a523fb Some minor code fixes. 2016-11-26 10:39:05 +01:00
James Cole bc825a8603 Remove unused code. 2016-11-26 09:29:41 +01:00
James Cole c9cfda34a1 Remove duplicate code. 2016-11-26 09:21:49 +01:00
James Cole e8dfbff73f Various code cleanup. 2016-11-26 09:16:06 +01:00
James Cole 62e41f1997 Remove TODO annotations 2016-11-26 09:07:16 +01:00
James Cole 8c9f90f1b4 Some code cleanup. 2016-11-26 09:01:00 +01:00
James Cole 1453a78e49 Remove todo annotations. 2016-11-26 08:55:26 +01:00
James Cole 6bc6674ab1 Some code simplification. 2016-11-26 08:41:15 +01:00
James Cole d6c7ff0ccb Chart for budget report will also include split journals. 2016-11-26 07:18:20 +01:00
James Cole 28f655dba1 This code makes sure the budget report also includes split expenses. 2016-11-26 07:09:02 +01:00
James Cole 8860378757 Fix budget in split journals. 2016-11-25 19:06:06 +01:00
James Cole 728fda0116 This allows the user to set the “default” currency for an asset account (#305). It doesn’t do anything other than this yet. 2016-11-25 18:00:29 +01:00
James Cole 0c72e1831f Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop 
* 'develop' of https://github.com/JC5/firefly-iii:
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  Approved. Step name: Proofread
  Translated
  New translations
  New translations
 2016-11-25 17:43:38 +01:00
James Cole b739859c64 Expand journal meta with soft delete. This pushes Firefly to 4.2.0. 2016-11-25 17:42:45 +01:00
James Cole c049d5cfa6 Various small fixes. 2016-11-25 16:55:04 +01:00
James Cole 6c9990e0be Various Javascript related fixes. 2016-11-25 16:54:13 +01:00
James Cole b34e4cd31b This fixes #422 2016-11-25 16:52:43 +01:00
James Cole 7852b8a785 Make sure ff does not create accounts when balance is said to be 0. 2016-11-25 16:26:03 +01:00
James Cole 6eeb60db5c Multiply sum by -1. 2016-11-24 21:37:09 +01:00
James Cole d076cfc08f Attempt to fix issue #417 2016-11-24 21:35:23 +01:00
James Cole 68a93ff97c Made fonts local 2016-11-24 19:26:47 +01:00
James Cole 295dcb4f65 Whoops ;) 2016-11-24 19:20:04 +01:00
James Cole d9849f60c0 Parse error 2016-11-24 19:16:15 +01:00
James Cole 7ebb68e36c This fixes #419 2016-11-24 19:15:16 +01:00
James Cole f029f7607b Rewrote all email messages. 2016-11-22 21:21:11 +01:00
James Cole dbbc85a576 Hide some boxes when the user has no bills. 2016-11-22 19:10:38 +01:00
James Cole eb78cf20c2 This fixes #414 2016-11-22 19:10:17 +01:00
James Cole 4a99399952 Fix chart for account/all overview. 2016-11-21 20:23:25 +01:00
James Cole 6075d75ee2 Fix debug code [skip ci] 2016-11-21 20:15:59 +01:00
James Cole 04c59304da Add sorting to a report table [skip ci] 2016-11-20 19:11:10 +01:00
James Cole 4b3c31a11a Ignore deleted transactions. [skip ci] 2016-11-20 19:03:08 +01:00
James Cole 670fa77dd7 New tests. 2016-11-20 18:34:49 +01:00
James Cole 8baea2feb9 Code for #385 2016-11-20 18:31:29 +01:00
James Cole c56f937521 Improved sorting in various views. 2016-11-20 17:36:11 +01:00
James Cole 0b613c3b8c Improve sortability in various lists. 2016-11-20 15:30:16 +01:00
James Cole 78f297e18f Fixed some display bugs for split journals. 2016-11-20 14:17:16 +01:00
James Cole ec4ec1a147 New (not implemented) tests. 2016-11-20 12:53:04 +01:00
James Cole 350e0b08b1 This implements #377 2016-11-20 12:51:33 +01:00
James Cole 9340ca09e6 Fixed #408 2016-11-20 12:08:43 +01:00
James Cole a1cef5c339 Found a bug in the import routine where "default accounts" (an account type no longer used by default) is found. 2016-11-20 11:44:27 +01:00
James Cole 94875adb6c Various code cleanup. 2016-11-20 11:43:19 +01:00
James Cole 75a524c656 Added debug code for a possible import issue. 2016-11-20 11:40:05 +01:00
James Cole e1e94a788c Register and use interface. 2016-11-20 08:57:48 +01:00
James Cole 8417f45d02 Fixed some tests. 2016-11-20 08:54:52 +01:00
James Cole 685310a368 First account controller tests 2016-11-20 08:46:02 +01:00
James Cole 45e7a4576a Extend some test stuff. 2016-11-20 08:30:25 +01:00
James Cole f8c5c15655 Updated some tests. 2016-11-20 07:24:18 +01:00
James Cole 26190524f4 Skeletons for test 2016-11-19 20:30:30 +01:00
James Cole 5d901a7ecb Remove local development file. [skip ci] 2016-11-19 18:21:48 +01:00
James Cole cd6e37b9cb Update composer.lock file. [skip ci] 2016-11-19 16:45:33 +01:00
James Cole b647386541 New release imminent. [skip ci] 2016-11-19 16:44:17 +01:00
James Cole a9795fb095 Update ignore file [skip ci] 2016-11-19 16:34:52 +01:00
James Cole 8554aae21e Update read me file [skip ci] 2016-11-19 16:31:39 +01:00
James Cole 5a2ef36f2a Fix travis script. 2016-11-19 16:28:04 +01:00
James Cole 01e3f91ece Do not test hhvm. Fix script. 2016-11-19 16:17:04 +01:00
James Cole 7ec9c090cc Fix test script. 2016-11-19 16:13:57 +01:00
James Cole b057d69f8e Correct travis configuration. 2016-11-19 16:07:02 +01:00
James Cole ff4e1838bc Update travis configuration. 2016-11-19 16:03:59 +01:00
James Cole e4ecd0b7ff Empty travis CI file. 2016-11-19 16:01:19 +01:00
James Cole 1ba35f73e1 Fixed a test 2016-11-19 16:00:20 +01:00
James Cole 240f3c126b Restored some tests. 2016-11-19 15:55:49 +01:00
James Cole 23925a0076 Enabled cache [skip ci] 2016-11-19 15:17:00 +01:00
James Cole 50b72cf229 More chart optimisations. 2016-11-19 13:37:44 +01:00
James Cole ee6b72afa5 Fix some bugs related to cash accounts. 2016-11-19 12:57:35 +01:00
James Cole 781621960d Make sure chart is displayed. 2016-11-19 09:26:32 +01:00
James Cole e15ea04186 Join two charts, simpler code. 2016-11-19 07:27:54 +01:00
James Cole 73f0cc705b Code cleanup. 2016-11-18 20:06:08 +01:00
James Cole 0c072c7d51 Some code cleanup. 2016-11-18 19:58:06 +01:00
James Cole 884bed85a1 Update composer file. 2016-11-18 19:54:21 +01:00
James Cole a319264428 fixed #406 2016-11-18 18:58:48 +01:00
James Cole e10fc4a854 Forgotten a translation. 2016-11-17 20:04:53 +01:00
James Cole 5088df103f Finished category report. 2016-11-17 20:02:55 +01:00
James Cole 13b96f6136 New text for translations. 2016-11-16 20:59:32 +01:00
James Cole 757662ca4b Removed duplicate code. 2016-11-16 20:59:21 +01:00
James Cole 4ef324cf24 Optimized chart code. 2016-11-16 20:35:25 +01:00
James Cole 0bb07e1eeb Small extension of category report. 2016-11-13 20:18:01 +01:00
James Cole 0c0f2109f6 Fix chart size [skip ci] 2016-11-13 11:31:48 +01:00
James Cole eecb6c6679 Optimize again for account name [skip ci] 2016-11-12 21:08:14 +01:00
James Cole 750b9d8038 Reduce number of queries. 2016-11-12 21:06:48 +01:00
James Cole 9ce28fdd2e Remove unused route. [skip ci] 2016-11-12 20:54:05 +01:00
James Cole 7bbca7f6a8 Final code check for something with the debug bar [skip ci] 2016-11-12 20:48:29 +01:00
James Cole f7579db4ad Clean up config [skip ci] 2016-11-12 20:41:15 +01:00
James Cole 2f47c58df5 New string for translation [skip ci] 2016-11-12 20:30:39 +01:00
James Cole 7e7ac264d2 Fixed category chart 2016-11-12 20:29:16 +01:00
James Cole 98d6c90e90 Removed some duplicate code. 2016-11-12 19:22:03 +01:00
James Cole da49afa37b Removed duplicate code. 2016-11-12 19:12:16 +01:00
James Cole 64364c3e77 Sending of error email message is optional but enabled. 2016-11-12 19:11:59 +01:00
James Cole 85b3c4683b Fix redraw bug in category report. 2016-11-12 12:23:55 +01:00
James Cole c5d2fabfec Optimize some views for category report 2016-11-12 12:12:11 +01:00
James Cole a294f757ff Fixes all charts in future category report. 2016-11-12 10:14:20 +01:00
James Cole 04515da0bc Fixed the charts 2016-11-12 07:02:32 +01:00
James Cole 6d60d64a82 Some extended code for the category report. 2016-11-12 06:48:38 +01:00
James Cole 32b5a84a0c Fixes #401 2016-11-12 06:34:54 +01:00
James Cole 4b42ef0db8 Fixes #398 2016-11-12 06:27:48 +01:00
James Cole abc7b9912d Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop 
* 'develop' of https://github.com/JC5/firefly-iii:
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
 2016-11-11 20:53:07 +01:00
James Cole 727717931a Do something fancy with colours. 2016-11-11 20:52:48 +01:00
James Cole 5d4f1bc76d First working example of category report. No content, just place holders. #396 2016-11-10 06:23:21 +01:00
James Cole 8583b574ac Multi year was not visible. 2016-11-09 21:46:32 +01:00
James Cole 3600e1b5e7 Extend report capability for issue #396 and related report issues. 2016-11-09 21:36:54 +01:00