Commit Graph

6490 Commits

Author SHA1 Message Date
Steve Boyd
9811579203 FIX Behat test 2023-01-12 13:55:37 +13:00
Guy Sartorelli
b6737962df
Merge pull request #2808 from creative-commoners/pulls/4.12/invalid-extra-meta
MNT Update unit test to detect invalid HTML
2022-12-20 17:58:47 +13:00
Steve Boyd
4a5e22cc60 MNT Update unit test to handle HTML5Value 2022-12-20 14:41:32 +13:00
Guy Sartorelli
0b6ee121e3
Merge branch '4.12-release' into 4.12 2022-12-19 01:42:13 +00:00
Steve Boyd
4c3bd3713d Merge branch '4.11' into 4.12-release 2022-11-21 13:53:57 +13:00
Guy Sartorelli
8526067c73
Merge pull request #2798 from creative-commoners/pulls/4.11/cve-2022-37421
Sanitise ExtraMeta field for XSS
2022-11-21 12:57:59 +13:00
Guy Sartorelli
5cc41057d0
Update translations 2022-11-10 01:56:20 +00:00
Guy Sartorelli
7a7c751f7c
FIX Don't use deprecated jQuery functions (#2792) 2022-11-01 17:27:27 +13:00
Guy Sartorelli
d0f49d1db7
Merge pull request #2791 from creative-commoners/pulls/4/deprecated
API Update deprecations
2022-10-25 12:29:58 +13:00
Steve Boyd
e63774061d FIX Call parent::contruct() 2022-10-18 16:35:11 +13:00
Steve Boyd
55b17c920c API Update deprecations 2022-10-18 15:23:59 +13:00
Steve Boyd
ea92339d8d ENH Update deprecation messages 2022-10-18 15:17:19 +13:00
Guy Sartorelli
efe08580f2
Merge branch '4.11' into 4 2022-10-13 11:13:46 +13:00
Guy Sartorelli
6acaaf9130
Merge pull request #2787 from TheBnl/patch-1
Reset ExtraClass on ViewModeSelector include
2022-10-11 13:17:32 +13:00
Bram de Leeuw
9ca4895f79 Reset ExtraClass on ViewModeSelector include
Since silverstripe/silverstripe-admin version 1.11 the include `SilverStripe\\Admin\\LeftAndMain_ViewModeSelector` uses an [ExtraClass parameter](6d1998707d/templates/SilverStripe/Admin/Includes/LeftAndMain_ViewModeSelector.ss (L1)). When this parameter is not explicitly set it inherits the ExtraClass of the template it's included in. In CMSMain this causes the ViewMode button to stretch.
2022-10-08 12:00:28 +02:00
Steve Boyd
d162fab123
[CVE-2022-37421] Sanitise ExtraMeta field for XSS 2022-10-03 12:55:04 +13:00
Guy Sartorelli
1f360c9c26
ENH Use the new CMSEditLinkExtension on SiteTree (#2778) 2022-09-30 15:10:49 +13:00
Guy Sartorelli
5acf028b59
Merge pull request #2777 from creative-commoners/pulls/4/review-behat-tests
ENH Replace ADMIN permissions with less permissions in Behat test
2022-09-13 10:18:46 +12:00
Sabina Talipova
19e9dc4920 ENH Replace ADMIN permissions with less permissions in Behat test 2022-09-09 11:23:44 +12:00
Guy Sartorelli
2b8bee7970
ENH Don't use deprecated method doRevertTo() (#2775) 2022-09-02 10:56:28 +12:00
Steve Boyd
f51d4f0aeb
Merge pull request #2765 from creative-commoners/pulls/4/rescue-master-no-dopublish
FIX Use publishRecursive() over doPublish()
2022-08-25 09:58:46 +12:00
Robbie Averill
79f3fd723d
FIX Use publishRecursive() over doPublish()
doPublish() is deprecated.
2022-08-24 16:08:45 +12:00
Steve Boyd
a7eccffe8c Merge branch '4.11' into 4 2022-08-02 18:45:57 +12:00
Steve Boyd
c4f55581e2 Merge branch '4.10' into 4.11 2022-08-02 18:45:53 +12:00
Guy Sartorelli
d320e44b8c
Merge pull request #2758 from creative-commoners/pulls/4.10/standardise-modules
MNT Standardise modules
2022-08-02 14:54:41 +12:00
Steve Boyd
5cabb11edb MNT Standardise modules 2022-08-01 10:04:24 +12:00
Guy Sartorelli
a4f3323c3c
Merge pull request #2757 from creative-commoners/pulls/4/update-js
MNT Use update-js action
2022-07-29 18:09:00 +12:00
Steve Boyd
aa04bd7a6e MNT Use update-js action 2022-07-29 12:40:35 +12:00
Steve Boyd
4e103143bf Merge branch '4.11' into 4 2022-07-25 09:58:49 +12:00
Steve Boyd
a2907dc851 Merge branch '4.10' into 4.11 2022-07-25 09:58:45 +12:00
Guy Sartorelli
c6257b906b
Merge pull request #2745 from creative-commoners/pulls/4.10/module-standards
MNT Use GitHub Actions CI
2022-07-15 14:43:14 +12:00
Steve Boyd
1f58414e65 MNT Use GitHub Actions CI 2022-07-15 14:07:19 +12:00
Guy Sartorelli
de8d7632c2
Merge pull request #2746 from mooror/enhance-batch-action-parameters
CMSMain - Fixed and enhanced BatchActionParameters
2022-07-12 15:36:53 +12:00
Guy Sartorelli
ff1c529898 Merge branch '4.11' into 4 2022-07-11 11:33:02 +12:00
Loz Calver
aee45aaef8
Merge pull request #2748 from creative-commoners/pulls/4.11/hide-redirector-file
FIX Hide uploadfield in redirector page by default
2022-07-08 09:16:52 +01:00
Guy Sartorelli
4d679ab4db FIX Hide uploadfield in redirector page by default 2022-07-08 13:58:47 +12:00
Benjamin
aca0defe16 BatchActionsExtension - Added blank end line 2022-07-07 12:46:22 -06:00
Benjamin Blake
fa1c6ae3db Created a batch action extension for LeftAndMain
+ Created an extension to add the `BatchActionParameters` fields from CMSMain to the `BatchActionsForm` in LeftAndMain
+ Applied the extension to LeftAndMain using YAML
2022-07-06 22:49:24 -06:00
Benjamin Blake
35d12228d0 CMSMain - Added HTML class attribute for styling
+ Added an `action-parameters` class to the BatchActionParameters field so we can style it without using ID selectors
2022-07-06 22:45:50 -06:00
Michal Kleiner
6bd3618f09
Fix CS 2022-07-07 10:32:19 +12:00
Benjamin Blake
654fa5a681 CMSMain - Linting changes + Added Docblock
+ Made the linting changes requested by @GuySartorelli
+ Added method documentation for BatchActionParameters()
2022-07-05 20:11:20 -06:00
Benjamin Blake
81593057de CMSMain - Fixed and enhanced BatchActionParameters
+ Fixed the $batchActions variable by making it use the `registeredActions()` method
+ Made the loop use `FieldHolder` instead of `Field` so CMS fields display correctly
+ Added hidden styles to the batch action div for jQuery show/hide functionality (found in Admin module PR)
2022-07-04 22:14:53 -06:00
Sabina Talipova
d304ba9963
Merge pull request #2742 from creative-commoners/pulls/4/get-unsaved-anchors-in-current-field
Works as expected in local environment. Tests passed. MERGE
2022-06-14 09:59:30 +12:00
Guy Sartorelli
ead1d2f02b FIX Always include unsaved anchors from the current WYSIWYG field 2022-06-13 11:17:38 +12:00
Sabina Talipova
77b5bfa497
Merge pull request #2741 from creative-commoners/pulls/4/allow-anchors-from-all-sources
I've done the tests in my local env. Works perfect.
2022-06-02 14:03:06 +12:00
Guy Sartorelli
845f0b3aa1 ENH Always load anchors for links on the current page.
Anchors can come from additional WYSIWYG fields included inside
associated DataObjects. Don't assume all anchor links on the page are in
this one field.
2022-05-25 17:45:11 +12:00
Guy Sartorelli
740a37f411 Merge remote-tracking branch 'origin/4.11' into 4 2022-05-13 11:21:39 +12:00
Sabina Talipova
1897cb3360
Merge pull request #2737 from creative-commoners/pulls/4.11/allow-empty-preview-urls
Issue was fixed
2022-05-11 14:45:34 +12:00
Guy Sartorelli
83104da329 FIX Ensure unstaged versioned objects can be previewed. 2022-05-11 13:58:47 +12:00
Steve Boyd
f596a77efa Merge branch '4.11' into 4 2022-05-10 21:54:32 +12:00