James Cole
6bd2b4f288
Merge branch 'develop' into v480
...
* develop: (21 commits)
Update lock file
Update change logs and config files.
Enable norsk, update version of DB
Various language string updates.
Norwegian strings.
Improve installer middleware for Sandstorm.
Fix some issues with importer #2166
Other delete thing.
More debug things.
Extra debug info for #2159 and some kernel changes.
Extra debug info for #2159
Fix #2173
Rename class and add copyright statement @wrouesnel #2167
Fix LDAP auth configuration paths.
Fix some cache issues and a version bump.
Updated file list.
Updated list.
New file list.
Update composer file.
Small fix in changelog.
...
2019-03-17 12:34:36 +01:00
James Cole
c4d57af936
Merge tag '4.7.17' into develop
...
4.7.17
2019-03-17 09:40:14 +01:00
James Cole
76aa8acf0f
Merge branch 'release/4.7.17'
2019-03-17 09:40:13 +01:00
James Cole
220add3eda
Update lock file
2019-03-17 09:17:55 +01:00
James Cole
541280ee91
Update change logs and config files.
2019-03-17 09:17:07 +01:00
James Cole
01219c951c
Enable norsk, update version of DB
2019-03-17 09:14:52 +01:00
James Cole
69fa60cd21
Various language string updates.
2019-03-17 09:14:33 +01:00
James Cole
a11d2df6bb
Norwegian strings.
2019-03-17 09:13:23 +01:00
James Cole
07d39a23a8
Improve installer middleware for Sandstorm.
2019-03-17 09:06:45 +01:00
James Cole
ca67d98676
Fix some issues with importer #2166
2019-03-17 08:18:42 +01:00
James Cole
7b60d210ee
Other delete thing.
2019-03-17 07:31:12 +01:00
James Cole
78d955ebf6
More debug things.
2019-03-17 07:20:11 +01:00
James Cole
f6f21e02ac
Extra debug info for #2159 and some kernel changes.
2019-03-16 21:54:25 +01:00
James Cole
e2ebd01719
Extra debug info for #2159
2019-03-16 20:07:26 +01:00
James Cole
b8ac7c9d89
Fix #2173
2019-03-16 19:39:39 +01:00
James Cole
037d9b7017
Rename class and add copyright statement @wrouesnel #2167
2019-03-16 19:02:13 +01:00
James Cole
6462d2b87a
Merge pull request #2167 from wrouesnel/bugfix/ldapauth
...
Fix LDAP auth configuration paths.
2019-03-16 18:58:21 +01:00
James Cole
d063f32c1c
Fix some cache issues and a version bump.
2019-03-08 17:57:42 +01:00
James Cole
244d8eecab
Updated file list.
2019-03-08 07:09:45 +01:00
James Cole
b66f6d7e2e
Updated list.
2019-03-08 07:07:43 +01:00
James Cole
aa3a88f537
New file list.
2019-03-08 06:48:04 +01:00
James Cole
e5476e6e7a
Merge tag '4.7.16' into develop
...
4.7.16
2019-03-08 06:22:05 +01:00
James Cole
4d976312e8
Merge branch 'release/4.7.16'
2019-03-08 06:22:04 +01:00
James Cole
2ef5d3d4c6
Update composer file.
2019-03-08 06:11:22 +01:00
James Cole
eb3a89555d
Small fix in changelog.
2019-03-08 06:11:13 +01:00
James Cole
0a80b7fca7
New translations.
2019-03-08 06:11:05 +01:00
James Cole
431cf08401
Various improvements.
2019-03-08 05:47:51 +01:00
James Cole
e6d7c0ddbd
Merge branch 'develop' into v480
...
* develop:
Fix test for PHPUnit8
Update version and changelog.
Fix issue with bill display
Update language strings.
2019-03-06 13:43:11 +01:00
James Cole
f682981c1e
Fix test for PHPUnit8
2019-03-05 20:11:37 +01:00
James Cole
4aac969ae4
Update version and changelog.
2019-03-05 17:52:44 +01:00
James Cole
00651adf5e
Fix issue with bill display
2019-03-05 17:52:34 +01:00
James Cole
ed94e71168
Update language strings.
2019-03-05 17:52:26 +01:00
James Cole
e4fb223f77
Code for 4.8.0
2019-03-05 17:26:49 +01:00
James Cole
6e12f434ad
Fix issue #2144
2019-03-05 16:55:03 +01:00
James Cole
b8c4ec1449
Add old string under new key.
2019-03-03 08:17:19 +01:00
James Cole
4ca60ca92a
Code for upgrade of various libraries.
2019-03-02 21:18:26 +01:00
James Cole
48219c9af3
Update libraries.
2019-03-02 20:14:45 +01:00
James Cole
9887b9809d
Merge branch 'master' into develop
...
* master:
Bump version for travis build.
2019-03-02 17:36:44 +01:00
James Cole
a13ad5b417
Bump version for travis build.
2019-03-02 17:36:08 +01:00
James Cole
3f28fd689f
Merge tag '4.7.15' into develop
...
4.7.15
2019-03-02 17:17:22 +01:00
James Cole
959025545e
Merge branch 'release/4.7.15'
2019-03-02 17:17:21 +01:00
James Cole
1978463e59
Update language strings for new release.
2019-03-02 15:55:26 +01:00
James Cole
e85ac07c49
Update meta files for new release.
2019-03-02 15:55:01 +01:00
James Cole
b7f0a6fff4
Update migrations so you can always roll back.
2019-03-02 15:54:24 +01:00
James Cole
3a57e09447
Fix for #2128
2019-03-02 14:33:46 +01:00
James Cole
87d5cabe52
Search improvements.
2019-03-02 14:12:09 +01:00
James Cole
af07522f16
Fix for #2135
2019-03-02 10:42:43 +01:00
James Cole
1b8d4e4c63
Make sure bills show attachment notes
2019-03-02 09:18:41 +01:00
James Cole
9f3c114d57
Add JSON decrypt for #2125
2019-03-02 09:18:26 +01:00
James Cole
c51c1b8098
Some basic date tests
2019-03-02 08:05:15 +01:00
James Cole
143fe2a71f
Fix #2125
2019-03-01 17:56:52 +01:00
James Cole
3379b723cf
Last attempt I hope for #2125
2019-02-28 19:56:41 +01:00
James Cole
39321b320e
Improve search speed.
2019-02-27 19:08:09 +01:00
James Cole
fe738fd321
Another fix for #2125
2019-02-27 18:55:56 +01:00
James Cole
95720673d2
Merge pull request #2130 from lastlink/patch-1
...
add missing rollback for 477 migration
2019-02-26 18:33:20 +01:00
James Cole
61db419485
Fixes #2125
2019-02-25 20:57:29 +01:00
James Cole
cb17b09b24
Merge pull request #2120 from lastlink/fix/pwaApple
...
missing meta tag for ios
2019-02-25 07:23:50 +01:00
James Cole
ac26427a63
Merge branch 'master' into develop
...
* master:
Don't change ARM PHP settings.
2019-02-24 10:56:28 +01:00
James Cole
491903778a
Don't change ARM PHP settings.
2019-02-24 10:56:08 +01:00
James Cole
405c3e110a
Merge tag '4.7.14' into develop
...
4.7.14
2019-02-24 07:28:00 +01:00
James Cole
5464bfac19
Merge branch 'release/4.7.14'
2019-02-24 07:28:00 +01:00
James Cole
ad31cc1c1f
Fixes #2119 and bump version.
2019-02-24 07:27:24 +01:00
James Cole
3aa79fb1e4
Merge tag '4.7.13' into develop
...
4.7.13
2019-02-23 21:27:05 +01:00
James Cole
e3de03e50d
Merge branch 'release/4.7.13'
2019-02-23 21:27:04 +01:00
James Cole
d8b4af34e0
Update files for release 4.7.13
2019-02-23 14:32:24 +01:00
James Cole
222d8e071a
Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop
...
* 'develop' of github.com:firefly-iii/firefly-iii:
New check for journals with 0.00 amount.
2019-02-23 12:36:17 +01:00
James Cole
36c2f27d59
New check for journals with 0.00 amount.
2019-02-23 07:47:41 +01:00
James Cole
5d43faab96
Refactor script locations to clear up root directory.
2019-02-20 07:04:24 +01:00
James Cole
07048cb5fb
Fix #2100
2019-02-19 20:19:30 +01:00
James Cole
38c79c3dc4
Upgrade fix for Softaculous.
2019-02-19 19:59:02 +01:00
James Cole
7610d9e0db
Update Dockerfiles to increase PHP execution time.
2019-02-19 07:10:13 +01:00
James Cole
e4f3d0a0ea
Some new strings.
2019-02-18 19:47:48 +01:00
James Cole
fdf147d9c6
Merge branch 'hotfix/4.7.12.1'
2019-02-16 23:01:29 +01:00
James Cole
f7e418f517
Merge tag '4.7.12.1' into develop
...
4.7.12.1
2019-02-16 23:01:29 +01:00
James Cole
738f6ed232
Fix #2093
2019-02-16 23:01:14 +01:00
James Cole
12217d9850
Merge tag '4.7.12' into develop
...
4.7.12
2019-02-16 19:35:01 +01:00
James Cole
87c8b3d7c6
Merge branch 'release/4.7.12'
2019-02-16 19:35:00 +01:00
James Cole
fd571abbb0
Slight change in build script.
2019-02-16 19:33:33 +01:00
James Cole
64ae56757e
Updated meta files.
2019-02-16 19:22:16 +01:00
James Cole
7d75f00696
New translations.
2019-02-16 19:22:05 +01:00
James Cole
451c86e431
Final touches for #2085
2019-02-16 19:04:36 +01:00
James Cole
c8c71da903
Extra debug log. #2061
2019-02-16 14:27:54 +01:00
James Cole
423f3a9296
Fix build script.
2019-02-16 14:02:04 +01:00
James Cole
7658b7d9a6
Apply fix for #2070
2019-02-16 11:45:08 +01:00
James Cole
0d0906c5e2
Fix for #2070
2019-02-16 11:43:05 +01:00
James Cole
e0aa7f3ff5
Various code cleanup.
2019-02-16 08:05:48 +01:00
James Cole
59fdf5b77a
Updates to the login procedure [skip ci]
2019-02-16 07:20:25 +01:00
James Cole
e28cfade8d
Push and build stuff.
2019-02-15 17:15:42 +01:00
James Cole
19710c3eab
Update LDAP config for #2085
2019-02-15 07:39:12 +01:00
James Cole
0782354160
Updated LDAP code #2085
2019-02-15 07:22:51 +01:00
James Cole
22bc6d507e
Fix issue with upgrade.
2019-02-13 17:54:46 +01:00
James Cole
bf3c74e65f
Add required PHP extensions to composer.json.
2019-02-13 17:54:36 +01:00
James Cole
71fb9d8fa5
Code cleaning stuff.
2019-02-13 17:38:41 +01:00
James Cole
9a461fc7b7
Fix for #2082
2019-02-13 17:34:03 +01:00
James Cole
e0d87aa11e
First part of a large code cleanup commit.
2019-02-12 21:49:28 +01:00
James Cole
b273af341c
Update version.
2019-02-12 21:01:19 +01:00
James Cole
2117fc2a5a
Add thing to apply rules to fints #2081
2019-02-12 21:01:12 +01:00
James Cole
58e55dc789
Document things better.
2019-02-12 21:00:53 +01:00
James Cole
ac9b8b8c30
Build and push.
2019-02-12 17:33:34 +01:00
James Cole
4dcc66238e
Make directory as well.
2019-02-12 17:31:30 +01:00
James Cole