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
3,942 Commits 9 Branches 1,163 Tags
ce78c8993f1d406bf7cdc9da41ec6aa28a7615a8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole ce78c8993f Optimise query. [skip ci] 2016-05-17 16:47:43 +02:00
James Cole 2538b4a885 Small changes to audit report. 2016-05-17 16:11:19 +02:00
James Cole 109d96ad16 Small but expensive changes to audit report. 2016-05-17 16:10:32 +02:00
James Cole 4cbb0d9716 Fixed split journals views. 2016-05-17 16:00:27 +02:00
James Cole 65ecea3b1c Small fix to split data. 2016-05-17 15:25:03 +02:00
James Cole 495b80f5ef More code for the split journal support. 2016-05-17 15:19:07 +02:00
James Cole e113736887 Should fix issue #263 2016-05-17 12:45:31 +02:00
James Cole 042b7a4966 Fix multi-year chart. [skip ci] 2016-05-16 12:51:52 +02:00
James Cole 5ab8cb38d3 Small change in report [skip ci] 2016-05-16 12:47:43 +02:00
James Cole fc4ab29244 Fixed chart. [skip ci] 2016-05-16 09:05:06 +02:00
James Cole 5a43e6cb9f Better query for no budget. [skip ci] 2016-05-16 07:13:54 +02:00
James Cole 4effc95c5f Fixed some report bugs. 2016-05-15 19:23:19 +02:00
James Cole 962965b5b7 Code cleanup. 2016-05-15 18:36:40 +02:00
James Cole 260b611293 Various fixes in report pages. 2016-05-15 18:16:31 +02:00
James Cole d2131c371b Fixed more report details. 2016-05-15 17:53:00 +02:00
James Cole eedf6a07f0 Fixed the income report. 2016-05-15 17:46:53 +02:00
James Cole 5cd1e7c100 Fix charts. [skip ci] 2016-05-15 16:15:17 +02:00
James Cole 6a750a998f Remove category chart from report controller. 2016-05-15 16:13:05 +02:00
James Cole bd818b2dea Code clean up. 2016-05-15 15:39:22 +02:00
James Cole 4164ebcc69 Added a lot of todo things. 2016-05-15 15:24:23 +02:00
James Cole 60d732067b Made some things less complex. 2016-05-15 15:08:59 +02:00
James Cole b7b52707fb Fix Travis. 2016-05-15 15:02:07 +02:00
James Cole f373c72679 Remove tests. 2016-05-15 15:01:29 +02:00
James Cole ec2027b8db Update git ignore. [skip ci] 2016-05-15 14:48:52 +02:00
James Cole a84de5db77 Enable caching. Remove stuff for development. 2016-05-15 14:48:21 +02:00
James Cole 5065b1ee03 Enable cache [skip ci] 2016-05-15 12:39:39 +02:00
James Cole a0aa114ee6 Update balance view. [skip ci] 2016-05-15 12:32:18 +02:00
James Cole 823839fbf6 Better routes and titles. 2016-05-15 12:26:40 +02:00
James Cole 1c93d8bf79 More test data and better views. 2016-05-15 12:08:41 +02:00
James Cole 626404407e More support for #142 2016-05-15 09:00:49 +02:00
James Cole 446ab62d38 View updates. [skip ci] 2016-05-14 23:14:49 +02:00
James Cole 0d39161ec3 Fix iban in test data. 2016-05-14 22:23:55 +02:00
James Cole 29be16dcba Fix complex query. [skip ci] 2016-05-14 22:21:08 +02:00
James Cole b0bb790386 Experimental query. [skip ci] 2016-05-14 22:12:16 +02:00
James Cole e64b40d58b Experimental query. [skip ci] 2016-05-14 22:11:49 +02:00
James Cole 4870945af2 Remove references to unused library. 2016-05-14 21:55:43 +02:00
James Cole a547a5f3f9 New Chart library. [skip ci] 2016-05-14 21:50:02 +02:00
James Cole e5eabdf7e7 Clean up test data. 2016-05-14 21:49:16 +02:00
James Cole f78d56b149 Will implement changes to test database. 2016-05-14 17:08:28 +02:00
James Cole 771926c779 No longer needed. 2016-05-14 14:02:37 +02:00
James Cole 6090efe2df Refactoring. 2016-05-14 14:02:12 +02:00
James Cole 863227c55c Some refactoring. 2016-05-14 13:51:33 +02:00
James Cole 5a6967cefd Better formatting for split transactions. 2016-05-13 19:40:13 +02:00
James Cole 5166171e5d More refactoring 2016-05-13 17:22:24 +02:00
James Cole 3e36a29c23 More refactoring. 2016-05-13 15:58:30 +02:00
James Cole 20e1e50032 Refactoring. 2016-05-13 15:53:39 +02:00
James Cole 36bc483edb Reorder some fields. 2016-05-13 10:50:19 +02:00
James Cole aa59227786 Fixed transactions and attachments. 2016-05-13 09:55:06 +02:00
James Cole 2d8449ed68 This should just about finished split transaction editing. 2016-05-13 07:33:04 +02:00
James Cole d7ab482ae1 Various updates for split transactions. 2016-05-12 22:44:31 +02:00
James Cole cfcc4ce88a Let's leave this on false. 2016-05-12 16:34:44 +02:00
James Cole eda44bbed0 Merge branch 'develop' of github.com:JC5/firefly-iii into develop 2016-05-12 12:13:42 +02:00
James Cole 988049061d Start with edit split journals routine. 2016-05-12 12:13:10 +02:00
James Cole ce7eebac5c Build edit split transactions. 2016-05-12 10:38:44 +02:00
James Cole b7c446f7db Start with edit and view screens. 2016-05-11 23:03:13 +02:00
James Cole 7c39a04c4b Cleanup. 2016-05-11 17:33:22 +02:00
James Cole 037d84b810 Fixes for transactions. 2016-05-11 17:17:43 +02:00
James Cole 529bf50c85 Removed some dead code. 2016-05-11 10:37:56 +02:00
James Cole d2b4bd78a9 Removed some dead code. 2016-05-11 10:02:27 +02:00
James Cole e1c146a5c1 Reinstate chart. 2016-05-11 09:17:47 +02:00
James Cole ed9acbdfde Reinstate report. 2016-05-11 09:08:18 +02:00
James Cole dc825d5a9c Fix queries. 2016-05-11 08:40:22 +02:00
James Cole 9f8faf15f1 Reinstate sorting. 2016-05-11 08:10:05 +02:00
James Cole 934656c954 Some small changes. 2016-05-11 07:57:16 +02:00
James Cole d233a2df3c Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop 
* 'develop' of https://github.com/JC5/firefly-iii:
  Should fix frontpage.

# Conflicts:
#	app/Models/TransactionJournal.php
#	app/Repositories/Account/AccountRepository.php
 2016-05-11 06:08:05 +02:00
James Cole 7c7740d3ba Should fix frontpage. 2016-05-10 09:33:23 +02:00
James Cole cda6cfb4cd Fix more charts. 2016-05-09 20:15:26 +02:00
James Cole a90d095609 More stuff for categories. 2016-05-09 18:06:53 +02:00
James Cole 98e683329e New stuff for categories and transactions. 2016-05-08 13:45:23 +02:00
James Cole 3588bd881c More chart cleanup. 2016-05-06 22:54:36 +02:00
James Cole 0460811e6c Fixed some more charts. 2016-05-06 22:53:08 +02:00
James Cole 27f5fe18df Moving stuff around, optimising charts. 2016-05-06 10:32:26 +02:00
James Cole 6d944ec98f More cleanup for budgets. 2016-05-06 06:15:46 +02:00
James Cole adf6691470 This breaks everything budget-related. 2016-05-05 22:03:35 +02:00
James Cole dd8b500efd These budget charts are the worst, I'm telling you. 2016-05-05 21:25:20 +02:00
James Cole 4e1ff8c4a3 Removed phpunit.xml 2016-05-05 19:07:46 +02:00
James Cole e73d590ead Update composer.lock 2016-05-05 19:05:29 +02:00
James Cole 5cc22f49cf Fix tests. 2016-05-05 19:04:21 +02:00
James Cole eb3d2b1749 Building split transactions and fixing tests. 2016-05-05 18:59:46 +02:00
James Cole 21a197ba46 More translations. 2016-05-05 07:46:19 +02:00
James Cole 0b74707638 Display and handle errors. 2016-05-05 07:46:11 +02:00
James Cole 16dc8b7d68 Translation for error. 2016-05-05 07:45:52 +02:00
James Cole 5a8abe004e Field rename 2016-05-05 07:45:40 +02:00
James Cole b211d72c8b Static data must remain static data. 2016-05-05 07:45:29 +02:00
James Cole 36f3eb8b2f Small fix in journal handler. 2016-05-05 07:09:12 +02:00
James Cole 3344bb7263 Code cleanup. 2016-05-02 20:49:19 +02:00
James Cole 5e1167b8ae Code cleanup. 2016-05-01 15:05:29 +02:00
James Cole b80db054e2 Remove journal collector. 2016-05-01 09:52:58 +02:00
James Cole c66df3cb2c Code cleanup. 2016-05-01 09:42:08 +02:00
James Cole ac8ff4e565 Clean up repository. 2016-05-01 07:09:58 +02:00
James Cole bfa7ee90f4 Reverse stuff 2016-05-01 06:59:08 +02:00
James Cole 77c9e37584 Move some stuff around. 2016-05-01 06:37:47 +02:00
James Cole 80350f8423 Fix for transactions. 2016-04-30 22:30:11 +02:00
James Cole 3c1ff4d21f Fix query. 2016-04-30 22:05:58 +02:00
James Cole 55b8f03590 Some new data thing. 2016-04-30 21:20:39 +02:00
James Cole 1fd7852309 Fix query thing. 2016-04-30 20:24:47 +02:00
James Cole 9c5292962f More stuff for splits. 2016-04-30 19:50:42 +02:00
James Cole c05c6e72c0 Display budget and category if relevant. 2016-04-30 16:36:58 +02:00
James Cole bdcd033952 Fix edit routine 2016-04-30 12:46:21 +02:00
James Cole 4ec6bcc8c7 More code for split and small bug fix in attachment helper. 2016-04-30 09:48:39 +02:00