Commit Graph

23831 Commits

Author SHA1 Message Date
Steve Boyd
aafdde1e13 MNT Fix broken merge-up 2023-05-24 14:27:33 +12:00
Steve Boyd
b02ccdf820 Merge branch '5.0' into 5 2023-05-24 14:19:18 +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
f54bbc50f0 Merge branch '5.0' into 5 2023-05-22 12:46:02 +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
0151ab528f
Merge pull request #10778 from creative-commoners/pulls/5/aggregate-having
FIX Use OR conjuctive in filterAny aggregate queries
2023-05-17 12:40:20 +12:00
Steve Boyd
696fe79dd6 FIX Use OR conjuctive in filterAny aggregate queries 2023-05-17 11:55:56 +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
7210ac8cd3
Merge pull request #10685 from xini/fix-i18n-collect-themes
Update i18nTextCollector to collect strings also from themes
2023-05-10 10:40:28 +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
Florian Thoma
04266f77cc Update i18nTextCollector to collect strings also from themes 2023-05-09 11:56:12 +10:00
Guy Sartorelli
01808a8316
FIX Don't assume searchableFields() exists in gridfield filter 2023-05-09 10:00:07 +12:00
Guy Sartorelli
66f0fc4814
Merge pull request #10688 from xini/fix-i18ntextcollector-orm-4
ENH Add loading of ORM field labels to i18nTextCollector
2023-05-08 15:49:44 +12:00
Guy Sartorelli
37937b7123
Merge pull request #10751 from xini/patch-7
make Group use tri-state can* extension hooks, fixes #9580
2023-05-08 11:22:35 +12:00
Guy Sartorelli
1c2e1f86a5
Merge pull request #10763 from sunnysideup/patch-25
MINOR: faster checking if record exists
2023-05-05 13:12:06 +12:00
Steve Boyd
0978a43871 Merge branch '5.0' into 5 2023-05-04 13:25:49 +12:00
Guy Sartorelli
6296c06f3a
Merge pull request #10735 from elliot-sawyer/feature/change-search-filter-treedropdownfield
NEW: Allow different search filters on TreeDropdownField
2023-05-02 08:30:51 +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
Nicolaas / Sunny Side Up
9660652fbc
MINOR: faster checking if record exists
Rather than using a loop through each object, we just filter for it in the SQL query.  This is likely to speed up the code and also make it more legible.
2023-04-28 09:40:12 +12:00
Guy Sartorelli
7efde6bf37
Merge branch '4' into 5.0 2023-04-27 14:43:38 +12:00
Guy Sartorelli
73ef035bd8
API Add AbsoluteLink method to RequestHandler (#10749)
This is a method that is commonly implemented on controllers, but
it really doesn't need to be.
2023-04-26 18:25:01 +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
Guy Sartorelli
bdcb57ec2b
NEW Add a cascading theme version of $resourceURL 2023-04-12 17:29:59 +12:00
Florian Thoma
1dbb2bc5ba remove manually added config values in test 2023-04-12 14:11:08 +10:00
Florian Thoma
c0722308af add loading of automatic ORM field labels to i18nTextCollector 2023-04-12 11:11:26 +10:00
Florian Thoma
41c4b4ee02 make Group use tri-state can* extension hooks, fixes #9580 2023-04-11 10:18:21 +10:00