Guy Sartorelli
9b2aee10dc
Merge pull request #10868 from creative-commoners/pulls/5.0/unit-test
...
MNT Fix unit test
2023-07-12 11:56:09 +12:00
Steve Boyd
3aa6d590a1
MNT Fix unit test
2023-07-11 10:25:16 +12:00
Steve Boyd
b88e7feeeb
Merge branch '4' into 5.0
2023-07-10 17:13:59 +12:00
Steve Boyd
193a12ac01
Merge branch '4.13' into 4
2023-07-10 17:13:19 +12:00
Guy Sartorelli
5854ce6190
Merge branch '4.13' into 5.0
2023-07-10 14:29:03 +12:00
Dylan Wagstaff
8c3ba81052
FIX PHP 8.1 support in MySQLiConnector::query errors ( #10570 )
...
* FIX PHP 8.1 support in MySQLiConnector::query errors
The default error reporting mode in PHP 8.1 has changed from using
errors reported on the connection handle to throwing
mysqli_sql_exception. query() makes no allowance for this, and
functions up the call stack expect to catch
Silverstripe\ORM\Connect\DatabaseException instead - resulting in the
MySQLi exception going all the way up to halt the system.
We can use a try, catch, and finally to retain backwards compatibility,
no matter which setting (e.g. PHP version default) someone has enabled.
* Move MySQLConnector test skip call into setUp()
As review feedback; marking the test as skipped in a private function
obfuscated where the call was happening and made it harder to skimread
the tests. Moving this into a setUp function makes it obvious the check
is run before each test case, and skipped if necessary.
2023-07-07 15:56:31 +12:00
Guy Sartorelli
612f7e734f
FIX Allow repeated iterations of predicated query result ( #10857 )
2023-07-05 16:25:58 +12:00
Sabina Talipova
bb5378e177
FIX Gridfiled pagination missing after search ( #10828 )
2023-06-26 12:11:33 +12:00
Guy Sartorelli
fb7d2256f1
Merge branch '4.13' into 5.0
2023-06-22 11:18:46 +12:00
Guy Sartorelli
ab4802caaf
Merge pull request #10829 from creative-commoners/pulls/4.13/fix-last-page
...
FIX LastPage method returns true if TotalPages equals 0
2023-06-22 11:16:57 +12:00
Sabina Talipova
ad9df97626
FIX LastPage method returns true if TotalPages equals 0
2023-06-22 10:50:41 +12:00
Sabina Talipova
220fee6a44
Merge pull request #10823 from creative-commoners/pulls/5.0/duplicate
...
MNT Remove duplicate translation keys
2023-06-19 17:10:05 +12:00
Steve Boyd
90c50957fb
MNT Remove duplicate translation keys
2023-06-19 14:13:12 +12:00
Steve Boyd
53237b9611
Merge branch '4' into 5.0
2023-06-16 11:43:16 +12:00
Steve Boyd
799cd2b7bc
Merge branch '4.13' into 4
2023-06-16 11:43:02 +12:00
Guy Sartorelli
5303e08d34
Merge pull request #10820 from creative-commoners/pulls/4.13/tx-1686724699
...
ENH Update translations
2023-06-15 10:06:37 +12:00
Steve Boyd
2ea66922cd
ENH Update translations
2023-06-14 18:38:19 +12:00
Steve Boyd
cfda51a48e
Merge branch '4' into 5.0
2023-06-14 16:09:34 +12:00
Steve Boyd
c2c5db0da0
Merge branch '4.13' into 4
2023-06-14 16:08:53 +12:00
josephlewisnz
b6a3e3a951
added an additional filter to remove empty array items ( #10803 )
...
* ENH Added filter to remove empty/null from Path::join parts
This is to ensure null values are removed and trim() deprecated warnings are not thrown
Fixes #10802
* FIX revert public signature
Co-authored-by: Steve Boyd <emteknetnz@gmail.com>
---------
Co-authored-by: Steve Boyd <emteknetnz@gmail.com>
2023-06-14 15:46:23 +12:00
Guy Sartorelli
6fd7694cbc
Merge pull request #10816 from creative-commoners/pulls/4.13/updatebool
...
FIX Show correct default value
2023-06-14 13:32:09 +12:00
Steve Boyd
35a8d79f62
FIX Show correct default value
2023-06-14 11:25:34 +12:00
Guy Sartorelli
6c266ec6ff
Merge pull request #10813 from creative-commoners/pulls/5.0/textcollecttraits
...
FIX Handle __TRAIT__ in i18nTextCollector
2023-06-13 16:50:31 +12:00
Steve Boyd
f4e0c768bd
FIX Handle __TRAIT__ in i18nTextCollector
2023-06-13 10:11:12 +12:00
Steve Boyd
cf77f06544
Merge branch '4' into 5.0
2023-06-12 14:07:24 +12:00
Steve Boyd
ca542a386b
Merge branch '4.13' into 4
2023-06-12 14:02:15 +12:00
Guy Sartorelli
848768dfeb
Merge pull request #10774 from sunnysideup/patch-26
...
BUG: fix issue where default admin without valid email can not be saved
2023-06-09 19:06:26 +12:00
Nicolaas / Sunny Side Up
675ba90280
FIX fix issue where member without valid email can not be saved
...
It is possible to have a member record without a valid email address. In this case, you can not save Member as it throws an error (email is tried being sent without a valid email address).
2023-06-09 15:29:54 +12:00
Bram de Leeuw
33c62033fe
Fix translation key for DataObject.GENERALSEARCH ( #10805 )
...
* MNT Use gha-dispatch-ci
* Update DataObject.php
Fix typo in GENERALSEARCH localisation
* Update en.yml
remove unnecessary localisation line
* Update nl.yml
remove unnecessary localisation line
* Update eo.yml
remove unnecessary localisation line
* Update ci.yml
2023-06-09 13:44:00 +12:00
Steve Boyd
a211b5eeb5
Merge branch '4.12' into 4.13
2023-05-31 15:49:15 +12:00
Steve Boyd
6cb35972c9
Merge branch '4' into 5.0
2023-05-31 14:26:07 +12:00
Steve Boyd
35b641ba09
Merge branch '4.13' into 4
2023-05-31 14:25:46 +12:00
Sabina Talipova
a790e5a6c4
Merge pull request #10793 from creative-commoners/pulls/4.13/tx-1685417432
...
ENH Update translations
2023-05-31 11:27:58 +12:00
Steve Boyd
9d84831756
Merge branch '4.11' into 4.12
2023-05-31 10:19:33 +12:00
Sabina Talipova
e137e0456a
Merge pull request #10794 from creative-commoners/pulls/4.11/backport-http-message
...
DEP Explicitly require psr/http-message ^1
2023-05-31 10:01:21 +12:00
Steve Boyd
80c51b6bd2
DEP Explicitly require psr/http-message ^1
2023-05-30 16:43:37 +12:00
Steve Boyd
6b49b6cdb6
ENH Update translations
2023-05-30 15:30:32 +12:00
Bernard Hamlin
e98f0d45af
Use ::create instead of new in GridFieldDetailForm_ItemRequest ( #10791 )
...
Updates instances of `new X` to `X::create` so that Silverstripe classes will respect dependency injection
2023-05-25 11:42:43 +12:00
Sabina Talipova
e8bde0f4f5
Merge pull request #10790 from creative-commoners/pulls/5.0/fix-merge-up
...
MNT Fix broken merge-up
2023-05-24 14:57:14 +12:00
Steve Boyd
aafdde1e13
MNT Fix broken merge-up
2023-05-24 14:27:33 +12:00
Steve Boyd
186800ae9e
Merge branch '4' into 5.0
2023-05-24 14:18:46 +12:00
Steve Boyd
83714b2ffb
Merge branch '4.13' into 4
2023-05-24 14:18:11 +12:00
Maxime Rainville
efd3eceebe
Merge pull request #10788 from creative-commoners/pulls/4.13/http-message
...
DEP Explicitly require psr/http-message ^1
2023-05-24 14:07:55 +12:00
Steve Boyd
e554516193
DEP Explicitly require psr/http-message ^1
2023-05-24 12:26:48 +12:00
Steve Boyd
8237c73b86
Merge branch '4' into 5.0
2023-05-22 12:45:29 +12:00
Steve Boyd
f1258019d8
Merge branch '4.13' into 4
2023-05-22 12:43:23 +12:00
Guy Sartorelli
c4b8d9a246
FIX Add back missing SSL support for database connections ( #10784 )
2023-05-22 12:40:59 +12:00
Guy Sartorelli
ffd0916922
Merge pull request #10786 from michalkleiner/tweak-deprecation-suggestion
...
FIX Provide correct replacement suggestion in deprecation message
2023-05-22 12:26:40 +12:00
Michal Kleiner
f815a9cf2a
FIX Provide correct replacement suggestion in deprecation message
2023-05-21 20:12:52 +12:00
Guy Sartorelli
1f45607977
Merge branch '4' into 5.0
2023-05-17 10:57:32 +12:00
