Commit Graph

23017 Commits

Author SHA1 Message Date
Steve Boyd
b24c289892 Merge branch '4.10' into 4.11 2022-07-28 14:05:07 +12:00
Guy Sartorelli
dcadb9acb1
Merge pull request #10426 from creative-commoners/pulls/4.10/mb3
MNT Update Utf8TestHelper for MySQL 8.0.30
2022-07-28 13:52:17 +12:00
Steve Boyd
bdf7d09144 MNT Update Utf8TestHelper for MySQL 8.0.30 2022-07-28 13:21:23 +12:00
Guy Sartorelli
0a58a443f3
Merge pull request #10422 from creative-commoners/pulls/4.11/revert-skiptest
MNT No longer mark tests as skipped if running mysql 8
2022-07-26 15:58:11 +12:00
Steve Boyd
ce46e2da47 MNT No longer mark tests as skipped if running mysql 8 2022-07-26 13:54:10 +12:00
Guy Sartorelli
92d8180c69
Merge pull request #10420 from creative-commoners/pulls/4.11/ignore-test
MNT Skip test if Page class missing
2022-07-25 17:06:48 +12:00
Steve Boyd
24daf3ae83 MNT Skip test if Page class missing 2022-07-25 16:35:28 +12:00
Steve Boyd
f6693d4ea5 Merge branch '4.10' into 4.11 2022-07-22 11:20:22 +12:00
Guy Sartorelli
5a91cfca8a
Merge pull request #10416 from creative-commoners/pulls/4.10/backport-ci
MNT Add GitHub Actions CI
2022-07-22 11:18:17 +12:00
Steve Boyd
5eb8d3e25f MNT Skip test in MySQL8 2022-07-22 11:16:32 +12:00
Steve Boyd
dd210e0f84
FIX Check if blank method passed (#10417) 2022-07-21 15:49:48 +12:00
Steve Boyd
674e6d9b7b MNT Update utf8 aliases for mysql 8 and mariadb 10.6 2022-07-21 15:19:16 +12:00
Steve Boyd
9db1cd056e MNT Add GitHub Actions CI 2022-07-21 14:44:02 +12:00
Steve Boyd
c0e8a21acf Merge branch '4.10' into 4.11 2022-07-08 17:13:03 +12:00
Guy Sartorelli
cc3ec577ed
MNT Remove scrutinizer config. (#10396) 2022-07-08 16:44:50 +12:00
Guy Sartorelli
3cad03357a
Merge pull request #10384 from creative-commoners/pulls/4.11/remove-wrong-message
FIX Unexpected message issue
2022-07-08 13:20:11 +12:00
Michal Kleiner
f2abba8e9e
Merge pull request #10387 from kinglozzer/10386-form-attributes
FIX Add missing casting for Form::getAttributesHTML (fixes #10386)
2022-07-05 01:39:35 +12:00
Loz Calver
9b45342a06 FIX: Add missing casting for Form::getAttributesHTML (fixes #10386) 2022-07-04 12:24:58 +01:00
Steve Boyd
55c3e24a50 Merge branch '4.10' into 4.11 2022-07-04 21:02:23 +12:00
Guy Sartorelli
8a314a90e7
Merge pull request #10385 from silverstripe/pulls/4.10/pdo
FIX PDO in PHP 8
2022-07-04 18:24:10 +12:00
Sabina Talipova
babc811381 FIX Remove unexpected message 2022-07-04 16:05:57 +12:00
Steve Boyd
5a940b0f14 FIX PDO in PHP 8 2022-07-04 15:08:52 +12:00
Brandon Iffert
ad83b78a10
FIX Handle null values passed to PDO::quote() (#10383) 2022-07-04 13:17:51 +12:00
Loz Calver
b37178e831
FIX: 'passwordsent' title was not being displayed (fixes #10366) (#10367) 2022-07-01 13:58:57 +12:00
Guy Sartorelli
995cc6ecac
Merge pull request #10380 from creative-commoners/pulls/4/searchable-fields-obey-filters
FIX Support search filters with match_any searchable_fields
2022-06-30 16:27:45 +12:00
Guy Sartorelli
ffcaed84f3 MNT Update tests for searchable_fields match_any 2022-06-30 15:55:56 +12:00
Guy Sartorelli
30cd521029 DOC Update docs for searchable and summary fields. 2022-06-30 15:55:56 +12:00
Guy Sartorelli
6c01661512 FIX Support search filters with match_any searchable_fields 2022-06-30 15:55:53 +12:00
Guy Sartorelli
4e53c35b53 MNT Deprecate unusable property
This property must always have the value 'AND' or an exception will be
thrown - it should be deprecated. Also, no need to process the query
before throwing.
2022-06-30 15:53:17 +12:00
Guy Sartorelli
76be4578d6
Merge pull request #10378 from creative-commoners/pulls/4.11/pdo
FIX PDO in PHP 8
2022-06-30 13:58:55 +12:00
Steve Boyd
3a0fff25de FIX PDO in PHP 8 2022-06-30 12:34:05 +12:00
Guy Sartorelli
01c27e69de
Merge pull request #10377 from creative-commoners/pulls/4.11/mysql-null
FIX Ensure not passing null to mysql methods for PHP 8.1 compatibility
2022-06-29 10:01:12 +12:00
Steve Boyd
a77ca74a7e FIX Ensure not passing null to mysql methods for PHP 8.1 compatibility 2022-06-29 09:34:30 +12:00
Steve Boyd
98b985fb91 Merge branch '4.10' into 4.11 2022-06-28 17:41:49 +12:00
Guy Sartorelli
794640247b
Merge pull request #10374 from creative-commoners/pulls/4.10/cve-2022-28803
[CVE-2022-28803] Block XSS in links and iframes.
2022-06-28 17:27:37 +12:00
Guy Sartorelli
a78d3458ea
Merge pull request #10375 from creative-commoners/pulls/4.10/cve-2022-25238
[CVE-2022-25238] Sanitise htmlfields serverside by default
2022-06-28 17:27:21 +12:00
Guy Sartorelli
410c2a8966
Merge pull request #10376 from creative-commoners/pulls/4.10/cve-2021-41559
CVE-2021-41559 Disable xml entities
2022-06-28 17:27:08 +12:00
Steve Boyd
b5abc38455 CVE-2021-41559 Disable xml entities 2022-06-28 17:04:34 +12:00
Steve Boyd
991aedf017 [CVE-2022-25238] Sanitise htmlfields serverside by default 2022-06-28 17:03:05 +12:00
Guy Sartorelli
d2c58f3bbc [CVE-2022-28803] Block XSS in links and iframes. 2022-06-28 17:01:53 +12:00
Guy Sartorelli
dec85819bd Merge branch '4.10' into 4.11 2022-05-27 15:19:39 +12:00
Guy Sartorelli
0bc3ed4d2c Merge branch '4.9' into 4.10 2022-05-27 15:19:17 +12:00
Guy Sartorelli
972a77f4d3 Merge branch '4.10' into 4.11 2022-05-27 12:55:35 +12:00
Steve Boyd
825dd4b10d
Merge pull request #10333 from creative-commoners/pulls/4.10/fix-group-code-dedupe
FIX Resolve deduping problem with group codes.
2022-05-27 12:22:36 +12:00
Guy Sartorelli
e0c4f01c11 FIX Resolve deduping problem with group codes.
Also remove dead validation code.
2022-05-27 11:19:32 +12:00
Steve Boyd
dccaa9135e
Merge pull request #10334 from creative-commoners/pulls/4.11/mysql8-pdo-test
MNT Update utf8 aliases for mysql 8 and mariadb 10.6
2022-05-26 12:38:18 +12:00
Steve Boyd
ec5b94facf MNT Update utf8 aliases for mysql 8 and mariadb 10.6 2022-05-26 12:06:51 +12:00
Steve Boyd
d3252b1645 Merge branch '4.10' into 4.11 2022-05-19 17:25:15 +12:00
Guy Sartorelli
feb7ccf92e
Merge pull request #10324 from creative-commoners/pulls/4.11/guzzle
DEP Add guzzle 7 requirement
2022-05-18 13:34:13 +12:00
Steve Boyd
59b2a3ff8b DEP Add guzzle 7 requirement 2022-05-18 11:57:34 +12:00