Commit Graph

23831 Commits

Author SHA1 Message Date
Guy Sartorelli
8aab888d50
FIX Fix link for managing roles (#11178) 2024-03-21 12:49:10 +13: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
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
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
Steve Boyd
f0b799c54b Merge branch '4.12' into 4.13 2024-03-04 11:26:35 +13:00
Thomas Portelange
e7bc8ae99f
FIX Generate salt if needed 2024-02-26 11:31:53 +01:00
github-actions
fda76ae7c4 Merge branch '4.13' into 4 2024-02-14 22:58:28 +00:00
Guy Sartorelli
d33332cb9e
FIX Add eagerloaded data to ALL relevant lists (#11139) 2024-02-15 11:57:22 +13:00
Guy Sartorelli
621be04bbd
Merge pull request #11137 from davejtoews/bugfix-v4-textcollector-traits
FIX Handle __TRAIT__ in i18nTextCollector
2024-02-14 13:32:11 +13:00
Steve Boyd
51fd1d6b7e FIX Handle __TRAIT__ in i18nTextCollector 2024-02-13 16:33:24 -07:00
Guy Sartorelli
c493485281
MNT Remove unexpected coupling with admin for test (#11136) 2024-02-13 17:35:03 +13:00
Guy Sartorelli
81cd33b6c8
Merge branch '4' into 5.1 2024-02-13 13:49:26 +13:00
Thomas Portelange
b56e771ed5
FIX add missing rawurlencode (#11105) 2024-02-13 10:08:28 +13:00
Guy Sartorelli
9c4266c8f3
Merge pull request #11127 from lekoala/patch-45
FIX Unknown column 'ClassName' in field list
2024-02-13 09:51:52 +13:00
github-actions
33ff90cf2d Merge branch '4.13' into 4 2024-02-10 14:24:03 +00:00
Thomas Portelange
e0107e0202
Update src/ORM/DataQuery.php
Co-authored-by: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
2024-02-08 09:14:27 +01:00
Thomas Portelange
2ac68a55a4
rename var 2024-02-08 09:13:40 +01:00
Guy Sartorelli
e87c724700
FIX Don't assume mysql handle is an object (#11129) 2024-02-08 15:07:33 +13:00
Guy Sartorelli
c406029573
TLN Update translations (#11130) 2024-02-08 13:28:58 +13:00
Thomas Portelange
1dd81488aa
fix unknown table
Fixes https://github.com/silverstripe/silverstripe-framework/issues/10737
2024-02-07 17:38:14 +01:00
Guy Sartorelli
f952183cdf
TLN Update translations (#11126) 2024-02-07 16:07:01 +13:00
github-actions
4d96674752 Merge branch '4' into 5.1 2024-02-03 14:23:59 +00:00
github-actions
02dc9ec7a3 Merge branch '4.13' into 4 2024-02-03 14:23:58 +00:00
Guy Sartorelli
f4c7631719
Merge pull request #11120 from creative-commoners/pulls/4.13/no-admin
MNT Fix unit test when running without silverstripe/admin installed
2024-02-01 09:03:38 +13:00
Steve Boyd
00276373b7 MNT Fix unit test when running without silverstripe/admin installed 2024-01-31 15:02:44 +13:00
Guy Sartorelli
80c3961b03
Merge pull request #11114 from creative-commoners/pulls/5.1/fix-elemental-htmleditor
FIX HTMLEditorField::setRows with Elemental
2024-01-25 15:13:42 +13:00
Sabina Talipova
afd53d1d6a FIX HTMLEditorField::setRows with Elemental 2024-01-25 12:07:10 +13:00
github-actions
312ee58292 Merge branch '4' into 5.1 2024-01-22 22:58:52 +00:00
github-actions
6110e118a6 Merge branch '4.13' into 4 2024-01-22 22:58:51 +00:00
Sabina Talipova
6fe377e69d
Merge pull request #11113 from creative-commoners/pulls/4.13/cve-2023-48714
[CVE-2023-48714] Don't show or add records the member isn't allowed to
2024-01-23 11:46:28 +13:00
Sabina Talipova
38fef1e6a6
Merge pull request #11112 from creative-commoners/pulls/4.13/cve-2023-49783
[CVE-2023-49783] Allow permission checks in BulkLoader
2024-01-23 11:45:45 +13:00
Guy Sartorelli
873b721b6b
[CVE-2023-48714] Don't show or add records the member isn't allowed to
see
2024-01-23 11:11:36 +13:00
Guy Sartorelli
4b1b487041
[CVE-2023-49783] Allow permission checks in BulkLoader 2024-01-23 11:01:25 +13:00
github-actions
96241b2db8 Merge branch '4' into 5.1 2024-01-20 14:24:40 +00:00
github-actions
9fdda9eefd Merge branch '4.13' into 4 2024-01-20 14:24:38 +00:00
Guy Sartorelli
b979ce5896
MNT Fix test for required password fields in kitchen sink (#11111) 2024-01-19 13:27:32 +13:00
Sabina Talipova
cc0edf242e
Merge pull request #11099 from creative-commoners/pulls/4.13/confirmedpasswordfield-required
FIX Correctly mark ConfirmedPasswordField children as required
2024-01-17 12:08:31 +13:00
Sabina Talipova
ff3a6f72df
FIX HTMLEditorField::setRows minimal hieght (#10965) 2024-01-11 15:00:24 +13:00
Guy Sartorelli
7dc1a7a12b
FIX Correctly mark ConfirmedPasswordField children as required 2023-12-20 12:35:30 +13:00
Guy Sartorelli
ad8cf9902c
Merge pull request #11093 from creative-commoners/pulls/5.1/docblock
MNT Update @methods on class docblocks
2023-12-15 12:38:38 +13:00
Steve Boyd
3311794bd3
Merge pull request #11094 from creative-commoners/pulls/5.1/fix-email-failure-bugs
Fix email failure bugs
2023-12-15 09:27:31 +13:00