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
Sabina Talipova
643801a01b
MNT ESLint issues ( #2865 )
2023-07-10 09:49:33 +12:00
Guy Sartorelli
e91b7c7f8e
Merge pull request #2862 from andrewandante/FEAT_add_cms_interface_for_user_inherited_permission
...
FEAT update SiteTree permissions in CMS
2023-07-07 10:08:46 +12:00
Andrew Paxley
14eb767c9c
ENH update SiteTree permissions in CMS
2023-07-06 17:59:36 +12:00
Steve Boyd
06d39c2cc9
Merge branch '5.0' into 5
2023-06-16 11:41:37 +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
Guy Sartorelli
2ea9d85ee8
Merge pull request #2860 from creative-commoners/pulls/5/tx-1686703283
...
ENH Update translations
2023-06-14 15:25:26 +12:00
Steve Boyd
cdd6e54fce
ENH Update translations
2023-06-14 12:41:23 +12:00
Sabina Talipova
39fe63db8a
FIX Duplicate page keeps original pages canView and canEdit permission ( #2859 )
2023-06-12 13:29:18 +12:00
Steve Boyd
b42ef6273d
Merge branch '5.0' into 5
2023-05-31 14:41:09 +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
c7db5e25a9
Merge branch '5.0' into 5
2023-05-31 11:26:56 +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
