github-actions
1e7bba1dd3
Merge branch '5.0' into 5.1
2023-09-17 23:33:00 +00:00
Guy Sartorelli
6259ca30ad
Merge branch '4' into 5.0
...
# Conflicts:
# client/dist/js/TinyMCE_sslink-anchor.js
# client/dist/js/TinyMCE_sslink-internal.js
# composer.json
# tests/behat/features/insert-a-link.feature
# tests/behat/features/insert-anchor-link.feature
2023-09-18 11:10:29 +12:00
Guy Sartorelli
4a92f5eb64
FIX Allow wrapping an image in a link ( #2884 )
2023-09-11 12:33:00 +12:00
Guy Sartorelli
ba578cfc06
FIX Allow wrapping an image in a link ( #2883 )
...
Relies on logic added to silverstripe/admin, so we need to bump the
constraint as well.
Behat test requires new logic added to the behat-extension module.
2023-09-07 10:24:09 +12:00
Steve Boyd
332898f3ed
Merge branch '5.0' into 5.1
2023-09-05 15:19:54 +12:00
Steve Boyd
7e42058206
Merge branch '4' into 5.0
2023-09-05 15:19:35 +12:00
Sabina Talipova
269eb5d70c
FIX SiteTree::DependentPages method returns non-SiteTree instance
2023-08-31 15:29:01 +12:00
Sabina Talipova
39fe63db8a
FIX Duplicate page keeps original pages canView and canEdit permission ( #2859 )
2023-06-12 13:29:18 +12:00
Sabina Talipova
93f57d2300
FIX Replace Diff class with HtmlDiff
2023-02-09 10:32:25 +13:00
Steve Boyd
222972c687
Merge branch '4' into 5
2023-02-02 16:34:19 +13:00
Steve Boyd
9269356ae9
Merge branch '4.12' into 4
2023-02-02 16:09:14 +13:00
Guy Sartorelli
b02beba7ba
Resolve a couple of behat issues ( #2830 )
...
* FIX Correctly add message to reactstrap-confirm
* MNT Fix behat tests
2023-01-30 10:32:26 +13:00
Steve Boyd
b5a25e49f6
MNT Update unit test to work with both HTML4Value and HTML5Value
2023-01-26 15:23:46 +13:00
Maxime Rainville
081eea42c5
Merge pull request #2824 from creative-commoners/pulls/5/remove-legacy-upgrader
...
MNT Remove legacy upgrader config
2023-01-23 10:36:04 +13:00
Steve Boyd
30685c9227
MNT Remove legacy upgrader config
2023-01-20 17:13:11 +13:00
Guy Sartorelli
37af732dbf
Merge pull request #2771 from xini/fix-5-remove-trailing-slash-from-sitetree-links
...
SS5: Remove trailing slash from SiteTree links if no action present
2023-01-20 15:46:39 +13:00
Florian Thoma
18cb6d499d
API Normalise trailing slashes in links
2023-01-20 15:08:37 +13:00
Steve Boyd
f362d8b129
MNT Broken builds
2023-01-19 16:54:57 +13:00
Maxime Rainville
69fabe9a34
Merge pull request #2818 from creative-commoners/pulls/5/remove-legacy-tasks
...
API Remove legacy tasks
2023-01-18 14:22:01 +13:00
Maxime Rainville
50cefa6d14
Merge branch '4' into 5
2023-01-17 22:35:51 +13:00
Steve Boyd
1bd578fc96
API Remove legacy tasks
2023-01-17 12:31:51 +13:00
Steve Boyd
75eae7f2bf
API Deprecate legacy tasks
2023-01-17 12:26:42 +13:00
Steve Boyd
9811579203
FIX Behat test
2023-01-12 13:55:37 +13:00
Maxime Rainville
e7d9d1b36e
Merge pull request #2813 from creative-commoners/pulls/5/fix-behat2
...
Fix anchor select field component
2023-01-11 17:53:01 +13:00
Guy Sartorelli
b9115f3f6d
Fix anchor select field component
...
This should have been done when we upgraded react-select. My bad.
2023-01-10 12:34:13 +13:00
Guy Sartorelli
dd79cf5a23
MNT Fix behat test for inserting WYSIWYG links
...
The selectors for TreeDropdownField's markup changed when we updated
react-select.
2023-01-09 13:01:49 +13:00
Steve Boyd
4a5e22cc60
MNT Update unit test to handle HTML5Value
2022-12-20 14:41:32 +13:00
Guy Sartorelli
d90f27da64
Merge branch '4.12' into 4
2022-12-19 01:42:17 +00:00
Sabina Talipova
0e5428b78b
API Remove deprecated code ( #2800 )
2022-12-08 10:44:36 +13:00
Guy Sartorelli
911a71d6f6
Merge branch '4' into '5'
2022-11-21 18:07:57 +13:00
Guy Sartorelli
003f9ba750
Revert "Merge branch '4' into 5"
...
This reverts commit 2d10a624b3af1a482d20
2022-11-21 17:11:42 +13:00
Sabina Talipova
2d10a624b3
Merge branch '4' into 5
2022-11-21 16:59:42 +13:00
Steve Boyd
4c3bd3713d
Merge branch '4.11' into 4.12-release
2022-11-21 13:53:57 +13:00
Steve Boyd
e64bfdb394
API Stop using deprecated API
2022-11-16 15:39:13 +13:00
Guy Sartorelli
8320023526
Merge pull request #2788 from creative-commoners/pulls/5/action-signature
...
API Strongly-type action method signatures
2022-10-19 10:08:22 +13:00
Steve Boyd
6e19ae737f
API Strongly-type action method signatures
2022-10-18 18:21:09 +13:00
Guy Sartorelli
9b64c7de24
Merge branch '4' into 5
2022-10-13 11:18:14 +13:00
Guy Sartorelli
d7857ebbe0
API Migrate SilverStripeNagivator classes
...
These classes are useful with `silverstripe/admin` and
`silverstripe/versioned` without needing `silverstripe/cms`.
2022-10-05 14:24:11 +13:00
Steve Boyd
d162fab123
[CVE-2022-37421] Sanitise ExtraMeta field for XSS
2022-10-03 12:55:04 +13:00
Guy Sartorelli
7368df8757
FIX Fix link plugins to support tinymce6
2022-09-30 15:27:38 +13:00
Guy Sartorelli
1f360c9c26
ENH Use the new CMSEditLinkExtension on SiteTree ( #2778 )
2022-09-30 15:10:49 +13:00
Sabina Talipova
19e9dc4920
ENH Replace ADMIN permissions with less permissions in Behat test
2022-09-09 11:23:44 +12:00
Guy Sartorelli
d56682509c
Merge branch '4' into 5
2022-09-02 11:01:22 +12:00
Guy Sartorelli
2b8bee7970
ENH Don't use deprecated method doRevertTo() ( #2775 )
2022-09-02 10:56:28 +12:00
Steve Boyd
aa4ba82f38
Merge pull request #2769 from creative-commoners/pulls/5/rescue-master-remove-history-viewer
...
API Rescue Master Branch PR: Remove deprecated CMSPageHistoryViewer
2022-09-01 14:50:58 +12:00
Guy Sartorelli
f2c4423d0c
Merge branch '4' into 5
2022-08-31 13:56:26 +12:00
Aaron Carlino
cda7857e12
API: Remove deprecated CMSPageHistoryViewer
2022-08-25 16:18:01 +12:00
Mike Cochrane
2219899c10
MNT Use SiteTree instead of Page in tests
2022-08-25 10:17:41 +12:00
Robbie Averill
79f3fd723d
FIX Use publishRecursive() over doPublish()
...
doPublish() is deprecated.
2022-08-24 16:08:45 +12:00
Guy Sartorelli
ff1c529898
Merge branch '4.11' into 4
2022-07-11 11:33:02 +12:00
