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
1,364 Commits 9 Branches 1,163 Tags
67fafdeef74332b9d853fc77ef4ee86c60e2d9e4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole a115960411 Merge branch 'release/3.3.6' 
Conflicts:
	app/Http/Controllers/CategoryController.php
 2015-04-03 23:31:29 +02:00
James Cole e9fa4ca816 New version in read me. 2015-04-03 23:30:54 +02:00
James Cole 75d92bc7f0 Allow FF to send events. 2015-04-03 23:22:23 +02:00
James Cole 74aa6e911e Make boxes respond to unpaid / paid credit card bills. 2015-04-03 23:10:51 +02:00
James Cole 9d000c1898 Added amount because debug. 2015-04-03 23:05:50 +02:00
James Cole b2254875b2 Expanded to credit cards. 2015-04-03 22:54:21 +02:00
James Cole 78d04230d5 New CC help text. 2015-04-03 21:25:04 +02:00
James Cole 1c04477393 Support credit cards (in name only). 2015-04-03 21:12:54 +02:00
James Cole 2a9679c94e Textual fix in bill [skip ci] 2015-04-03 21:05:41 +02:00
James Cole 6009f8ecde Better chart for bills. 2015-04-03 21:05:01 +02:00
James Cole 35cdbec70a Clean up for budget limits. 2015-04-03 19:39:36 +02:00
James Cole 0faef542c1 Fixed a bug in the budget controller. 2015-04-03 19:11:55 +02:00
James Cole 8b085af6a1 First attempt at account controller::index. 2015-04-03 12:14:40 +02:00
James Cole e3b11a9eb2 New test for edit form that is more inclusive. 2015-04-03 09:30:44 +02:00
James Cole 72fc88f3c6 Even more tests. 2015-04-03 08:55:24 +02:00
James Cole a5b759f268 Updates TestCase.php 2015-04-03 08:37:53 +02:00
James Cole 6a9ffae25d New tests and factories. 2015-04-03 08:31:50 +02:00
James Cole 64c031c7fe Small updates [skip ci] 2015-04-03 07:44:44 +02:00
James Cole 720926c50d Tests now run without a database, as they should. 2015-04-03 07:33:18 +02:00
James Cole 36ec974284 Add heavy but working migrate routine. Will fix the tests but must be optimised. Also, should not be necessary. 2015-04-02 22:51:00 +02:00
James Cole cff77c39e2 Update travis-ci and composer.lock and composer.json 2015-04-02 22:46:50 +02:00
James Cole 056a0a1736 Smaller boxes. 2015-04-02 22:43:12 +02:00
James Cole f301da83c6 Fixed the tests. 2015-04-02 22:39:31 +02:00
James Cole 5362231efa Ignore virtual balance in select places. 2015-04-01 19:46:16 +02:00
James Cole 4bb14cad73 Allow virtual balance to be ignored. 2015-04-01 19:45:13 +02:00
James Cole 7f5188f5a4 Added something fancy called "virtual balance". 2015-04-01 19:42:14 +02:00
James Cole a80b7aac6c Fix more redirections. 2015-04-01 18:59:34 +02:00
James Cole 83f32478fa Fixed more redirections. 2015-04-01 09:43:19 +02:00
James Cole 7578ec6801 Fix redirections in budget. 2015-04-01 09:40:19 +02:00
James Cole e14a32f76f Also fix delete/destroy redirection routine. 2015-04-01 09:23:51 +02:00
James Cole 58faa189ac Can now actually store transactions without an expense / revenue account. 2015-04-01 09:17:07 +02:00
James Cole 9b4f87d44a Fix checkbox for edit screen. 2015-04-01 09:16:51 +02:00
James Cole 7830a64170 Fix redirect. 2015-04-01 09:16:41 +02:00
James Cole 8f0fa02107 Better redirection for new transactions. 2015-04-01 09:12:49 +02:00
James Cole e000fb5d80 Optimized decryption. 2015-03-31 22:46:11 +02:00
James Cole 566fadad15 Add decryption routine. 2015-03-31 21:18:22 +02:00
James Cole cf23858c10 Gokje. 2015-03-31 20:52:48 +02:00
James Cole 216a223617 Fix in year list. 2015-03-31 20:49:02 +02:00
James Cole 638f38d823 New flush method. 2015-03-31 20:46:37 +02:00
James Cole 98ee70f04e Fix range thing. 2015-03-31 20:45:06 +02:00
James Cole b365db5a4b New hidden id field. 2015-03-31 20:39:28 +02:00
James Cole 02e55496df Remove reminders when piggy bank is reminded. 2015-03-31 20:22:51 +02:00
James Cole e11e53913a Some new code + GA 2015-03-31 19:21:49 +02:00
James Cole f8a5fb4225 Fixed tests. 2015-03-31 17:49:47 +02:00
James Cole 3a49450461 Made sure migrations can be rolled back. 2015-03-31 15:38:44 +02:00
James Cole 3c375fb955 Remove build stuff because sqlite does not work with change things. 2015-03-31 15:24:13 +02:00
James Cole 011fea2cc6 Fix encryption in home chart. 2015-03-31 15:10:22 +02:00
James Cole a079eec2cb Better unicity for objects. 2015-03-31 14:16:25 +02:00
James Cole 776b37f4ea Clean up some code, optimise the 503 error. 2015-03-30 21:24:56 +02:00
James Cole a4d8bbe3da Fixed a bug where certain types of accounts could not be validated. 2015-03-30 20:16:33 +02:00
James Cole 72166743fa Merge branches 'develop' and 'develop' of https://github.com/JC5/firefly-iii into develop 2015-03-30 20:08:40 +02:00
James Cole c4312c0b11 Extra large code cleanup. 2015-03-30 20:08:27 +02:00
James Cole ac12a47071 Hide inactive budgets when there are none. 2015-03-29 21:29:37 +02:00
James Cole bea321939e Code rearrange and optimise. 2015-03-29 21:27:51 +02:00
James Cole 210f84b6ea Allow edit from budget overview, and allow changing of active setting. 2015-03-29 21:27:13 +02:00
James Cole d4c642741f Fixed division by zero. 2015-03-29 21:09:33 +02:00
James Cole e6b1b58379 Enable inactive budgets. 2015-03-29 19:50:29 +02:00
James Cole 8d982c1a90 Some extensions. 2015-03-29 19:44:59 +02:00
James Cole be10e836dc Updated composer.lock 2015-03-29 19:40:22 +02:00
James Cole 9be05e7e17 Small optimisations. 2015-03-29 18:28:49 +02:00
James Cole bd96b2819f Removed double code. 2015-03-29 12:32:00 +02:00
James Cole f601af3da0 Cleaned up report controller. 2015-03-29 12:25:46 +02:00
James Cole 70a01c082b Removed some double code. 2015-03-29 12:12:06 +02:00
James Cole bcf066ead7 Cleaned up some double code. 2015-03-29 11:51:26 +02:00
James Cole 24dd3578ed Merge branch 'release/3.3.5' into develop 2015-03-29 08:43:55 +02:00
James Cole d5c39d54d8 Merge branch 'release/3.3.5' 2015-03-29 08:43:54 +02:00
James Cole 6e3f6abc67 New read me. 2015-03-29 08:43:46 +02:00
James Cole 463201df2c New gitignore. 2015-03-29 08:43:03 +02:00
James Cole a7501c396f Renamed some methods. 2015-03-29 08:24:56 +02:00
James Cole 4c8bc49a7e Add newlines. 2015-03-29 08:22:48 +02:00
James Cole f254674f88 Add newlines. 2015-03-29 08:21:33 +02:00
James Cole a97c267378 Added new lines 2015-03-29 08:20:37 +02:00
James Cole eaa947894b Updated composer.son 2015-03-29 08:20:30 +02:00
James Cole fb3a26510b Removed some unused use statements. 2015-03-29 08:20:20 +02:00
James Cole bfe8b14e49 Cleaned up. 2015-03-29 08:18:15 +02:00
James Cole afb47eb742 Add newlines. 2015-03-29 08:14:32 +02:00
James Cole ba97f96288 Removed unused use statements. 2015-03-29 08:03:53 +02:00
James Cole ecbafb8f4b Removed commented out code. 2015-03-29 07:59:18 +02:00
James Cole 12d3800d67 Removed unused use statements. 2015-03-29 07:51:56 +02:00
James Cole d586b82372 New composer.son file. 2015-03-29 07:45:14 +02:00
James Cole ba9877c9b4 Add typehints to object parameters 2015-03-29 07:43:20 +02:00
James Cole 907933f3df Removed debug logic and bad operators. 2015-03-29 07:32:24 +02:00
James Cole 2e91d21a88 Add return to form routine to budgets. 2015-03-28 18:22:36 +01:00
James Cole dca395a018 Merge branch 'release/3.3.4' 2015-03-28 17:45:56 +01:00
James Cole 625070a5b9 Merge branch 'release/3.3.4' into develop 2015-03-28 17:45:56 +01:00
James Cole f875c7cbf5 Updated read me file. 2015-03-28 17:45:46 +01:00
James Cole eed88fc103 Don't fail on repeated piggy banks, just log it. 2015-03-28 17:45:15 +01:00
James Cole 6fc54d1d27 Fixed the tests 2015-03-28 07:00:53 +01:00
James Cole 0ef52bf909 Remove recurring transactions [skip ci] 2015-03-28 06:59:43 +01:00
James Cole 95e34af6ef Update script [skip ci] 2015-03-28 06:51:54 +01:00
James Cole 650b99ead2 Ignore apple files. [skip ci] 2015-03-28 06:50:26 +01:00
James Cole 57941a19de Excutable. 2015-03-28 06:48:54 +01:00
James Cole 6157db0b6a Some new tests 2015-03-28 06:48:38 +01:00
James Cole c9358acf5d Update tests and token replace routine. 2015-03-28 06:25:36 +01:00
James Cole ed29eb8a5d New lock file. 2015-03-28 06:19:37 +01:00
James Cole bcf7452312 Some new tests. 2015-03-28 06:19:09 +01:00
James Cole b9000519e4 Fixed unique piggy check. 2015-03-27 20:20:52 +01:00
James Cole 2694297466 Fixed a bug where start / end would be used incorrectly. 2015-03-27 19:48:55 +01:00
James Cole 53ff5c1490 Wrong operator, 2015-03-27 19:47:31 +01:00
James Cole 32a036b076 Add certainty to chart. 2015-03-27 19:45:47 +01:00