Commit Graph

1806 Commits

Author SHA1 Message Date
James Cole
e82deddefb Merge branch 'release/4.6.2' 2017-07-08 09:55:44 +02:00
James Cole
5ef2067836
Some code cleanup. 2017-07-08 06:28:44 +02:00
James Cole
de9728895e
Fixed #658 2017-07-08 06:09:17 +02:00
James Cole
19774f32c2
First code for #658 2017-07-07 17:51:14 +02:00
James Cole
e62b979708
Fix redirect error [skip ci] 2017-07-07 16:53:44 +02:00
James Cole
69eef30ad3
Various code clean up. 2017-07-07 13:50:15 +02:00
James Cole
71a41bc00d
Add newlines [skip ci] 2017-07-07 08:09:42 +02:00
James Cole
3a84591e61
Simplify edit transaction routine. 2017-07-04 16:31:16 +02:00
James Cole
803a008821
Improve bread crumbs 2017-07-02 09:24:11 +02:00
James Cole
1eed142423
Small display bug related to #648 2017-07-01 10:29:07 +02:00
James Cole
f8fa5f1ba5
Improved mobile response, issue #678 2017-06-30 07:17:25 +02:00
James Cole
506509b1b2
Fix #677 2017-06-26 18:29:45 +02:00
James Cole
04a8a0e6a1
Code clean up 2017-06-24 13:04:41 +02:00
James Cole
5fbc319b20
This fixes the tests (must still upload test database). 2017-06-24 12:38:24 +02:00
James Cole
8e3ba7caf2
Fix various import bugs. 2017-06-24 08:37:09 +02:00
James Cole
e525e673a8
Import routine cleanup. 2017-06-24 06:57:24 +02:00
James Cole
445dbf8779
More and improved code for the import routine. 2017-06-24 05:49:33 +02:00
James Cole
edb355941c
More code for import routine. 2017-06-22 21:50:10 +02:00
James Cole
a905cce2c9
Expand import routine. 2017-06-20 21:04:25 +02:00
James Cole
b9f110ac2b
Refactor and rename some import things. 2017-06-17 22:49:44 +02:00
James Cole
7cc24417b3
Expanded import routine. 2017-06-14 20:13:19 +02:00
James Cole
77244f4e2c
Lots of new code for new importer routine. 2017-06-12 19:12:07 +02:00
James Cole
8beab5f5bc
Fix #672 2017-06-12 17:21:31 +02:00
James Cole
091596e80e
Lots of new code for new importer routine. 2017-06-10 15:09:41 +02:00
James Cole
0b4efe4ae1
Small typo in chart. [skip ci] 2017-06-09 12:53:31 +02:00
James Cole
b48de98865
Fix a bug where the balance routine forgot to account for accounts without a currency preference. 2017-06-08 10:35:02 +02:00
James Cole
935fb015d3
Live update budget amounts. 2017-06-07 11:58:04 +02:00
James Cole
92c5cabd70
Try to untangle complex repositories 2017-06-07 08:18:42 +02:00
James Cole
e5db5a7b5c
Various code clean up. 2017-06-07 07:38:58 +02:00
James Cole
9d5d1c0a41
Updated budget view. 2017-06-06 20:35:39 +02:00
James Cole
a8ec4fe2fd
New interface for budget overview. 2017-06-06 19:30:31 +02:00
James Cole
17b6cc43d5
Fix display of foreign currencies in charts. 2017-06-05 22:11:54 +02:00
James Cole
c4039b53e6
Various code cleanup. 2017-06-05 11:12:50 +02:00
James Cole
64831b4c86
Code cleanup and refactoring. 2017-06-05 08:31:22 +02:00
James Cole
a487c7b4b2
Make sure amounts are formatted, and fixed some issues. 2017-06-04 23:39:26 +02:00
James Cole
82e74a2afd
Big update to properly support multi currencies. 2017-06-04 13:39:16 +02:00
James Cole
c05f344371
Code clean up [skip ci] 2017-06-02 13:00:09 +02:00
James Cole
8cdc1f0014
Rename several twig files. 2017-06-02 12:59:14 +02:00
James Cole
01fedc0bf8
Fix for #593, as inspired by @nhaarman. 2017-06-02 06:45:38 +02:00
James Cole
17fb6983d8
Fix issue #637 with cash accounts. 2017-05-07 19:45:40 +02:00
James Cole
5fb73bdb01
Fix bug #642 2017-05-07 19:24:53 +02:00
James Cole
870d8b5008
No prefix key, issue #624 2017-05-03 21:12:49 +02:00
James Cole
98f84c2c37
Introducing filters to the journal collector. 2017-04-29 08:22:56 +02:00
James Cole
dc5215e41e
Update tests. 2017-04-28 20:17:10 +02:00
James Cole
7e11691ea4
Update code to work with filters. 2017-04-28 20:08:25 +02:00
James Cole
1a5617d430
Fixes a bug in the new user handler [skip ci] 2017-04-27 02:56:57 +02:00
James Cole
662f398b08
Update tests. 2017-04-23 18:53:00 +02:00
James Cole
8ef9223d84
Final code for #595 2017-04-23 09:33:33 +02:00
James Cole
beb358f8ee
Small code optimisation. 2017-04-22 07:05:44 +02:00
James Cole
e3cd11ec2e
Various code coverage and test related fixes. 2017-04-22 07:05:31 +02:00
James Cole
ee08fc2421
All “all” views are now consistent #595 2017-04-22 07:04:39 +02:00
James Cole
ae30f7920b
Fix bread crumbs for tags. 2017-04-19 17:11:07 +02:00
James Cole
7867f26120
Improve report sums. 2017-04-17 08:31:42 +02:00
James Cole
e48eb2ce2f
Clean up account taker amount inconsistencies. 2017-04-16 22:15:05 +02:00
James Cole
20a30a2d1d
Various cosmetic fixes for /all lists [skip ci] 2017-04-16 12:51:21 +02:00
James Cole
209a907c61
Account chart can display multiple currencies. 2017-04-15 17:26:03 +02:00
James Cole
490733bdd1
Some javascript clean up 2017-04-15 07:25:09 +02:00
James Cole
a27f5d2474
Can now create transfers with different currencies. 2017-04-14 22:25:48 +02:00
James Cole
ea3fdb0668
Clean up and consistency in foreign and native amounts. 2017-04-14 15:42:54 +02:00
James Cole
bd917f6484
Deposit works as well. 2017-04-14 14:48:44 +02:00
James Cole
c33dd1ecee
Can now handle withdrawals in foreign currency. 2017-04-14 14:37:04 +02:00
James Cole
7e31a29b12
FF3 will now correctly store exchanged / foreign amounts. 2017-04-14 11:19:09 +02:00
James Cole
9a69ce309e
Initial user ability to set foreign currency 2017-04-14 10:16:52 +02:00
James Cole
adb16e4560
Also make sure that the account create screen sets the correct currency id. 2017-04-14 07:32:30 +02:00
James Cole
953c38563b
Make sure that accounts and their opening balance values are the same currency. 2017-04-14 07:11:30 +02:00
James Cole
605a718418
Turns out open exchange rates is useless. 2017-04-13 21:19:00 +02:00
James Cole
994542c75d
First basic code for currency exchange rate routines. 2017-04-13 20:47:59 +02:00
James Cole
8db96025a3
Code cleanup. 2017-04-09 07:56:46 +02:00
James Cole
595596d73f
Apparently this is changed in PHPStorm’s formatting templates so there you go [skip ci]. 2017-04-09 07:44:22 +02:00
James Cole
6cafb91680
This fixes #629 2017-04-08 19:05:37 +02:00
James Cole
6765f08b07
Fixed some tests. [skip ci] 2017-04-08 10:20:34 +02:00
James Cole
fd01b54a14
Code for charts #628 [skip ci] 2017-04-08 09:18:04 +02:00
James Cole
4fd33f19c6
Experimental code for #628 2017-04-08 09:00:37 +02:00
James Cole
01ae278f09
Float > intval. [skip ci] 2017-04-08 08:53:53 +02:00
James Cole
4e44733dcc
Updated code for #624 2017-04-08 06:51:16 +02:00
James Cole
dd1d7bb02a
Should fix issue #624 2017-04-01 08:56:39 +02:00
James Cole
6f933b3bd1
Small updates. 2017-04-01 08:13:43 +02:00
James Cole
ea984281b0
Should fix tests. 2017-03-30 18:42:02 +02:00
James Cole
5920ccee04
Various code cleanup. 2017-03-29 21:20:54 +02:00
James Cole
5770edcde2
Expanded test coverage. 2017-03-25 13:41:17 +01:00
James Cole
1fb0a64f31
Various code cleanup [skip ci] 2017-03-24 15:15:12 +01:00
James Cole
fe66d089ad
Expanded test coverage. 2017-03-24 15:01:53 +01:00
James Cole
222b3008d5
Expanded test coverage. 2017-03-24 11:07:38 +01:00
James Cole
6fe319702d
Expand test coverage. Remove else-statement. 2017-03-22 17:02:15 +01:00
James Cole
32c89f9a98
Expand category view. 2017-03-22 17:00:01 +01:00
James Cole
37f78985ae Update AccountController.php 2017-03-21 08:17:27 +01:00
James Cole
34ac9bc71a Update AccountController.php 2017-03-21 08:15:21 +01:00
James Cole
9515ce6807
Expand tests. 2017-03-19 17:54:21 +01:00
James Cole
1adb0f2f0e
Improve test coverage. 2017-03-18 20:53:44 +01:00
James Cole
282ce041e1
Code cleanup for #595 2017-03-18 11:02:02 +01:00
James Cole
3215c4ee4b
Expand code and some refactoring for #595 2017-03-18 08:09:14 +01:00
James Cole
edafd16c75
Bread crumbs for #595 2017-03-18 07:46:57 +01:00
James Cole
c62e3dcb78
Code for #595 2017-03-18 07:46:42 +01:00
James Cole
e2f3788ff5
Expand tests. 2017-03-17 16:34:57 +01:00
James Cole
2db8d25038
This should fix tests 2017-03-16 20:46:18 +01:00
James Cole
e53d294c1c
Expand tests. 2017-03-12 21:24:34 +01:00
James Cole
b67dfeced2
Expand tests. 2017-03-12 09:22:33 +01:00
James Cole
8f14c78ba1
Expand some tests. 2017-03-11 22:28:51 +01:00
James Cole
4abc271805
Implemented #595 for transactions. 2017-03-11 07:41:26 +01:00
James Cole
9dd2f447cc
Fix in date range [skip ci] 2017-03-10 19:36:22 +01:00
James Cole
ecbd7ca95b
Also implement #595 for the no-cat view. 2017-03-10 19:34:46 +01:00
James Cole
0c52d54d7d
Optimized some views and fixed tests for #595 2017-03-10 18:54:50 +01:00
James Cole
ebc712f6b5
Consistency for #595 2017-03-10 16:08:58 +01:00
James Cole
ef0057d88d
Add opposing account info [skip ci] #595 2017-03-10 15:28:04 +01:00
James Cole
a8fdfdd5e0
Add opposing account info [skip ci] #595 2017-03-10 15:27:19 +01:00
James Cole
db6e6dfe4a
Fix tests for #595 2017-03-09 21:05:37 +01:00
James Cole
61007a95a6
Initial code for #595, transactions with no budget 2017-03-09 20:54:18 +01:00
James Cole
0e59f7433c
Code and tests for #615 2017-03-09 08:19:05 +01:00
James Cole
176c44e2b9
Remove newline [skip ci] 2017-03-08 20:38:08 +01:00
James Cole
8e5ec79097
Wrote new tests. 2017-03-05 18:15:38 +01:00
James Cole
2fbeaaccd3
Expand tests. 2017-03-05 13:21:36 +01:00
James Cole
57fb75bef4
Fix for #611 [skip ci] 2017-03-05 12:19:12 +01:00
James Cole
e5a2e1a8c7
Updated tests 2017-03-05 11:18:34 +01:00
James Cole
884d6c59a2
Expand some tests. 2017-03-04 19:14:36 +01:00
James Cole
c206a95d55
Improved various tests. 2017-03-04 15:29:20 +01:00
James Cole
8b4ef4e2da
Fix for #610 2017-03-04 13:08:16 +01:00
James Cole
9d22bbee1c
Add code coverage ignore instructions. 2017-03-04 11:19:44 +01:00
James Cole
45f4395f26
Large commit to get rid of a lot of static methods. 2017-03-04 07:26:03 +01:00
James Cole
d9aa074330
Large commit to get rid of a lot of static methods. 2017-03-04 07:18:35 +01:00
James Cole
8fb6c1a0c8
Various small changes. 2017-03-03 18:19:25 +01:00
James Cole
2116486fe0 Various code cleanup 2017-02-25 17:39:50 +01:00
James Cole
eed8fe22c6
Make sure the loop is broken. #595 2017-02-25 13:34:44 +01:00
James Cole
79b0c20adb
Forgot about the date for account lists, #595 [skip ci] 2017-02-25 13:22:06 +01:00
James Cole
2e637031ac
Fix charts for #595, account overview. 2017-02-25 13:19:42 +01:00
James Cole
de9ef20014
First code for #595. Charts are still broken. 2017-02-25 13:13:51 +01:00
James Cole
8c6972d12d
Various code cleanup. 2017-02-25 05:57:01 +01:00
James Cole
40c38af766
Final code for tag report. 2017-02-24 21:09:20 +01:00
James Cole
3d4feff7de
More code for the tag report. 2017-02-24 20:27:26 +01:00
James Cole
f63c6875cd
Initial code base for tag report. 2017-02-24 20:01:35 +01:00
James Cole
063ca3121a
Fixes #593 2017-02-23 17:43:29 +01:00
James Cole
563c668e3f
Code to catch empty lists and nudge user in the right direction. 2017-02-23 07:24:05 +01:00
James Cole
201db34936
Update various sandstorm files. [skip ci] 2017-02-22 21:27:39 +01:00
Joris de Vries
e211881691 Remove superfluous declaration of $date
The null check is already part of the `$this->date()` function and `$date` is never used.
2017-02-22 20:20:00 +01:00
Joris de Vries
0d32f16041 Fix saving a tag’s date
The `date` function takes the fieldname where a date is stored, not the literal date.
2017-02-22 20:07:30 +01:00
James Cole
35aeb7e04a
Update tag view 2017-02-22 17:15:54 +01:00
James Cole
5073fd937c
Expand search with a bunch of keywords for #510 2017-02-18 20:10:03 +01:00
James Cole
f0cb63fd48
Some small optimisations. 2017-02-18 09:32:10 +01:00
James Cole
f7642beb7c Better 2fa handling 2017-02-17 20:15:17 +01:00
James Cole
65a899bf25 Clean up session code 2017-02-17 20:14:22 +01:00
James Cole
5d0cdc4ffa
Various code cleanup. 2017-02-17 06:42:36 +01:00
James Cole
4ff5f526ba
Add new lines to files. 2017-02-16 22:33:32 +01:00
James Cole
8bfcc3315a
This fixes #572 2017-02-16 21:01:22 +01:00
James Cole
8f5289b7dc
Fixed some transaction list filter issues. 2017-02-15 21:55:50 +01:00
James Cole
a5f8aa914f
Build code for tag report. 2017-02-15 20:07:10 +01:00
James Cole
636b371b86 Fixes #553 2017-02-15 16:20:16 +01:00
James Cole
f0783df123
This should fix #566 2017-02-15 15:24:01 +01:00
James Cole
47aa996b6b
This fixes #567 2017-02-15 15:12:46 +01:00
James Cole
7a34536c80 Fixes #565 2017-02-13 20:39:23 +01:00
James Cole
2c36820622
New tests 2017-02-12 17:58:16 +01:00
James Cole
ec146d4cbe
Make sure the /javascript/ url’s are ignored. 2017-02-12 16:50:35 +01:00