Commit Graph

22280 Commits

Author SHA1 Message Date
Guy Marriott 87200439be
Merge pull request #9600 from creative-commoners/pulls/4.6/embedded-media
Try Catch for embeded media - Backport to 4.6
2020-07-17 10:32:10 -07:00
rdigitalg 56f15b1c14 FIX Try Catch for embeded media (#9424)
* Try Catch for embeded media
* added missing namespaces, translatable message INVALID_URL
* generate tag only once
* catch after closing bracket
* space after comma
* Update src/View/Shortcodes/EmbedShortcodeProvider.php
* Linting
Co-authored-by: ivan@digitalgarage.ro <ivan@digitalgarage.ro>
Co-authored-by: Steve Boyd <emteknetnz@gmail.com>
Co-authored-by: Loz Calver <kinglozzer@gmail.com>
2020-07-17 19:38:01 +12:00
Robbie Averill 84b4057a9a
Merge pull request #9406 from chrispenny/feature/standardise-get-cms-validator
v4 improvement: Standardise getCMSValidator for DataObjects/Forms
2020-07-16 15:58:33 -07:00
Maxime Rainville 34eb170075 Merge branch '4.6' into 4 2020-07-16 11:45:25 +12:00
Sacha Judd e341e0aee7
DOCS Add link to user help guides and fix feature naming (#9596) 2020-07-16 11:42:42 +12:00
Bryn Whyman 71f8264a51
Merge pull request #9593 from unclecheese/pulls/4/doc-fix-image-url
DOC: Fix icon URL
2020-07-15 11:58:17 +12:00
Bryn Whyman ec87061d95
Merge pull request #9594 from unclecheese/pulls/4/doc-fix-image-path
DOC: Fix _images pathing
2020-07-15 11:57:45 +12:00
Aaron Carlino f13c928b14 Fix _images pathing 2020-07-15 11:32:38 +12:00
Aaron Carlino 0d2a9da0dd Fix file icon URL 2020-07-15 11:29:30 +12:00
Robbie Averill 886733ea70
Merge pull request #9591 from sunnysideup/patch-2
PATCH: using standard way to refer to classes Group and PermissionRol…
2020-07-13 13:16:17 -07:00
Nicolaas 65e0233258
PATCH: using standard way to refer to classes Group and PermissionRoleCode 2020-07-14 07:50:05 +12:00
Guy Marriott 557358c2a6
Merge pull request #9590 from thesifter/4 2020-07-13 10:39:14 -07:00
Damen Hansen 423c9909a8
Merge pull request #1 from thesifter/thesifter-patch-1
Update 01_File_Management.md
2020-07-13 14:21:45 +12:00
Damen Hansen d5893bf23c
Update 01_File_Management.md
Changed very small typo in setAllowedExtensions. Changed Extensiones to Extensions.
2020-07-13 14:20:27 +12:00
Garion Herman d408a4e714 Merge branch '4.6' into 4 2020-07-13 12:28:14 +12:00
Garion Herman fbe0f5a981 Merge branch '4.5' into 4.6 2020-07-13 12:27:02 +12:00
Garion Herman 2b9ef6be16 Merge tag '4.6.0' into 4.6
Release 4.6.0
2020-07-13 12:26:06 +12:00
Garion Herman d6cb539335 Merge branch '4.4' into 4.5 2020-07-13 12:21:24 +12:00
Garion Herman f2d9150755 Added 4.4.7 changelog 2020-07-13 11:56:30 +12:00
Garion Herman 1726cd1f97 Added 4.5.3 changelog 2020-07-13 11:55:30 +12:00
Maxime Rainville d94075b02c DOC Restore in-modal editing entry to changlogs 2020-07-13 10:55:43 +12:00
Maxime Rainville 8a8189d005 DOC Add regression to changelogs 2020-07-13 08:52:04 +12:00
Ingo Schommer 8d6a248431 Merge remote-tracking branch 'origin/4.6' into 4 2020-07-11 09:07:39 +12:00
Maxime Rainville 0eb476916d DOC Explain how to implement a custom QueryPermissionChecker 2020-07-10 17:59:49 +12:00
Maxime Rainville cce2b16309 [CVE-2020-6164] Remove/deprecate unused controllers that can potentially give away some information about the underlying project. 2020-07-10 17:57:06 +12:00
Maxime Rainville 8518987cbd [CVE-2019-19326] Stop honouring X-HTTP-Method-Override header, X-Original-Url header and _method POST variable. Add SS_HTTPRequest::setHttpMethod() 2020-07-10 17:56:15 +12:00
Maxime Rainville 26866aabfd Added 4.6.0 changelog 2020-07-10 15:57:58 +12:00
Maxime Rainville 996c1b5719 [CVE-2020-6164] Remove/deprecate unused controllers that can potentially give away some information about the underlying project. 2020-07-10 15:03:18 +12:00
Maxime Rainville fa9a122a99 DOC 4.6.0 additional changelog and security changelog 2020-07-10 15:00:54 +12:00
Maxime Rainville 71db45b18b [CVE-2019-19326] Stop honouring X-HTTP-Method-Override header, X-Original-Url header and _method POST variable. Add SS_HTTPRequest::setHttpMethod() 2020-07-10 14:57:26 +12:00
Maxime Rainville 91d30db88f [CVE-2020-6164] Remove/deprecate unused controllers that can potentially give away some information about the underlying project. 2020-07-10 10:38:55 +12:00
Maxime Rainville 107706c12c [CVE-2019-19326] Stop honouring X-HTTP-Method-Override header, X-Original-Url header and _method POST variable. Add SS_HTTPRequest::setHttpMethod() 2020-07-10 10:38:42 +12:00
Guy Marriott fae61c0f1d
Merge pull request #9582 from open-sausages/pulls/fix-gridfielddatacolumns-callback 2020-07-09 11:58:39 -07:00
Andre Kiste 0ed340faa9
Merge pull request #9584 from open-sausages/pulls/4.5/plain-method-for-chinese-character
BUG Tweak DBHTMLText::Plain to avoid treating some chinese characters…
2020-07-09 23:13:12 +12:00
Maxime Rainville c3f0ac7718 Merge branch '4.5' into 4.6 2020-07-09 14:33:57 +12:00
Maxime Rainville f8360356e0 Merge branch '4.4' into 4.5 2020-07-09 14:28:28 +12:00
Maxime Rainville b780c4f504 BUG Tweak DBHTMLText::Plain to avoid treating some chinese characters as line breaks. 2020-07-09 13:33:43 +12:00
Ingo Schommer 1f0a78e57b FIX More context for GridFieldDataColumns callbacks
This emulates the callback signature from
GridFieldEditableColumns in the symbiote/silverstripe-gridfieldextensions module, which extends GridFieldDataColumns. In case canEdit() fails, this component passes control back to the parent (rendering a standard column content rather than a formfield). Which can become an issue if you've defined custom 'callback' handlers on setDisplayFields() - GridFieldDataColumns passes in only one arg (`$record`), while GridFieldEditableColumns passes in three (`$record`, `$col` and `$grid`).

While you could argue that this is a bug in the other module,
I think this additional context is beneficial for the main
GridFieldDataColumns use case as well, and it just happens to fix that bug.
2020-07-09 09:33:21 +12:00
Robbie Averill 1a47cde6ac
Merge pull request #9578 from creative-commoners/3.7.4-changelog
DOCS add 3.7.4 changelog to `4`
2020-07-08 09:43:24 -07:00
Maxime Rainville d3d81ad96c
DOC Add details about ModelAdmin and Login Forms to 4.6 changelogs (#9525) 2020-07-08 13:29:27 +12:00
Bryn Whyman 12a4c006e7
DOCS add note to changelog for Solr changes (#9576)
* DOCS add note to changelog for Solr changes
2020-07-08 13:22:36 +12:00
brynwhyman ec58dad051 DOCS add 3.7.4 changelog to `4`
Given that the changelog for 3.7.3 is in this branch, I'd say it's worth adding the latest version?

The alternative is we remove all 3.x changelogs from `4` and include a link to these in https://docs.silverstripe.org/en/4/changelogs/ to direct readers to the right place.
2020-07-08 10:30:24 +12:00
Bryn Whyman 7e58e909a0
Merge pull request #9575 from creative-commoners/pulls/4.6/changelog-460-regressions
Changelog 4.6.0 regressions
2020-07-06 10:20:20 +12:00
Serge Latyntcev e40c012210 DOC Add Regressions to 4.6.0 changelog 2020-07-06 09:58:43 +12:00
Daniel Hensby 162e4b7ff8
Merge pull request #9574 from patricknelson/patch-4
DOCS Update PHP support info
2020-07-03 12:16:32 +01:00
Patrick Nelson 92f4f1fa15
DOCS Update PHP support info
As of SS v4.5.0, PHP 7.1 is required. Updating that and also adding note that versions 4.0-4.4 still supported PHP 5.6.
2020-07-03 11:58:28 +01:00
rdigitalg 3bf89b2d13
FIX Try Catch for embeded media (#9424)
* Try Catch for embeded media
* added missing namespaces, translatable message INVALID_URL
* generate tag only once
* catch after closing bracket
* space after comma
* Update src/View/Shortcodes/EmbedShortcodeProvider.php
* Linting
Co-authored-by: ivan@digitalgarage.ro <ivan@digitalgarage.ro>
Co-authored-by: Steve Boyd <emteknetnz@gmail.com>
Co-authored-by: Loz Calver <kinglozzer@gmail.com>
2020-07-03 13:04:54 +12:00
Loz Calver ceeba9f1ae
Merge pull request #9194 from sminnee/manymany-add-joinobject
FIX: Set many-many-through joinRecord on newly added records.
2020-07-02 09:30:53 +01:00
Sam Minnee 01d3b4fd96 FIX: Set many-many-through joinRecord on newly added records.
When many-many-through relations are queried, a joinRecord is set on
each DataObject in the list to provide the extra fields defined on
the connector object. This didn’t previously happen when the record
was first add()ed to a list. This fixes that bug.
2020-07-02 15:18:12 +12:00
Robbie Averill 6446b50c4a
DOCS Add Cheddam to the core committers 2020-06-30 19:34:46 -07:00