James Cole
|
4a95bdd8ba
|
Added temporary debug to google chart.
|
2015-04-10 07:25:24 +02:00 |
|
James Cole
|
db5d94d956
|
Added temporary debug entries.
|
2015-04-10 07:19:45 +02:00 |
|
James Cole
|
06f2e34bb5
|
Renamed the amount variable so it stops interfering with another variable
|
2015-04-10 06:57:39 +02:00 |
|
James Cole
|
2ef7a01945
|
Fixed a bug where the bill chart and boxes would inaccurately reflect the amount of bills yet to pay.
|
2015-04-10 06:52:36 +02:00 |
|
James Cole
|
d3f642551d
|
Fixed a small bug in the bill-chart and simplified yet another Json box.
|
2015-04-09 21:36:58 +02:00 |
|
James Cole
|
490997157e
|
Switched two queries around.
|
2015-04-09 21:30:35 +02:00 |
|
James Cole
|
2432af7883
|
Simplified the in and out-box.
|
2015-04-09 21:29:58 +02:00 |
|
James Cole
|
7abeece3f0
|
Simplified the "out"-box.
|
2015-04-09 21:27:35 +02:00 |
|
James Cole
|
3851652821
|
Renamed various fields from 'amount' to 'queryAmount' to prevent interfering with the getAmountAttribute property.
|
2015-04-09 21:18:18 +02:00 |
|
James Cole
|
37f40d8637
|
Renamed various fields from 'amount' to 'queryAmount' to prevent interfering with the getAmountAttribute property.
|
2015-04-09 21:14:15 +02:00 |
|
James Cole
|
0224d1d59b
|
Accidentally commented out date limits in query.
|
2015-04-09 21:01:08 +02:00 |
|
James Cole
|
587b94153d
|
Removed some foreach() routines that are no longer necessary now that getAmountAttribute() exists.
|
2015-04-09 20:58:57 +02:00 |
|
James Cole
|
5124ce0302
|
Fixed a bug where getAmountAttribute would interfere with queries that contained a "amount"-field.
|
2015-04-09 20:52:47 +02:00 |
|
James Cole
|
950c4045b0
|
Fix total savings to accurately reflect end of current period.
|
2015-04-09 19:10:24 +02:00 |
|
James Cole
|
9c8ba66873
|
Order categories by name.
|
2015-04-09 17:54:24 +02:00 |
|
James Cole
|
25d1d1be1b
|
Merge pull request #72 from vbali/feature/savings-total
Add savings total for savings widget on dashboard
|
2015-04-09 17:47:24 +02:00 |
|
James Cole
|
339c352505
|
Fixed a bug where categories would be created even though they already existed.
|
2015-04-09 17:46:47 +02:00 |
|
Balazs Varkonyi
|
c587081fe4
|
Add savings total for savings widget on dashboard
|
2015-04-09 11:52:35 +02:00 |
|
James Cole
|
8f9b1b866b
|
Included full home controller tests.
|
2015-04-07 20:54:43 +02:00 |
|
James Cole
|
ff5ecf6182
|
More tests.
|
2015-04-07 19:58:49 +02:00 |
|
James Cole
|
f10f5d30bf
|
Mock previously unmocked calls.
|
2015-04-07 18:48:34 +02:00 |
|
James Cole
|
0d336727e8
|
Automated code cleanup.
|
2015-04-07 18:26:14 +02:00 |
|
James Cole
|
bf354275b3
|
Some general cleaning up.
|
2015-04-07 18:25:21 +02:00 |
|
James Cole
|
1932bf277a
|
More tests
|
2015-04-07 17:51:22 +02:00 |
|
James Cole
|
701efb943d
|
Lots of new tests.
|
2015-04-07 10:14:10 +02:00 |
|
James Cole
|
c907cb4cf1
|
General cleanup and new (incomplete) tests.
|
2015-04-06 09:15:59 +02:00 |
|
James Cole
|
8475757716
|
Removed iconv() commented code. See other commit.
|
2015-04-05 21:14:41 +02:00 |
|
James Cole
|
8601428c4c
|
Fixed a bug in the form request that wouldn't accept fairly long names.
|
2015-04-05 21:12:54 +02:00 |
|
James Cole
|
59998573ee
|
Removed iconv thing that doesn't seem to matter. See screenshot at https://imgur.com/8r26ZZu
|
2015-04-05 21:12:31 +02:00 |
|
James Cole
|
293cd72001
|
Add currency tests.
|
2015-04-05 20:47:19 +02:00 |
|
James Cole
|
22ab9ebb2f
|
Included tests for the category controller.
|
2015-04-05 19:43:20 +02:00 |
|
James Cole
|
9136e592d3
|
Included bill controller.
|
2015-04-05 18:20:06 +02:00 |
|
James Cole
|
8204e46086
|
Removed inspiring quotes.
|
2015-04-05 10:38:53 +02:00 |
|
James Cole
|
9e365d9f80
|
Mar tests.
|
2015-04-05 10:36:28 +02:00 |
|
James Cole
|
6b40a933e9
|
And.. completed the account controller.
|
2015-04-04 22:53:49 +02:00 |
|
James Cole
|
5d505f4ed0
|
Fixed more tests but the factories are not perfect yet.
|
2015-04-04 21:23:37 +02:00 |
|
Balazs Varkonyi
|
28216cbcb5
|
Removed merge conflict from CategoryController
|
2015-04-04 01:56:19 +02:00 |
|
Balazs Varkonyi
|
67fafdeef7
|
Return the new account from firstOrCreateEncrypted
|
2015-04-04 01:36:55 +02:00 |
|
Balazs Varkonyi
|
fd5f075f63
|
Chart fix for accounts with accented letters
|
2015-04-04 01:31:57 +02:00 |
|
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
|
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
|
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
|
720926c50d
|
Tests now run without a database, as they should.
|
2015-04-03 07:33:18 +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
|
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
|
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
|
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
|
c4312c0b11
|
Extra large code cleanup.
|
2015-03-30 20:08:27 +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
|
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
|
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
|
d5c39d54d8
|
Merge branch 'release/3.3.5'
|
2015-03-29 08:43:54 +02:00 |
|
James Cole
|
a7501c396f
|
Renamed some methods.
|
2015-03-29 08:24:56 +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
|
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
|
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
|
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
|
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 |
|
James Cole
|
38beb7f8d2
|
Fallback.
|
2015-03-27 19:42:35 +01:00 |
|
James Cole
|
45bced7b34
|
Hide accounts with no activity during a year.
|
2015-03-27 19:34:37 +01:00 |
|
James Cole
|
ea4f7f79ce
|
Removed more references.
|
2015-03-27 18:17:15 +01:00 |
|
James Cole
|
b17f8ac311
|
Removed references to repeated expenses.
|
2015-03-27 18:15:10 +01:00 |
|
James Cole
|
6870d13b72
|
Removed repeated expenses.
|
2015-03-27 18:14:17 +01:00 |
|
James Cole
|
81fa304fd2
|
Removed repeated expenses.
|
2015-03-27 18:13:53 +01:00 |
|
James Cole
|
f7969afc22
|
Hide accounts with no activity in budget report.
|
2015-03-27 13:36:33 +01:00 |
|
James Cole
|
52ce4cd313
|
Resort array.
|
2015-03-27 13:25:46 +01:00 |
|
James Cole
|
12542d8f63
|
Auto fill transaction descriptions.
|
2015-03-27 13:16:14 +01:00 |
|
James Cole
|
fcc22c692a
|
Merge branch 'release/3.3.3'
|
2015-03-27 09:36:03 +01:00 |
|
James Cole
|
2288e3705a
|
Fixed order view.
|
2015-03-27 09:29:14 +01:00 |
|
James Cole
|
e8b58154e0
|
Bug fix.
|
2015-03-27 09:24:26 +01:00 |
|
James Cole
|
4393475af3
|
Remove debug.
|
2015-03-27 09:22:08 +01:00 |
|
James Cole
|
3fc560597c
|
Validation bug.
|
2015-03-27 09:21:09 +01:00 |
|
James Cole
|
a83fe2caea
|
Correct ordering (everywhere).
|
2015-03-27 07:32:06 +01:00 |
|
James Cole
|
30c5376217
|
Fix order.
|
2015-03-27 07:29:01 +01:00 |
|
James Cole
|
6dddd6629d
|
Thing with order and should fix Travis.
|
2015-03-27 07:20:32 +01:00 |
|
James Cole
|
544ffca3a5
|
Sortable transactions.
|
2015-03-26 22:52:49 +01:00 |
|
James Cole
|
e0730c7b39
|
Fixed double named accounts.
|
2015-03-26 18:05:23 +01:00 |
|
James Cole
|
3d59d141c4
|
Push!
|
2015-03-26 17:46:08 +01:00 |
|
James Cole
|
ccddc2623d
|
Merge branch 'develop' of github.com:JC5/firefly-iii into develop
|
2015-03-26 17:45:58 +01:00 |
|
James Cole
|
fcc47b58b4
|
Return to edit / create screen when user indicates.
|
2015-03-26 17:45:03 +01:00 |
|
James Cole
|
f67ac2e25e
|
Update AccountController.php
|
2015-03-26 14:50:49 +01:00 |
|
James Cole
|
26127c9ccf
|
Update AccountController.php
|
2015-03-26 14:49:02 +01:00 |
|
James Cole
|
d624efa799
|
Fix registration bug.
|
2015-03-25 22:30:36 +01:00 |
|
James Cole
|
ed3d40a4e0
|
Whoops.
|
2015-03-25 22:29:32 +01:00 |
|
James Cole
|
ab851b1be4
|
Fixed transfers
|
2015-03-25 17:44:06 +01:00 |
|
James Cole
|
a867b60af0
|
Update CategoryController.php
|
2015-03-25 16:14:28 +01:00 |
|
James Cole
|
26eafb0bd2
|
Update CategoryController.php
|
2015-03-25 16:13:39 +01:00 |
|
James Cole
|
0dbe44764b
|
Update GoogleChartController.php
|
2015-03-25 16:00:06 +01:00 |
|
James Cole
|
2159df6802
|
Update GoogleChartController.php
Fixed chart.
|
2015-03-25 15:58:37 +01:00 |
|
James Cole
|
23389b9f17
|
Update FireflyValidator.php
Update uniqueForUser.
|
2015-03-25 15:56:32 +01:00 |
|
James Cole
|
6d3e3b894a
|
Update AccountFormRequest.php
Update rules to include belongsToUser.
|
2015-03-25 15:55:39 +01:00 |
|
James Cole
|
55340aefa3
|
Remove code.
|
2015-03-24 21:06:45 +01:00 |
|
James Cole
|
94bc751e41
|
Sum starts at 0.
|
2015-03-24 21:05:15 +01:00 |
|
James Cole
|
89259c11e2
|
Fix chart.
|
2015-03-24 21:04:53 +01:00 |
|
James Cole
|
6bbaf1523c
|
Fixed a bug in relevantOnDate
|
2015-03-24 21:00:42 +01:00 |
|
James Cole
|
fa3f18b60f
|
Expand log for event.
|
2015-03-24 20:56:58 +01:00 |
|
James Cole
|
3dc794002f
|
This should catch the missing piggy bank events.
|
2015-03-24 20:54:25 +01:00 |
|
James Cole
|
f50b133f2e
|
Cleaned up some icons, improved routine for repeated expenses.
|
2015-03-21 21:33:52 +01:00 |
|
James Cole
|
c913de3c8b
|
Fix percentage.
|
2015-03-21 08:56:24 +01:00 |
|
James Cole
|
bbc7b54a38
|
Catch 0 start balance.
|
2015-03-21 08:55:55 +01:00 |
|
James Cole
|
05fa1b40d1
|
Support > 100%
|
2015-03-21 08:53:43 +01:00 |
|
James Cole
|
6a88c8634d
|
Added a block with savings.
|
2015-03-21 08:51:34 +01:00 |
|
James Cole
|
c259a46ed3
|
Clean up sql codes.
|
2015-03-20 22:39:07 +01:00 |
|