Commit Graph

23526 Commits

Author SHA1 Message Date
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
Guy Sartorelli
8b20be838c
Merge branch '4.13' into 4 2023-05-17 10:55:06 +12:00
Guy Sartorelli
58813d5075
Merge pull request #10776 from creative-commoners/pulls/5.0/acpu-memcached-factories
FIX Get ApcuCacheFactory and MemcachedCacheFactory working again
2023-05-17 10:53:26 +12:00
Guy Sartorelli
2afb01463b
FIX Don't redirect admin URLs regardless of trailing slash (#10781) 2023-05-17 10:49:34 +12:00
Steve Boyd
ef3b91417a FIX Get ApcuCacheFactory and MemcachedCacheFactory working again 2023-05-17 10:18:28 +12:00
Guy Sartorelli
4a2dc2dd97
Merge pull request #10782 from satrun77/pulls/5.0/remove-deprecated-template-vars
API Remove deprecated template vars
2023-05-16 15:22:04 +12:00
Mohamed Alsharaf
b51bc427aa API Remove deprecated template vars 2023-05-16 15:04:42 +12:00
Guy Sartorelli
2256799916
Merge pull request #10780 from creative-commoners/pulls/4.13/update-tinymc-lang-config
UPD Add support new TinyMC cs_CZ.js
2023-05-16 12:44:45 +12:00
Sabina Talipova
0ab36f6ae1 UPD Add support new TinyMC cs_CZ.js 2023-05-16 11:56:05 +12:00
Guy Sartorelli
234e229098
Merge pull request #9976 from kinglozzer/9975-default-form-action
FIX: Form::defaultAction() didn't work if actions were in CompositeFields (fixes #9975)
2023-05-09 21:45:24 +12:00
Michal Kleiner
218c9942bc
Merge pull request #10772 from creative-commoners/pulls/4.13/gridfieldfilter-regression
FIX Don't assume searchableFields() exists in gridfield filter
2023-05-09 20:29:24 +12:00
Guy Sartorelli
01808a8316
FIX Don't assume searchableFields() exists in gridfield filter 2023-05-09 10:00:07 +12:00
Guy Sartorelli
f7a1551946
DEP Conflict with symfony/process if not PHP 8.1 compatible (#10764) 2023-05-01 14:45:23 +12:00
Guy Sartorelli
7efde6bf37
Merge branch '4' into 5.0 2023-04-27 14:43:38 +12:00
Guy Sartorelli
7c5cbae928
Merge branch '4.13' into 4 2023-04-26 12:44:05 +12:00
Guy Sartorelli
908b6f2006
Merge branch '4.12' into 4.13 2023-04-26 11:44:54 +12:00
Sabina Talipova
c2733a3108
Merge pull request #10760 from creative-commoners/pulls/4.12/absoluteurl-parsing
Escaped double slash is absolute URL
2023-04-26 11:30:41 +12:00
Sabina Talipova
961499f640
Merge pull request #10759 from creative-commoners/pulls/4.12/gridfieldprint-canview
Check canView before printing from GridField
2023-04-26 11:24:46 +12:00
Guy Sartorelli
1a5bb4cbec
[CVE-2023-22729] Escaped double slash is absolute URL 2023-04-26 09:49:59 +12:00
Guy Sartorelli
fd5d8217e8
[CVE-2023-22728] Check canView before printing from GridField 2023-04-26 09:45:34 +12:00
Sabina Talipova
341ea4b0e1
Merge pull request #10758 from creative-commoners/pulls/5.0/cms5-readme
DOC Update README.md for CMS 5
2023-04-21 15:35:46 +12:00
Guy Sartorelli
9a6414a840
DOC Update README.md for CMS 5 2023-04-19 17:39:47 +12:00
Michal Kleiner
b085e2df31
Merge pull request #10755 from creative-commoners/pulls/5.0/themed-resource-url 2023-04-13 00:01:13 +12:00