7427f615de
Merge branch '4' into 5.0
2023-09-23 13:23:31 +00:00
992e2dfb8e
Merge branch '4.13' into 4
2023-09-23 13:23:30 +00:00
624048fc47
Merge pull request #2888 from mirche97/fix/virtualpage-edit-link
...
Fix/virtualpage edit link
2023-09-22 09:41:10 +12:00
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
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
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
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
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
3b1b38bc06
Merge branch '4.13' into 4
2023-09-18 10:54:11 +12:00
4a92f5eb64
FIX Allow wrapping an image in a link ( #2884 )
2023-09-11 12:33:00 +12:00
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
7e42058206
Merge branch '4' into 5.0
2023-09-05 15:19:35 +12:00
40a91496e3
Merge branch '4.13' into 4
2023-09-02 13:23:26 +00:00
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
269eb5d70c
FIX SiteTree::DependentPages method returns non-SiteTree instance
2023-08-31 15:29:01 +12:00
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
57c5dcbebb
MNT Run module-standardiser
2023-08-29 15:08:58 +12:00
b8e30925e8
Merge branch '4' into 5.0
2023-08-26 13:23:33 +00:00
ffebe5d96e
Merge branch '4.13' into 4
2023-08-26 13:23:31 +00:00
14037a776f
ENH Update translations ( #2874 )
2023-08-21 12:13:19 +12:00
461cab09a0
Merge branch '4' into 5.0
2023-08-19 13:23:55 +00:00
01d389ec44
Merge branch '4.13' into 4
2023-08-19 13:23:54 +00:00
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
b44ceb95ed
Merge branch '4' into 5.0
2023-06-16 11:40:00 +12:00
97861d4e02
Merge branch '4.13' into 4
2023-06-16 11:39:43 +12:00
7a17383e47
Merge pull request #2861 from creative-commoners/pulls/4.13/tx-1686724591
...
ENH Update translations
2023-06-15 10:06:31 +12:00
d9b6f7acad
ENH Update translations
2023-06-14 18:36:31 +12:00
1f2bf0a8a7
Merge branch '4' into 5.0
2023-05-31 14:40:54 +12:00
12cf9159c8
Merge branch '4.13' into 4
2023-05-31 14:38:55 +12:00
79df11c89f
Merge pull request #2857 from creative-commoners/pulls/4.13/tx-1685417394
...
ENH Update translations
2023-05-31 11:27:26 +12:00
984cf404f4
Merge branch '4' into 5.0
2023-05-31 11:26:36 +12:00
989bb7944a
Merge branch '4.13' into 4
2023-05-31 11:24:51 +12:00
204ccd20b7
ENH Update translations
2023-05-30 15:29:54 +12:00
4f963bef5b
Merge branch '4.12' into 4.13
2023-05-08 12:56:33 +12:00
55eabd6694
FIX Don't require jquery on the frontend ( #2854 )
2023-05-08 12:53:10 +12:00
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
28ecbdc845
MNT Use React Testing Library
2023-04-28 10:48:47 +12:00
ca837d6ccd
Merge branch '4' into 5.0
2023-04-27 14:44:59 +12:00
8317309864
Merge branch '4.13' into 4
2023-04-26 12:44:39 +12:00
cd7fe60a33
Merge branch '4.12' into 4.13
2023-04-24 11:49:18 +12:00
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
cfc48fad0a
DOC Update README.md for CMS 5
2023-04-19 17:38:49 +12:00
0b50824e46
Merge pull request #2847 from creative-commoners/pulls/5.0/devjs
...
MNT Update dev JS
2023-04-03 15:32:17 +12:00
b1efcc217d
MNT Update dev JS
2023-04-03 14:30:30 +12:00
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
f2d745afec
Merge branch '4' into 5.0
2023-03-30 13:28:53 +13:00
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
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
79dfc75192
MNT Revert erroneous dependency changes
2023-03-28 14:40:40 +13:00
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
github-actions
Guy Sartorelli
mirche97
Guy Sartorelli
Steve Boyd
Sabina Talipova
Thomas Portelange
Sabina Talipova
Maxime Rainville
Dylan Wagstaff