Commit Graph

23962 Commits

Author SHA1 Message Date
github-actions
2b296b6481 Merge branch '5' into 6 2024-03-19 23:26:27 +00:00
github-actions
f63862df83 Merge branch '5.2' into 5 2024-03-19 23:26:26 +00:00
github-actions
90298002a4 Merge branch '5.1' into 5.2 2024-03-19 23:26:25 +00:00
Guy Sartorelli
e68af4de40
Merge branch '4' into 5.1 2024-03-20 12:15:22 +13:00
github-actions
d22960d3ea Merge branch '4.13' into 4 2024-03-19 23:05:09 +00:00
Guy Sartorelli
6ede0316bf
Revert "Use field editorconfig when sanitising content" (#11180)
This reverts commit e5eb98cc34.
2024-03-20 12:02:54 +13:00
Guy Sartorelli
25f61141cb
Enhancements required for linkfield migration (#11171)
* ENH Add lightweight test override for Environment::isCli()

* NEW Allow JOIN with SQL UPDATE.
2024-03-20 11:49:57 +13:00
github-actions
7cc08f9669 Merge branch '5' into 6 2024-03-18 02:34:27 +00:00
github-actions
0d8626f0bc Merge branch '5.2' into 5 2024-03-18 02:34:26 +00:00
Guy Sartorelli
dcd33319c7
Merge branch '5.1' into 5.2 2024-03-18 15:33:54 +13:00
github-actions
c25922fedb Merge branch '4' into 5.1 2024-03-16 14:24:08 +00:00
github-actions
c1b311f6bc Merge branch '4.13' into 4 2024-03-16 14:24:06 +00:00
Guy Sartorelli
4e3add80d5
Merge pull request #11177 from lekoala/patch-52
ENH fieldList is an array or null
2024-03-15 09:14:22 +13:00
Thomas Portelange
777056d861
ENH fieldList is an array or null 2024-03-14 17:06:00 +01:00
Thomas Portelange
b031ade73a
ENH update some docblock types (#11168) 2024-03-13 10:08:56 +13:00
Guy Sartorelli
c8c2695800
Merge pull request #11163 from lekoala/patch-50
FIX handle non breakable spaces
2024-03-12 11:38:43 +13:00
Thomas Portelange
fcf5e324dd FIX Handle non-breakable spaces
Fixes issue https://github.com/silverstripe/silverstripe-framework/issues/11162
2024-03-12 11:01:09 +13:00
github-actions
32e6169da1 Merge branch '5' into 6 2024-03-09 14:25:07 +00:00
github-actions
8f48e9bd71 Merge branch '5.2' into 5 2024-03-09 14:25:06 +00:00
github-actions
c36df386ba Merge branch '5.1' into 5.2 2024-03-09 14:25:04 +00:00
Loz Calver
5ab9ded9e9
Merge pull request #11117 from AntonyThorpe/patch-1
Update DropdownField.php
2024-03-07 12:28:36 +00:00
Will Rossiter
f4cbe92050
ENH Make CanonicalURLMiddleware run in all environments by default (#11154) 2024-03-05 10:57:20 +13:00
Guy Sartorelli
dba87348f9
Merge pull request #11158 from lekoala/patch-47
FIX Generate salt if needed
2024-03-05 10:12:31 +13:00
Thomas Portelange
eb4ef623ab
check for empty salt 2024-03-04 08:34:43 +01:00
Guy Sartorelli
054c2389c9
Merge pull request #11166 from creative-commoners/pulls/5/check-exists
MNT Ensure composer/semver installed or skip test
2024-03-04 15:27:13 +13:00
Steve Boyd
a18fb1bcb7 MNT Ensure composer/semver installed or skip test 2024-03-04 12:52:17 +13:00
Steve Boyd
f0b799c54b Merge branch '4.12' into 4.13 2024-03-04 11:26:35 +13:00
Steve Boyd
165a65a017 Merge branch '5' into 6 2024-03-04 11:22:28 +13:00
Guy Sartorelli
4f3282bf2a
Merge pull request #11157 from lekoala/patch-46
FIX use composer runtime api
2024-02-28 09:16:25 +13:00
Thomas Portelange
59177dd315
Delete tests/php/Core/Manifest/fixtures/VersionProviderTest directory 2024-02-27 10:42:25 +01:00
Thomas Portelange
2921d68a57
Update composer.json 2024-02-27 10:40:28 +01:00
Thomas Portelange
a06ce0493a
use VersionParser instead of comparator 2024-02-26 11:44:11 +01:00
Thomas Portelange
e7bc8ae99f
FIX Generate salt if needed 2024-02-26 11:31:53 +01:00
Thomas Portelange
80e197fe4f
make error message more readable 2024-02-26 10:21:23 +01:00
Thomas Portelange
a1d1e977c5
use composer/semver 2024-02-26 10:13:34 +01:00
Thomas Portelange
071333f774
add composer/semver 2024-02-26 10:10:20 +01:00
Thomas Portelange
68b79e11ee
missing import 2024-02-26 09:54:18 +01:00
Thomas Portelange
2696922023
update return type 2024-02-26 09:52:48 +01:00
Thomas Portelange
1cf3dde9f1
Update src/Core/Manifest/VersionProvider.php
Co-authored-by: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
2024-02-26 09:48:35 +01:00
Thomas Portelange
2b64e98afc
Update VersionProviderTest.php 2024-02-26 09:48:15 +01:00
Thomas Portelange
b53148c034
add deprecation, remove class_exists 2024-02-26 09:23:35 +01:00
Thomas Portelange
2600b26617
add composer-runtime-api 2024-02-26 09:20:22 +01:00
Thomas Portelange
e649310f7b
Update src/Core/Manifest/VersionProvider.php
Co-authored-by: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
2024-02-26 09:09:45 +01:00
Thomas Portelange
a2486c0859
Update src/Core/Manifest/VersionProvider.php
Co-authored-by: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
2024-02-26 09:09:38 +01:00
Thomas Portelange
a196719502
Update src/Core/Manifest/VersionProvider.php
Co-authored-by: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
2024-02-26 09:09:31 +01:00
Guy Sartorelli
c2b606c24c
Merge pull request #11150 from beerbohmdo/allow_override_moneyfield
Allow better subclassing of MoneyField
2024-02-26 11:20:11 +13:00
github-actions
a46a7eceaa Merge branch '5' into 6 2024-02-24 14:23:41 +00:00
Thomas Portelange
bc09127182
use composer runtime api 2024-02-23 17:06:27 +01:00
Dominik Beerbohm
a3ce922f1d
ENH Allow better subclassing of MoneyField
Move generation of NumberField from constructor to method to allow override in subclass.
Addded test for MoneyField
2024-02-20 11:42:45 +01:00
Guy Sartorelli
528344d1b0
NEW Allow manipulating eagerloading queries (#11140) 2024-02-20 16:17:31 +13:00