tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
23,436 Commits 29 Branches 513 Tags 147 MiB
Commit Graph

96 Commits

Author SHA1 Message Date
Guy Sartorelli 6ede0316bf
Revert "Use field editorconfig when sanitising content" (#11180) 
This reverts commit e5eb98cc34.
 2024-03-20 12:02:54 +13:00
Bernie Hamlin e5eb98cc34 Use field editorconfig when sanitising content 2023-10-25 12:08:46 +13:00
Sabina Talipova 037168a4fe FIX Multi HTML entities in shortcodes 2023-08-08 13:08:19 +12:00
Sabina Talipova 0ab36f6ae1 UPD Add support new TinyMC cs_CZ.js 2023-05-16 11:56:05 +12:00
Steve Boyd cb76f312a4 Merge branch '4.11' into 4.12-release 2022-11-21 13:44:23 +13:00
Steve Boyd fe13856769 [CVE-2022-37429] Sanitise XSS 2022-11-21 13:06:40 +13:00
Phillip King c4b3d5304d Update tinymce links in comments 2022-10-14 16:11:58 +13:00
Steve Boyd 9c453abf89 API Update deprecations 2022-10-13 14:49:15 +13:00
Steve Boyd cc49036616 ENH Standardise deprecation messages 2022-10-13 14:05:49 +13:00
Steve Boyd 2b5420ee7d [CVE-2022-37430] Sanitise mixed case javascript 2022-08-23 15:36:48 +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
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
Steve Boyd 511b3bb060 ENH PHP 8.1 compatibility 2022-04-14 13:12:59 +12:00
Lukas 552cf5944d
MNT Fix various typos with codespell (#10177) 2021-12-13 21:05:33 +13:00
Daniel Hensby 507c70e2f5
Merge pull request #10023 from xini/fix-destroy-session-on-logout 2021-07-20 09:13:20 +01:00
Nicolaas c8c7ee4a08
DOCS better docblock for TinyMCEConfig::removeButtons 2021-07-18 11:30:29 +01:00
William Desportes c932d7e7fb
Fix the phpdoc blocks 2020-12-21 22:23:23 +01:00
Serge Latyntcev 034bace213 FIX TinyMCEConfig image size presets handle incorrect values 2020-10-12 16:54:29 +13:00
Daniel Hensby 237b2d5f74
Convert array delcarations to short array syntax 2020-04-20 18:58:09 +01:00
Maxime Rainville e59625fe5a
NEW Add ability to define image size preset for the TinyMCE editor. (#9276) 
* NEW Add ability to define image size preset for the TinyMCE editor.
* DOC Explain how to define image size pre-sets
 2019-10-22 11:50:28 +13:00
Dylan Wagstaff 047ac060c4
Merge pull request #9265 from emteknetnz/feature/noopener 
Add noopener attribute to links with a target
 2019-10-03 14:42:50 +13:00
Steve Boyd 887f198b07 Add rel attribute to link elements with a target attribute 2019-10-03 14:03:12 +13:00
Damian Mooyman 58c080db5a FEATURE Option placeholder for upload folder id (#9262) 
* FEATURE Option placeholder for upload folder id

* ENHANCEMENT Add setFolderName() to TinyMCEConfig

* Typehint return type

* Add type to param
 2019-09-30 10:50:55 +13:00
Saophalkun Ponlu 6a8c6703d1 Remove `use_gzip` from HTMLEditorField since it's been removed by TinyMCE codebase (#7261) 
* Remove `use_gzip` from HTMLEditorField

* DOCS Mention remove use_gzip in changelog
 2019-06-21 09:27:48 +12:00
Robbie Averill 64c2938c96 Merge branch '4.3' into 4 2018-11-06 11:05:22 +01:00
Luke Edwards 8866e7674a BUG: Fix duplicate plugins on HTML editor fields (#8559) 
* BUG: Fix duplicate plugins on HTML editor fields

* Add new test
 2018-11-02 12:26:53 +13:00
Robbie Averill b02a6fa02d FIX Replace usage of Convert JSON methods with json_encode 2018-10-28 21:15:29 +00:00
Robbie Averill f842ee2eec Update deprecation PHPDocs to be PSR-5 compliant 
See: https://github.com/php-fig/fig-standards/blob/master/proposed/phpdoc-tags.md#55-deprecated
 2018-09-28 10:49:14 +02:00
Robbie Averill b555bb83b8
Merge pull request #8359 from creative-commoners/pulls/4/HTMLEditorSchema 
Add schema information for HTMLEditorField
 2018-09-10 09:53:12 +02:00
Dylan Wagstaff f13ee4486d Add schema information for HTMLEditorField 
This allows React form builders (or other such view layer builders in a
headless environment) to obtain the details that would otherwise only be
rendered in a PHP side template. Some of the details are critical for
rendering correctly, and are necessary to be passed through -
particularly when moving toward replacing the Entwine initiator for
TinyMCE with a React component in `silverstripe/admin`.

I new interface method has been added to the abstract class for HTML
editor configs in order to facilitate this. It is not itself abstract as
this would break backwards compatiblity with any existing custom config
(aside from the TinyMCE one which we're editing here), which is most
certainly not what we want.
 2018-09-06 14:35:11 +12:00
Luke Edwards 234b795f89 BUG Use classes for TinyMCE alignment buttons 2018-08-31 09:02:17 +12:00
Damian Mooyman 77a45c0dbc
Merge remote-tracking branch 'origin/4.1' into 4 
# Conflicts:
#	src/Forms/HTMLEditor/HTMLEditorSanitiser.php
#	src/ORM/DataObjectSchema.php
#	src/ORM/Queries/SQLSelect.php
#	src/View/Parsers/ShortcodeParser.php
 2018-06-11 10:19:04 +12:00
Robbie Averill d842225df6 FIX Codesniffer style violations with comments 2018-06-11 09:55:18 +12:00
Daniel Hensby e260319823
Merge branch '4.0' into 4.1 2018-06-08 23:05:24 +01:00
Damian Mooyman 29f9b1c18f
Fix linting issues 2018-06-08 11:38:36 +12:00
Robbie Averill e0993043f8 Merge branch '4.1' into 4 2018-05-30 15:08:39 +12:00
Robbie Averill c8b0bc0ad7 Merge branch '4.0' into 4.1 
# Conflicts:
  #	src/ORM/DataObject.php
  #	tests/php/ORM/DataObjectDuplicationTest.php
  #	tests/php/ORM/DataObjectDuplicationTest/Class1.php
 2018-05-30 14:52:07 +12:00
Daniel Hensby d5e2d3fa67
Merge branch '3.6' into 4.0 2018-05-01 21:47:17 +01:00
Daniel Hensby 35bfce28fc
Merge branch '3' into 4 2018-03-16 15:04:26 +00:00
Daniel Hensby 069744bb21
Merge branch '3' into 4 2018-03-14 14:15:51 +00:00
Damian Mooyman 3a1c813b28
API Add getContentCSS() / setContentCSS() to allow per-config customisation of content_css 
Fixes #7873
 2018-03-05 16:10:44 +13:00
Damian Mooyman a3c52f901a
Merge remote-tracking branch 'origin/4.0' into 4 
# Conflicts:
#	src/Core/TempFolder.php
#	src/ORM/DataObject.php
#	src/View/ThemeResourceLoader.php
#	src/includes/constants.php
#	tests/php/Control/SimpleResourceURLGeneratorTest.php
#	tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
#	tests/php/View/RequirementsTest.php
 2018-01-22 14:57:05 +13:00
Daniel Hensby db610aaf3b
Fixing string concat CS issues 2018-01-16 18:39:30 +00:00
Damian Mooyman ca2fe3b1f6
BUG Fix themed editor.css url not being resolved properly 2018-01-16 16:25:17 +13:00
Damian Mooyman 69295a6e22
BUG Ensure that all tinymce_lang mappings are valid 2017-12-01 15:00:39 +13:00
Thomas Portelange e729cd2c37
TinyMCE lang is fr_FR for all French languages 
"fr" is not a valid tiny mce lang

https://www.tinymce.com/docs/configure/localization/

having "fr" as it is currently prevents loading the language file
 2017-11-29 12:54:27 +01:00
Chris Joe cd55a039e7
Merge pull request #7520 from open-sausages/pulls/4.0/config-redirect-works 
API / BUG - Introduce new request resolver middleware and fix broken forceWWW / forceSSL
 2017-11-02 10:01:58 +13:00
Damian Mooyman 0c178f934d
ENHANCEMENT Adjust tinymce footer, remove branding and restore path 
FIxes #294
 2017-10-31 12:12:59 +13:00