Commit Graph

11847 Commits

Author SHA1 Message Date
James Cole
00dee03709
Update version again. 2019-08-02 21:21:38 +02:00
James Cole
ca9f8b56f7
Merge tag '4.7.17.5' into develop
4.7.17.5

# Conflicts:
#	resources/views/v1/transactions/convert.twig
2019-08-02 20:59:57 +02:00
James Cole
ece0c99dbb Merge branch 'hotfix/4.7.17.5' 2019-08-02 20:59:23 +02:00
James Cole
b217acfe26
New version + correct credits. 2019-08-02 20:59:06 +02:00
James Cole
15d4d185bb
Fix #2363 2019-08-02 20:57:36 +02:00
James Cole
3435cb937c
Merge tag '4.7.17.4' into develop
4.7.17.4

# Conflicts:
#	config/firefly.php
#	resources/views/v1/transactions/convert.twig
2019-08-02 17:10:55 +02:00
James Cole
c9f4cf4f34 Merge branch 'hotfix/4.7.17.4' 2019-08-02 17:08:34 +02:00
James Cole
1b3d3de969
Update version. 2019-08-02 17:08:24 +02:00
James Cole
e80d616ef4
Fix #2367 2019-08-02 17:05:54 +02:00
James Cole
2ddf48f15c
Fix #2366 2019-08-02 16:46:45 +02:00
James Cole
692b256f3f
Fix #2365 2019-08-02 16:44:48 +02:00
James Cole
3ad4e04e2a
Fix #2364 2019-08-02 16:43:36 +02:00
James Cole
427de0594d
Fix #2363 2019-08-02 16:42:16 +02:00
James Cole
6ac08de71d
First steps for reconciliation fix. 2019-08-02 16:31:36 +02:00
James Cole
494f783a2b
Fix #2333 2019-08-02 08:28:51 +02:00
James Cole
59801b8bc1
Fix #2332 2019-08-02 05:49:20 +02:00
James Cole
3dbde59787
Fix #2331 2019-08-02 05:44:51 +02:00
James Cole
ac903b88ba
Fix search 2019-08-02 05:32:30 +02:00
James Cole
fc70afa3ea
Improve test coverage. 2019-08-02 05:25:24 +02:00
James Cole
4bd8e1b11e
Fix #2328 2019-08-02 05:24:51 +02:00
James Cole
04bf92d946
Fix #2188 2019-08-01 21:07:40 +02:00
James Cole
eb2ee0c683
Extend cases for #2179 2019-08-01 17:19:32 +02:00
James Cole
324e0e7e30
Fix #2361 2019-08-01 17:17:26 +02:00
James Cole
81dce5d7c7
Fix #2179 2019-08-01 06:22:07 +02:00
James Cole
b049ca27f1
Improve test coverage. 2019-08-01 06:21:44 +02:00
James Cole
9b574ce7ad
Improve test coverage. 2019-07-31 16:53:09 +02:00
James Cole
5524941c90
Update rule handling and views. 2019-07-27 15:01:13 +02:00
James Cole
67c0ef6ec6
Improve test coverage. 2019-07-27 13:54:06 +02:00
James Cole
d94d34ca63
Expand test coverage. 2019-07-26 17:48:24 +02:00
James Cole
6ff4a0b45c
Improve test coverage. 2019-07-25 14:19:49 +02:00
James Cole
ee95606ec0
Improve test coverage. 2019-07-24 19:02:41 +02:00
James Cole
226e2f7185
Improve test coverage. 2019-07-23 17:33:23 +02:00
James Cole
1e7e0facf1
Improve test coverage. 2019-07-22 19:23:14 +02:00
James Cole
b7a4b0fdfd
Refactored a lot of tests. 2019-07-21 17:15:06 +02:00
James Cole
5242c0368b
Fixes #2153 2019-07-21 06:02:02 +02:00
James Cole
8f9ba21f4d
Fix test coverage. 2019-07-20 22:32:40 +02:00
James Cole
58d370a893
Fix #1860 2019-07-20 22:32:32 +02:00
James Cole
3b8e95fcca
Fix #1652 2019-07-20 16:48:35 +02:00
James Cole
889b7e9a18
Improve mass controller and test controllers. 2019-07-20 16:02:50 +02:00
James Cole
6d34cfb940
Implemented new link thing. 2019-07-20 06:47:34 +02:00
James Cole
63832b31f8
Improve test coverage 2019-07-20 06:22:37 +02:00
James Cole
4de537ce76
New code for edit transaction, and some tests. 2019-07-19 16:08:42 +02:00
James Cole
a42992efb0
Merge tag '4.7.17.3' into develop
4.7.17.3

# Conflicts:
#	changelog.md
#	config/firefly.php
2019-07-16 19:24:07 +02:00
James Cole
7d482aa24c Merge branch 'hotfix/4.7.17.3' 2019-07-16 19:22:58 +02:00
James Cole
a9f34e9dd1
Update version. 2019-07-16 19:22:45 +02:00
James Cole
f795cb07e1
Fixes #2339 2019-07-16 19:22:35 +02:00
James Cole
17a66b3056
Fixes #2337 2019-07-16 19:22:14 +02:00
James Cole
531161db09
Fixes #2338 2019-07-16 19:21:58 +02:00
James Cole
2772a1bb3b
Now supports file uploads 2019-07-15 21:00:35 +02:00
James Cole
0263e2b720
Remove unused extension. 2019-07-15 19:27:03 +02:00