Commit Graph

6563 Commits

Author SHA1 Message Date
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
Maxime Rainville
c26eed20a4
Merge pull request #2827 from creative-commoners/pulls/4/broken-builds-cms4
MNT Update unit test to work with both HTML4Value and HTML5Value
2023-01-26 17:03:24 +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
Maxime Rainville
2b0374e692
Merge pull request #2823 from creative-commoners/pulls/5/broken-builds
MNT Broken builds
2023-01-20 14:53:28 +13:00
Steve Boyd
f362d8b129 MNT Broken builds 2023-01-19 16:54:57 +13:00
Guy Sartorelli
9bb6f700b4
Merge pull request #2820 from creative-commoners/pulls/5/remove-translatable
ENH Remove unused Translatable code
2023-01-19 09:05:03 +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
Steve Boyd
b57d557bc7 ENH Remove unused Translatable code 2023-01-18 14:07:39 +13:00
Maxime Rainville
97fdff4bb2
API Remove deprecated CMSMain::$subitem_class config (#2821) 2023-01-18 11:06:45 +13:00
Maxime Rainville
5316767ecd
Merge pull request #2819 from creative-commoners/pulls/4/deprecate-legacy-tasks
API Deprecate legacy tasks
2023-01-17 23:45:56 +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
Maxime Rainville
b0fec1886b
API Remove pointless subitem_class config (#2817) 2023-01-16 23:50:59 +13:00
Guy Sartorelli
61d729285f
Merge pull request #2814 from creative-commoners/pulls/5/lint
MNT Add yarn lint back in
2023-01-13 15:40:31 +13:00
Steve Boyd
a44547915d MNT Add yarn lint back in 2023-01-13 15:17:54 +13:00
Guy Sartorelli
9907209a07
Merge pull request #2815 from creative-commoners/pulls/4.12/behat
FIX Behat test
2023-01-12 17:08:20 +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
Maxime Rainville
3c7459208e
Merge pull request #2811 from creative-commoners/pulls/5/fix-behat
MNT Fix behat test for inserting WYSIWYG links
2023-01-11 17:17:31 +13:00
Guy Sartorelli
ef4122da04
ENH Use the EmotionCssCacheProvider component
This ensures we can override the react-select CSS if we need to.
2023-01-11 16:06:36 +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
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
cba1acb88e
Merge pull request #2809 from creative-commoners/pulls/5/remove-silverstripe-version-file
MNT Remove silverstripe_version file
2022-12-20 12:11:47 +13:00
Guy Sartorelli
bd42008584
MNT Remove silverstripe_version file
This file hasn't been updated since 2012 and was only referenced in the now-removed `SilverStripe\Dev\SapphireInfo` class.
2022-12-20 11:35:45 +13:00
Guy Sartorelli
d90f27da64
Merge branch '4.12' into 4 2022-12-19 01:42:17 +00:00
Guy Sartorelli
0b6ee121e3
Merge branch '4.12-release' into 4.12 2022-12-19 01:42:13 +00:00
Guy Sartorelli
5e843d2619
DEP Upgrade build stack (#2795)
* DEP Upgrade webpack config and various deps

* DEP Update code to work with upgraded libraries

* MNT run yarn build
2022-12-19 10:21:10 +13:00
Guy Sartorelli
ddbe4ea4ce
DEP Upgrade build stack (#2795)
* DEP Upgrade webpack config and various deps

* DEP Update code to work with upgraded libraries

* MNT run yarn build
2022-12-19 10:20:52 +13:00
Guy Sartorelli
145f063c33
Merge branch '4' into 5 2022-12-14 15:22:01 +13:00
Guy Sartorelli
03bac4b72d
Merge pull request #2806 from creative-commoners/pulls/5/absolute-link
FIX Cast absoluteUrl() argument to string
2022-12-13 16:27:07 +13:00
Steve Boyd
605daf5026 FIX Cast absoluteUrl() argument to string 2022-12-09 10:02:43 +13:00
Sabina Talipova
0e5428b78b
API Remove deprecated code (#2800) 2022-12-08 10:44:36 +13:00
Guy Sartorelli
8b1433b263
Merge pull request #2804 from creative-commoners/pulls/5/sortraw
FIX Use orderBy() instead of sort()
2022-12-07 14:53:18 +13:00
Steve Boyd
3186e0e129 FIX Use orderBy() instead of sort() 2022-12-05 17:46:44 +13:00
Sabina Talipova
495e453dce
Merge pull request #2799 from creative-commoners/pulls/4/stop-using-depr
API Stop using deprecated API
2022-12-05 16:34:34 +13:00
Steve Boyd
20467b3846 API Stop using deprecated API 2022-11-24 13:03:26 +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 2d10a624b3, reversing
changes made to af1a482d20.
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