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
2,525 Commits 9 Branches 1,163 Tags
6426d1df06d9877724533c6ff4d2f2c407f6cd6b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 6426d1df06 Fix the report chart. 2015-12-12 10:41:51 +01:00
James Cole 9284eb3fe9 First attempt at account specific bill report. 2015-12-12 10:33:19 +01:00
James Cole afdae8bc1e Fix a sum for #129 2015-12-12 08:26:12 +01:00
James Cole 2a7085e593 Experimental budget lines. #129 2015-12-12 08:25:08 +01:00
James Cole 2408fb3ed4 Experimental budget lines. #129 2015-12-12 08:24:17 +01:00
James Cole 8316afb176 Experimental budget lines. #129 2015-12-12 08:21:46 +01:00
James Cole e59fd098a3 Spent amount / withdrawals are negative, #129. 2015-12-12 08:15:14 +01:00
James Cole e044199693 Spent amount / withdrawals are negative, #129. 2015-12-12 08:14:17 +01:00
James Cole 8f8e29fc22 Fix a sum. 2015-12-12 08:12:27 +01:00
James Cole 8de5384158 Spent amount / withdrawals are negative, #129. 2015-12-12 08:11:30 +01:00
James Cole 216c659335 Spent amount / withdrawals are negative, #129. 2015-12-12 08:07:25 +01:00
James Cole 041ca8a5d3 Amount reversal for #129 2015-12-12 08:05:10 +01:00
James Cole fe4f1b306d Fix a sum for #129 2015-12-11 18:52:21 +01:00
James Cole a0972d99fb Made a negative amount a positive as per #129 2015-12-11 18:49:07 +01:00
James Cole e332bfef7c First attempt at budgets (split by account). 2015-12-11 18:45:39 +01:00
James Cole cba5e226d8 Fix display of amount. 2015-12-11 18:36:19 +01:00
James Cole 5aff0c4943 Some fixes for #129 2015-12-11 18:35:49 +01:00
James Cole cb49c00f4d Fix another JS error 2015-12-11 18:33:47 +01:00
James Cole e26d797d57 Fix JS error. 2015-12-11 18:32:57 +01:00
James Cole 938581527e Fix sorting. 2015-12-11 18:31:15 +01:00
James Cole c38ae09735 Negative expenses, as per #129 2015-12-11 18:30:28 +01:00
James Cole 28c3cfe084 Fix display of amount. See issue #129 2015-12-11 18:15:37 +01:00
James Cole 4a2823bcba Reverse sort. 2015-12-11 18:05:07 +01:00
James Cole 18eba02026 Expanded report for categories. 2015-12-11 18:03:13 +01:00
James Cole d4690ce580 Fix date in budget report 2015-12-11 17:54:52 +01:00
James Cole a785c450b1 First attempt at including a budget report. 2015-12-11 17:53:17 +01:00
James Cole 7480dc4a19 Fix a query. 2015-12-11 16:39:33 +01:00
James Cole ad01891a67 First attempt at including expense report. 2015-12-11 16:36:40 +01:00
James Cole 67fe35d564 Small query fix. 2015-12-11 11:32:22 +01:00
James Cole 7f19b6957a Expanded new report a bit. Mainly copy/paste work. Will have to see how it pans out. 2015-12-11 09:39:17 +01:00
James Cole 0a54caf202 Tweak more translations. 2015-12-11 08:48:07 +01:00
James Cole 4b4c1c7f8f Moved some translations to see if they will still be picked up by Laravel. 2015-12-11 08:40:45 +01:00
James Cole 90e696f82c Period is a month 2015-12-07 14:42:28 +01:00
James Cole 958fcd1cfa Report IP address 2015-12-07 14:41:04 +01:00
James Cole 8f57c7dcb3 Some fixes to amounts. 2015-12-06 13:17:00 +01:00
James Cole 77262f52a4 First functional view of default report. 2015-12-06 13:11:43 +01:00
James Cole 16bfbc8a12 Some JS to process the report form beforehand. 2015-12-06 08:42:04 +01:00
James Cole 1fd375b875 Better redirect after logout. 2015-12-05 17:45:33 +01:00
James Cole 46131ad39d Updated view for new reports. 2015-12-04 06:57:08 +01:00
James Cole 0b5c5b2ae9 Some mediocre Javascript for report thing. 2015-12-04 06:56:59 +01:00
James Cole 55be174037 Method to find an account. 2015-12-04 06:56:45 +01:00
James Cole a17b7025f1 New function to build URL report. 2015-12-04 06:56:35 +01:00
James Cole 170cf7fd77 New routes for new reports. 2015-12-04 06:56:03 +01:00
James Cole 23cdb4d326 Expand month list for new reports. 2015-12-04 06:55:54 +01:00
James Cole cbbe529572 Show bill if one is connected. 2015-12-04 06:16:19 +01:00
James Cole 0b382426e9 First experimental report generator / choice thing. 2015-12-03 14:52:10 +01:00
James Cole 1cbbf9baa4 Added a missing translation. 2015-12-03 11:46:05 +01:00
James Cole 8d41ff7b79 Prev should be next. Duh. 2015-12-03 11:41:06 +01:00
James Cole e3b6057bf8 Catch Swift exceptions and do a log only (instead of crashing) because the email message isn't actually critical. 2015-12-03 11:30:43 +01:00
James Cole 66a4042cad Updated composer file. 2015-12-03 11:25:12 +01:00
James Cole 56c08d8302 Can block certain domains from registering, such as ten-minute-mail services. Two example domains provided in configuration. 2015-12-03 11:17:48 +01:00
James Cole d4e759754d Make password reset impossible for blocked users. 2015-12-02 13:28:11 +01:00
James Cole a96e171cbf Update composer. 2015-12-02 13:26:58 +01:00
James Cole bd4a8c8397 Fixed "under" column 2015-12-02 09:03:34 +01:00
James Cole 04f71b3b43 Removed old code. 2015-12-02 09:01:40 +01:00
James Cole d124de51db Shouldn't be like this? 2015-12-02 09:00:28 +01:00
James Cole d87d12a0f5 Better query. See if works. 2015-12-02 08:58:40 +01:00
James Cole f2b08346d0 Log. 2015-12-02 08:50:28 +01:00
James Cole d3682a6727 Another fix in reports. 2015-12-02 08:46:03 +01:00
James Cole 371bbd9508 Some cosmetic fixes to reports 2015-12-02 08:44:23 +01:00
James Cole a8a28f442f Also show "zero" amounts. 2015-12-02 08:38:57 +01:00
James Cole 65ddd8a736 One 'equals' sign too many! 2015-12-02 08:37:35 +01:00
James Cole 8bb27de233 More report subtleties. 2015-12-02 08:37:08 +01:00
James Cole 37e2f097ba To make budget report more clear, add spent amount to "spent" column. 2015-12-02 08:35:15 +01:00
James Cole 1966d87ce6 Small formatting fixes in reports. 2015-12-02 08:33:22 +01:00
James Cole 7b8c86e1e3 Only get active piggy banks. 2015-12-02 08:25:38 +01:00
James Cole 96836e2d6c Update read me. 2015-11-28 16:04:30 +01:00
James Cole 8a9d576f61 Allow change to default currency. issue #121 2015-11-22 11:30:06 +01:00
James Cole 791d12fbb4 Fix for issue #123 2015-11-22 11:25:15 +01:00
James Cole d1329be2fa Bill scan routine should not grab transfers and income. 2015-11-20 20:13:10 +01:00
James Cole 3ed6561702 Updated all packages. 2015-11-13 07:16:23 +01:00
James Cole 0fe682bfe6 Merge branch 'release/3.5.3' into develop 2015-11-13 07:01:29 +01:00
James Cole 0f685e8789 New version. 2015-11-13 07:01:14 +01:00
James Cole 420771c233 New translations. See issue #117 2015-11-13 07:00:30 +01:00
James Cole 5e3e9271ca Added encryption to new password. See issue #118 2015-11-13 06:59:08 +01:00
James Cole 03e1673e92 Fix login message. 2015-11-01 08:06:51 +01:00
James Cole 9f992f003d Fix redirect loop. 2015-11-01 08:03:41 +01:00
James Cole f50244a41f Merge branch 'release/3.5.2' into develop 2015-10-30 07:23:43 +01:00
James Cole af107ad5e8 New release. 2015-10-30 07:23:33 +01:00
James Cole 8926d62165 Remake of: Merge pull request #111 from colinodell/patch-1 
Loosen league/commonmark version
 2015-10-30 07:22:39 +01:00
James Cole 45344ee347 Fixed a bug where budget chart would come up negative on overspent amounts. 2015-10-30 07:16:15 +01:00
James Cole 2c966a1234 Fixed ambiguous column. 2015-10-19 15:21:17 +02:00
James Cole 143ea69c0d Fixed the fix (fixeption). 2015-10-19 15:20:18 +02:00
James Cole 8a02ead013 Blind validator update. 2015-10-19 15:16:30 +02:00
James Cole 930d5ab941 Better fix. 2015-10-17 21:15:16 +02:00
James Cole e54a56d3a8 Experimental chart fix. 2015-10-17 21:14:25 +02:00
James Cole f5216c0d85 Fixed absolute uri 2015-10-05 20:30:57 +02:00
James Cole ebc77540b9 Fix some reports. 2015-10-03 22:49:12 +02:00
James Cole 28d2583c10 Remove multiplication. 2015-10-03 22:34:25 +02:00
James Cole b0988a7b00 Fix zero division. 2015-10-03 22:32:36 +02:00
James Cole 2c4920db2d Fix amount thing. 2015-10-03 22:31:55 +02:00
James Cole 8321663815 Some amount fixes. 2015-10-03 22:29:34 +02:00
James Cole ac0280d460 Fixed some amounts. 2015-10-03 22:23:42 +02:00
James Cole ba6f4268f0 Get correct fields. 2015-10-03 17:55:08 +02:00
James Cole 0bd18f94ac Fix ambiguous id. 2015-10-03 17:54:15 +02:00
James Cole 66fb63661f Less journals. 2015-10-03 17:53:13 +02:00
James Cole d9b16beb0a Added some debug. 2015-10-03 17:51:13 +02:00
James Cole 6a01a9bdfd Fix bill scan. 2015-10-01 07:48:50 +02:00
James Cole b81b34a706 Fixed amount in bill chart. 2015-10-01 07:46:47 +02:00
James Cole 3750a00b5f Fix amount, make it positive. 2015-09-30 19:43:02 +02:00