Commit Graph

6614 Commits

Author SHA1 Message Date
Steve Boyd 7e42058206 Merge branch '4' into 5.0 2023-09-05 15:19:35 +12:00
github-actions 40a91496e3 Merge branch '4.13' into 4 2023-09-02 13:23:26 +00:00
Guy Sartorelli 90e30994ec
Merge pull request #2879 from creative-commoners/pulls/4.13/deppage-non-sitetree-items
FIX SiteTree::DependentPages method returns non-SiteTree instance
2023-09-01 11:12:59 +12:00
Sabina Talipova 269eb5d70c FIX SiteTree::DependentPages method returns non-SiteTree instance 2023-08-31 15:29:01 +12:00
Guy Sartorelli d11915cffd
Merge pull request #2876 from creative-commoners/pulls/5.0/module-standardiser-1693278538
MNT Run module-standardiser
2023-08-29 17:08:18 +12:00
Steve Boyd 57c5dcbebb MNT Run module-standardiser 2023-08-29 15:08:58 +12:00
github-actions b8e30925e8 Merge branch '4' into 5.0 2023-08-26 13:23:33 +00:00
github-actions ffebe5d96e Merge branch '4.13' into 4 2023-08-26 13:23:31 +00:00
Guy Sartorelli 14037a776f
ENH Update translations (#2874) 2023-08-21 12:13:19 +12:00
github-actions 461cab09a0 Merge branch '4' into 5.0 2023-08-19 13:23:55 +00:00
github-actions 01d389ec44 Merge branch '4.13' into 4 2023-08-19 13:23:54 +00:00
Thomas Portelange 3295dd5062
Don't make query if not needed (#2863)
* Don't make query if not needed

See https://github.com/silverstripe/silverstripe-assets/issues/557 for background

* add comment
2023-08-19 00:42:21 +12:00
Steve Boyd b44ceb95ed Merge branch '4' into 5.0 2023-06-16 11:40:00 +12:00
Steve Boyd 97861d4e02 Merge branch '4.13' into 4 2023-06-16 11:39:43 +12:00
Guy Sartorelli 7a17383e47
Merge pull request #2861 from creative-commoners/pulls/4.13/tx-1686724591
ENH Update translations
2023-06-15 10:06:31 +12:00
Steve Boyd d9b6f7acad ENH Update translations 2023-06-14 18:36:31 +12:00
Steve Boyd 1f2bf0a8a7 Merge branch '4' into 5.0 2023-05-31 14:40:54 +12:00
Steve Boyd 12cf9159c8 Merge branch '4.13' into 4 2023-05-31 14:38:55 +12:00
Sabina Talipova 79df11c89f
Merge pull request #2857 from creative-commoners/pulls/4.13/tx-1685417394
ENH Update translations
2023-05-31 11:27:26 +12:00
Steve Boyd 984cf404f4 Merge branch '4' into 5.0 2023-05-31 11:26:36 +12:00
Steve Boyd 989bb7944a Merge branch '4.13' into 4 2023-05-31 11:24:51 +12:00
Steve Boyd 204ccd20b7 ENH Update translations 2023-05-30 15:29:54 +12:00
Steve Boyd 4f963bef5b Merge branch '4.12' into 4.13 2023-05-08 12:56:33 +12:00
Guy Sartorelli 55eabd6694
FIX Don't require jquery on the frontend (#2854) 2023-05-08 12:53:10 +12:00
Guy Sartorelli 81e7e1a01b
Merge pull request #2849 from creative-commoners/pulls/5.0/react-testing-library
MNT Use React Testing Library
2023-05-01 17:48:45 +12:00
Steve Boyd 28ecbdc845 MNT Use React Testing Library 2023-04-28 10:48:47 +12:00
Guy Sartorelli ca837d6ccd
Merge branch '4' into 5.0 2023-04-27 14:44:59 +12:00
Guy Sartorelli 8317309864
Merge branch '4.13' into 4 2023-04-26 12:44:39 +12:00
Guy Sartorelli cd7fe60a33
Merge branch '4.12' into 4.13 2023-04-24 11:49:18 +12:00
Sabina Talipova 6675f50f81
Merge pull request #2850 from creative-commoners/pulls/5.0/cms5-readme
DOC Update README.md for CMS 5
2023-04-21 15:29:11 +12:00
Guy Sartorelli cfc48fad0a
DOC Update README.md for CMS 5 2023-04-19 17:38:49 +12:00
Maxime Rainville 0b50824e46
Merge pull request #2847 from creative-commoners/pulls/5.0/devjs
MNT Update dev JS
2023-04-03 15:32:17 +12:00
Steve Boyd b1efcc217d MNT Update dev JS 2023-04-03 14:30:30 +12:00
Guy Sartorelli 241fa3e06e
Merge pull request #2845 from NightJar/pulls/4.12/undefined-index
FIX undefined index error in CMS
2023-03-31 10:35:46 +13:00
Steve Boyd f2d745afec Merge branch '4' into 5.0 2023-03-30 13:28:53 +13:00
Dylan Wagstaff e20036482b FIX undefined index error in CMS
With the CMS 4.12 update functionality was altered to utilise an
Extension to obtain the CMS Edit link for a page, rather than having
SiteTree do it internally. Unfortunately the default return case for
`extend` (see Extensible) is an _empty_ array. This leave code
potentially referencing an array offset that doesn't exist ([0]). PHP 8
is less forgiving that it's predecessors on this kind of behaviour. We
should check that the responses from extensions exist before trying to
reference them.
2023-03-28 18:58:55 +13:00
Maxime Rainville 873c697bae
Merge pull request #2844 from creative-commoners/pulls/4.13/fix-constraints
MNT Revert erroneous dependency changes
2023-03-28 16:51:23 +13:00
Guy Sartorelli 79dfc75192
MNT Revert erroneous dependency changes 2023-03-28 14:40:40 +13:00
Maxime Rainville 2b185d7ef7
Merge pull request #2843 from creative-commoners/pulls/4/dispatch-ci
MNT Use gha-dispatch-ci
2023-03-23 12:16:47 +13:00
Steve Boyd 887dfad3e4 MNT Use gha-dispatch-ci 2023-03-21 12:21:31 +13:00
Guy Sartorelli 7cf402dace
MNT Update development dependencies 2023-03-10 16:30:40 +13:00
Guy Sartorelli e607d78035
MNT Update release dependencies 2023-03-10 16:30:36 +13:00
Guy Sartorelli 8b574c81c7
MNT Update development dependencies 2023-03-10 12:21:27 +13:00
Steve Boyd f705df4b0c Merge branch '4' into 5.0 2023-03-08 12:22:34 +13:00
Guy Sartorelli 3b9d0692d1
Merge pull request #2841 from creative-commoners/pulls/4/tx-1678079726
ENH Update translations
2023-03-08 10:25:11 +13:00
Steve Boyd d0f3a6b9ec ENH Update translations 2023-03-06 18:15:26 +13:00
Steve Boyd 7fe9a04112 Merge branch '4' into 5.0 2023-03-02 16:22:11 +13:00
Guy Sartorelli 458981b604
Merge pull request #2840 from creative-commoners/pulls/4/mark-deprecated-classes
API Mark moved classes in silverstripe-admin module as deprecated
2023-03-02 14:43:39 +13:00
Sabina Talipova 9ed5aa8b49 API Mark moved classes in silverstripe-admin module as deprecated 2023-03-02 14:23:30 +13:00
Guy Sartorelli 3f1dbe4d3f
Merge pull request #2836 from creative-commoners/pulls/5.0/fix-broken-builds
FIX Replace Diff class with HtmlDiff
2023-02-14 18:55:21 +13:00