Guy Sartorelli
04a0c928b3
Merge branch '4' into 5.1
2023-11-28 10:11:06 +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
2ccbbc2e9c
Merge branch '4' into 5.1
2023-11-11 13:24:05 +00:00
github-actions
fe3ddfef27
Merge branch '4.13' into 4
2023-11-11 13:24:04 +00:00
Guy Sartorelli
665b208d89
Merge pull request #2904 from creative-commoners/pulls/5.1/limit-100
...
FIX Limit Member map to 100
2023-11-09 09:49:27 +13:00
Steve Boyd
dd2bd61387
FIX Limit Member map to 100
2023-11-08 11:55:30 +13: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
eed9a79c19
Merge pull request #2898 from creative-commoners/pulls/5.1/remove-todo
...
MNT Remove TODO comments
2023-10-20 13:13:52 +13:00
Sabina Talipova
c1eaaaabfa
MNT Remove TODO comments
2023-10-19 16:22:38 +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
58a2d58173
Merge branch '5.0' into 5.1
2023-09-23 13:23:32 +00:00
github-actions
7427f615de
Merge branch '4' into 5.0
2023-09-23 13:23:31 +00: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
github-actions
1e7bba1dd3
Merge branch '5.0' into 5.1
2023-09-17 23:33:00 +00:00
Maxime Rainville
34581be27d
Merge pull request #2886 from creative-commoners/pulls/5.1/fix-regression-ui-button
...
FIX Regression issue UI URLSegment buttons
2023-09-18 11:28:24 +12: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
3b1b38bc06
Merge branch '4.13' into 4
2023-09-18 10:54:11 +12:00
Sabina Talipova
061517ac45
FIX Regression issue UI URLSegment buttons
2023-09-14 15:50:58 +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
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[bot]
2799ef3b39
DEP Update JS dependencies ( #2878 )
...
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
2023-08-31 11:58:54 +12:00
Guy Sartorelli
280eec2e17
Merge branch '5.0' into 5
2023-08-30 11:29:51 +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
6b3acefc47
Merge branch '5.0' into 5
2023-08-26 13:23:34 +00: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
0b3bbcd372
Merge branch '5.0' into 5
2023-08-19 13:23:56 +00: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
Guy Sartorelli
6decb06909
ENH Update translations ( #2873 )
2023-08-17 18:15:22 +12:00
Guy Sartorelli
391f836153
Merge pull request #2871 from creative-commoners/pulls/5/module-standardiser-1691549983
...
MNT Run module-standardiser
2023-08-15 12:09:05 +12:00
Steve Boyd
d865d508c9
MNT Run module-standardiser
2023-08-14 15:43:59 +12:00
Guy Sartorelli
78452fc1a8
Merge pull request #2870 from lekoala/patch-2
...
drop duplicated call
2023-08-02 17:05:32 +12:00
Thomas Portelange
c455a8288f
drop duplicated call
...
already called due to init being called in the extension by leftandmain
2023-07-28 08:25:46 +02:00
Sabina Talipova
c831b1be6b
DEP Update eslint module ( #2868 )
2023-07-12 11:04:39 +12:00
