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,703 Commits 9 Branches 1,163 Tags
4b42ef0db8fc2a34c33ca4629ab721ad136a78a9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
James Cole fe57648349 Allow report options to be pulled using AJAX. Ajax is cool. 2016-11-09 19:25:09 +01:00
James Cole cf69333c6d This fixes #395 2016-11-08 21:34:13 +01:00
James Cole a63f1638f4 Upgrade some libraries for #391 2016-11-08 20:50:05 +01:00
James Cole 8fc41e0226 Fixes #390 2016-11-08 20:37:53 +01:00
James Cole a08dfe1e3c Add interface for journal collector. 2016-11-08 20:36:09 +01:00
James Cole 49cc8a97a3 Clean up code, fixes #392 2016-11-08 20:35:30 +01:00
James Cole 5b8583dd2b Make sure scripts don't crash when no database present. 2016-11-07 20:25:09 +01:00
James Cole f653bc5f6e Expand firefly config. 2016-11-07 18:49:35 +01:00
James Cole a6a9794fc7 Merge branch 'release/4.1.6' into develop 2016-11-06 16:18:20 +01:00
James Cole 5f9a9bc89a Change log for 4.1.6 2016-11-06 16:16:05 +01:00
James Cole a7d35cd1c3 Fix multi year report. [skip ci] 2016-11-06 15:09:44 +01:00
James Cole 0b5e25960f Fix small JS bug. 2016-11-06 15:04:35 +01:00
James Cole 0c8a1b51e9 Quick bug fix: missing class. 2016-11-06 15:01:04 +01:00
James Cole 7612f1f91a Small changes to twig files. 2016-11-06 14:52:48 +01:00
James Cole 22a2fe3f61 Improved search. 2016-11-06 14:52:31 +01:00
James Cole 1ebb59b352 Remove .twig extension. [skip ci] 2016-11-06 08:11:43 +01:00
James Cole 77e2cf40df Removed more getJournals functions in favour of the collector. 2016-11-06 08:08:06 +01:00
James Cole 0edffd8ea1 Lighter icon [skip ci] 2016-11-05 18:57:45 +01:00
James Cole ee6e047596 Do not order the count query. 2016-11-05 18:55:09 +01:00
James Cole bd55636b3f Add repository move info. 2016-11-05 18:51:26 +01:00
James Cole b24e97a449 Update version and change log. 2016-11-05 18:50:13 +01:00
James Cole d45355fc3f Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop 
* 'develop' of https://github.com/JC5/firefly-iii:
  Translated
 2016-11-05 18:46:10 +01:00
James Cole 962cad33e2 Code cleanup. 2016-11-05 18:43:18 +01:00
James Cole 1e2124c5ed Moved more stuff to the journal collector. 2016-11-05 18:08:44 +01:00
James Cole 37435da459 Moved more stuff to the journal collector. 2016-11-05 17:47:50 +01:00
James Cole 05dbd30bbd Rename another collector. 2016-11-05 17:17:56 +01:00
James Cole 13e1292bb7 Automated code cleanup [skip ci] 2016-11-05 11:47:21 +01:00
James Cole 8e542531b3 Move collecting journals to the collector. 2016-11-05 11:44:41 +01:00
James Cole 43afdb021a Move collecting journals to the collector. 2016-11-05 11:24:15 +01:00
James Cole aeca2ef3b2 Move some code around 2016-11-05 10:42:31 +01:00
James Cole 205a593721 Removed unused method. 2016-11-05 10:28:10 +01:00
James Cole 46649fe228 Solved group thing. 2016-11-05 10:26:57 +01:00
James Cole adb97fcb05 Fix small javascript bug. 2016-11-05 08:47:05 +01:00
James Cole 98160e9b63 Expand use of journal collector. 2016-11-05 08:46:55 +01:00
James Cole 9c5d192d90 Journal collector may not have been a bad idea after all! 2016-11-05 08:27:25 +01:00
James Cole 47bebb614e Only withdrawal can have a budget. 2016-11-05 07:43:23 +01:00
James Cole 5f7fb77db2 Code to fix #378 2016-11-04 16:04:36 +01:00
James Cole 1d15bc0b10 I am changing some string concatenations to sprintf() routines because they are more readable and safer. [skip ci] 2016-11-03 21:54:07 +01:00
James Cole 7bc4c6d115 Update change log [skip ci] 2016-11-03 21:49:08 +01:00
James Cole 8e5e3de8b0 Update change log (prematurely). [skip ci] 2016-11-03 21:45:35 +01:00
James Cole a3088f6806 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
  Approved. Step name: Proofread
  Approved. Step name: Proofread
  New translations
  New translations
  New translations
  Translated
 2016-11-03 21:07:48 +01:00
James Cole 72f7b5f3ea This fixes #375 2016-11-03 21:07:12 +01:00
James Cole 4106b2e4c0 Remove some help entries in favour of help pages in the top right corner. 2016-11-02 22:23:40 +01:00
James Cole e1be4909b9 Redirect when 0 accounts. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-11-02 21:24:16 +01:00
James Cole a7e0e3fc15 Small additions and bug fixes. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-11-02 20:52:40 +01:00
James Cole 5e480eca36 Clean up some report code. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-11-02 20:45:11 +01:00
James Cole 6c8d594df7 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
  Approved. Step name: Proofread
  New translations
  New translations

Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-11-02 20:08:38 +01:00
James Cole e24f5ec9f3 Multi year report move to AJAX. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-11-02 20:08:11 +01:00
James Cole 2ddd4314f1 Extend help pages. 2016-11-02 14:33:57 +01:00
James Cole b980b5baea Small optimisations. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-11-02 07:23:11 +01:00
James Cole 4ba34ab511 Show sum [skip ci] 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-11-02 07:16:46 +01:00
James Cole 5be317d73c sprintf ALL THE THINGS 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-11-02 07:04:14 +01:00
James Cole af16205965 Merge branch 'master' into develop 
* master:
  New budget table for multi year report.
  Removed everything pointless from multi year report.

Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-11-02 07:03:17 +01:00
James Cole 39917b77c1 New GitHub move repository instructions 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-11-02 07:02:22 +01:00
James Cole 124ecb1372 New budget table for multi year report. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-11-02 04:55:44 +01:00
James Cole 33c0c1bea6 Removed everything pointless from multi year report. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-11-01 19:06:35 +01:00
James Cole a66990459e Merge branch 'release/4.1.5' 2016-11-01 18:45:25 +01:00
James Cole fecbdc7fbf New version. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-11-01 18:44:26 +01:00
James Cole 0369ace5f7 Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop 
* 'develop' of https://github.com/JC5/firefly-iii: (28 commits)
  Approved. Step name: Proofread
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  ...
 2016-11-01 18:41:15 +01:00
James Cole 1657048181 Fixed bug #370 2016-11-01 18:40:35 +01:00
James Cole ed33a054ad This update will make the help method fall back to the English content, if it is available. 2016-10-31 18:31:52 +01:00
James Cole 4e3e015912 Fix multi year account report [skip ci] 2016-10-30 20:13:49 +01:00
James Cole 7821c52842 Ajax some report parts. 2016-10-30 18:29:26 +01:00
James Cole 0a6f299ae6 Merge branch 'release/4.1.4' 2016-10-30 08:56:35 +01:00
James Cole 73f87e30c2 Changelog. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-10-30 08:52:09 +01:00
James Cole 18ee20e680 Update crowdin file [skip ci] 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-10-30 06:37:00 +01:00
James Cole c53da15219 Update composer.lock in anticipation of new release. 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
 2016-10-30 06:20:18 +01:00
James Cole d4995e342f Fixed #330 2016-10-30 06:14:07 +01:00
James Cole c9f14da294 Translations. 2016-10-29 17:30:55 +02:00
James Cole e9c2446cba Debug log for #366 2016-10-29 16:16:10 +02:00
James Cole 35f179625c New queries for #366 2016-10-29 16:11:54 +02:00
James Cole 39749aa113 First code set for #330 2016-10-29 15:14:33 +02:00
James Cole ba65e982fd Forgot to include model [skip ci] 2016-10-29 11:42:04 +02:00
James Cole b50e5d7e59 Can also change destination in new rule. 2016-10-29 09:22:51 +02:00
James Cole a3148dc172 Code for #321 2016-10-29 09:03:14 +02:00
James Cole 73f1491d2d Updates for translations. 2016-10-29 07:44:46 +02:00
James Cole 28eb54dc96 Initial split for report options. 2016-10-28 19:01:52 +02:00
James Cole 21fb426524 Make sure date is localised. 2016-10-28 18:16:30 +02:00
James Cole afdcfa8525 Tweak reports. 2016-10-26 19:45:10 +02:00
James Cole 5db4f8512b Tweak reports. 2016-10-26 19:37:19 +02:00
James Cole dc0c1b73bc Better view for expenses. 2016-10-26 19:32:19 +02:00
James Cole f999257095 New verify database routine. 2016-10-26 19:32:07 +02:00
James Cole 7182909e28 Keep the box [skip ci] 2016-10-26 16:54:52 +02:00
James Cole fe3f015171 Add more stuff to ajax controllers, making report controller simpler. 2016-10-26 16:46:43 +02:00
James Cole 01de147900 Display message about common error. 2016-10-26 06:41:50 +02:00
James Cole a7e5fcc806 Move some stuff over to AJAX thing. 2016-10-25 18:53:54 +02:00
James Cole e2d187d74b Various small bug fixes. 2016-10-24 18:01:15 +02:00
James Cole 48b0620629 New help thing. 2016-10-23 17:33:53 +02:00
James Cole 19e9f382e4 Add some rounding to make forms more neat. 2016-10-23 16:56:18 +02:00
James Cole 446eaf6588 Some code cleanup [skip ci] 2016-10-23 14:58:39 +02:00
James Cole 78deb1420d Some fixes for bills. 2016-10-23 14:56:05 +02:00
James Cole e092515dff Better export. 2016-10-23 12:55:07 +02:00
James Cole 81f6fef978 Add new line to files [skip ci] 2016-10-23 12:42:44 +02:00
James Cole 6a2f8fa9ee No use models directly. 2016-10-23 12:41:54 +02:00