Commit Graph

6553 Commits

Author SHA1 Message Date
github-actions 6bc1171323 Merge branch '4.13' into 4 2024-02-10 13:24:58 +00:00
Guy Sartorelli ac3486938f
TLN Update translations (#2921) 2024-02-08 13:28:05 +13:00
Guy Sartorelli 9dfc5dea2e
TLN Update translations (#2920) 2024-02-07 16:02:32 +13:00
Guy Sartorelli 9fbb2f3b02
Merge branch '4.13' into 4 2024-01-25 14:18:12 +13:00
Guy Sartorelli dfc42e7c86
FIX Add tinymce link menuitems per editor instance (#2916) 2024-01-25 11:39:34 +13:00
github-actions 089151b835 Merge branch '4.13' into 4 2023-11-25 13:24:04 +00:00
Will Rossiter 579986a691
FIX Handle exceptions when using /0 as a URL (#2825) 2023-11-20 09:49:44 +13:00
github-actions fe3ddfef27 Merge branch '4.13' into 4 2023-11-11 13:24:04 +00:00
Guy Sartorelli 0df19a874a
Merge pull request #2903 from creative-commoners/pulls/4.13/tx-1699241265
TLN Update translations
2023-11-07 11:14:20 +13:00
Steve Boyd a51effa2ac TLN Update translations 2023-11-06 16:27:45 +13:00
Guy Sartorelli bec8b760e4
Merge pull request #2812 from sunnysideup/patch-19
PATCH: fixing jquery link to thirdparty/jquery-query/jquery.query.js
2023-10-03 10:16:48 +13:00
github-actions 992e2dfb8e Merge branch '4.13' into 4 2023-09-23 13:23:30 +00:00
Guy Sartorelli 624048fc47
Merge pull request #2888 from mirche97/fix/virtualpage-edit-link
Fix/virtualpage edit link
2023-09-22 09:41:10 +12:00
mirche97 5c06933986 Update code/Model/VirtualPage.php
Co-authored-by: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
2023-09-21 14:50:34 +02:00
mirche97 9edc46f53d Update code/Model/VirtualPage.php
Co-authored-by: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
2023-09-21 14:50:08 +02:00
mirche97 da115d9910 use AdminRootController::get_admin_route()
use AdminRootController::get_admin_route() instead of reading url_base directly from config
2023-09-21 14:49:56 +02:00
mirche97 c3e7a49904 fixed VirtualPage generating incorrect CMS edit links
VirtualPage  now uses AdminRootController config `url_base` to generate edit links
2023-09-21 14:49:38 +02:00
Guy Sartorelli 3b1b38bc06
Merge branch '4.13' into 4 2023-09-18 10:54:11 +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
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
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 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 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 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 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 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
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
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
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
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
Steve Boyd 9269356ae9 Merge branch '4.12' into 4 2023-02-02 16:09:14 +13:00