Commit Graph

6477 Commits

Author SHA1 Message Date
Florian Thoma
1711c0c88e
API Move updateRelativeLink hook after concatination (#2770)
* move updateRelativeLink hook after concatination to make it actually updatable

* keep existing parameters the same

* revert to link parameter be first

* update updateRelativeLink method signature in SiteTreeExtension

* don't pass old parameters by reference
2022-08-31 12:33:05 +12:00
Steve Boyd
f9a19e7429
Merge pull request #2768 from creative-commoners/pulls/5/rescue-master-canberoot-check
Rescue Master Branch PR: FIX Don't offer to restore to root if can_be_root is false
2022-08-29 18:07:56 +12:00
Mike Cochrane
b46876b8a8
FIX Don't offer to restore to root if can_be_root is false 2022-08-25 14:18:50 +12:00
Steve Boyd
c130b55ecb
Merge pull request #2766 from creative-commoners/pulls/5/rescue-master-sitetree-not-page
Rescue Master Branch PR: MNT Use SiteTree instead of Page in tests
2022-08-25 11:47:14 +12:00
Mike Cochrane
2219899c10
MNT Use SiteTree instead of Page in tests 2022-08-25 10:17:41 +12:00
Guy Sartorelli
859ff00184
Merge pull request #2763 from creative-commoners/pulls/5/other-deps
DEP Update dependencies for CMS 5
2022-08-10 11:14:52 +12:00
Steve Boyd
7381de15e8 DEP Update dependencies for CMS 5 2022-08-09 17:24:39 +12:00
Guy Sartorelli
e580527111
Merge pull request #2759 from creative-commoners/pulls/5/major-deps
DEP Update core dependencies for CMS 5
2022-08-09 09:41:32 +12:00
Steve Boyd
72f8e5f71d DEP Update core dependencies for CMS 5 2022-08-04 17:36:54 +12:00
Steve Boyd
a7eccffe8c Merge branch '4.11' into 4 2022-08-02 18:45:57 +12:00
Steve Boyd
c4f55581e2 Merge branch '4.10' into 4.11 2022-08-02 18:45:53 +12:00
Guy Sartorelli
d320e44b8c
Merge pull request #2758 from creative-commoners/pulls/4.10/standardise-modules
MNT Standardise modules
2022-08-02 14:54:41 +12:00
Steve Boyd
5cabb11edb MNT Standardise modules 2022-08-01 10:04:24 +12:00
Guy Sartorelli
a4f3323c3c
Merge pull request #2757 from creative-commoners/pulls/4/update-js
MNT Use update-js action
2022-07-29 18:09:00 +12:00
Steve Boyd
aa04bd7a6e MNT Use update-js action 2022-07-29 12:40:35 +12:00
Steve Boyd
4e103143bf Merge branch '4.11' into 4 2022-07-25 09:58:49 +12:00
Steve Boyd
a2907dc851 Merge branch '4.10' into 4.11 2022-07-25 09:58:45 +12:00
Guy Sartorelli
c6257b906b
Merge pull request #2745 from creative-commoners/pulls/4.10/module-standards
MNT Use GitHub Actions CI
2022-07-15 14:43:14 +12:00
Steve Boyd
1f58414e65 MNT Use GitHub Actions CI 2022-07-15 14:07:19 +12:00
Guy Sartorelli
de8d7632c2
Merge pull request #2746 from mooror/enhance-batch-action-parameters
CMSMain - Fixed and enhanced BatchActionParameters
2022-07-12 15:36:53 +12:00
Guy Sartorelli
ff1c529898 Merge branch '4.11' into 4 2022-07-11 11:33:02 +12:00
Loz Calver
aee45aaef8
Merge pull request #2748 from creative-commoners/pulls/4.11/hide-redirector-file
FIX Hide uploadfield in redirector page by default
2022-07-08 09:16:52 +01:00
Guy Sartorelli
4d679ab4db FIX Hide uploadfield in redirector page by default 2022-07-08 13:58:47 +12:00
Benjamin
aca0defe16 BatchActionsExtension - Added blank end line 2022-07-07 12:46:22 -06:00
Benjamin Blake
fa1c6ae3db Created a batch action extension for LeftAndMain
+ Created an extension to add the `BatchActionParameters` fields from CMSMain to the `BatchActionsForm` in LeftAndMain
+ Applied the extension to LeftAndMain using YAML
2022-07-06 22:49:24 -06:00
Benjamin Blake
35d12228d0 CMSMain - Added HTML class attribute for styling
+ Added an `action-parameters` class to the BatchActionParameters field so we can style it without using ID selectors
2022-07-06 22:45:50 -06:00
Michal Kleiner
6bd3618f09
Fix CS 2022-07-07 10:32:19 +12:00
Benjamin Blake
654fa5a681 CMSMain - Linting changes + Added Docblock
+ Made the linting changes requested by @GuySartorelli
+ Added method documentation for BatchActionParameters()
2022-07-05 20:11:20 -06:00
Benjamin Blake
81593057de CMSMain - Fixed and enhanced BatchActionParameters
+ Fixed the $batchActions variable by making it use the `registeredActions()` method
+ Made the loop use `FieldHolder` instead of `Field` so CMS fields display correctly
+ Added hidden styles to the batch action div for jQuery show/hide functionality (found in Admin module PR)
2022-07-04 22:14:53 -06:00
Sabina Talipova
d304ba9963
Merge pull request #2742 from creative-commoners/pulls/4/get-unsaved-anchors-in-current-field
Works as expected in local environment. Tests passed. MERGE
2022-06-14 09:59:30 +12:00
Guy Sartorelli
ead1d2f02b FIX Always include unsaved anchors from the current WYSIWYG field 2022-06-13 11:17:38 +12:00
Sabina Talipova
77b5bfa497
Merge pull request #2741 from creative-commoners/pulls/4/allow-anchors-from-all-sources
I've done the tests in my local env. Works perfect.
2022-06-02 14:03:06 +12:00
Guy Sartorelli
845f0b3aa1 ENH Always load anchors for links on the current page.
Anchors can come from additional WYSIWYG fields included inside
associated DataObjects. Don't assume all anchor links on the page are in
this one field.
2022-05-25 17:45:11 +12:00
Guy Sartorelli
740a37f411 Merge remote-tracking branch 'origin/4.11' into 4 2022-05-13 11:21:39 +12:00
Sabina Talipova
1897cb3360
Merge pull request #2737 from creative-commoners/pulls/4.11/allow-empty-preview-urls
Issue was fixed
2022-05-11 14:45:34 +12:00
Guy Sartorelli
83104da329 FIX Ensure unstaged versioned objects can be previewed. 2022-05-11 13:58:47 +12:00
Steve Boyd
f596a77efa Merge branch '4.11' into 4 2022-05-10 21:54:32 +12:00
Guy Sartorelli
3a990c95f5 MNT Correct test SilverStripeNavigatorItems. 2022-05-06 14:38:00 +12:00
Guy Sartorelli
c02549cf30 FIX Allow empty PreviewURLs for CMSPreviewable objects
An empty PreviewURL will result in the "no preview available" message
displaying instead of a 404 error.
2022-05-06 14:37:35 +12:00
Steve Boyd
f72f5dc08c Update translations 2022-05-04 13:29:41 +12:00
dependabot[bot]
1acc397af7
Merge pull request #2734 from silverstripe/dependabot/npm_and_yarn/async-2.6.4 2022-05-03 09:51:45 +00:00
dependabot[bot]
4419f1ff15
Bump async from 2.6.3 to 2.6.4
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-28 19:40:38 +00:00
Steve Boyd
1563ab3fcf Merge branch '4.10' into 4 2022-04-26 15:22:21 +12:00
Guy Sartorelli
bb158e4f2e
Merge pull request #2730 from creative-commoners/pulls/4/php81
ENH PHP 8.1 compatibility
2022-04-22 16:18:11 +12:00
Michal Kleiner
87c3ee6268
Merge pull request #2732 from creative-commoners/pulls/4.10/translate-page-names
FIX Translate pagetype names in list view
2022-04-19 21:54:29 +12:00
Guy Sartorelli
4e757759ec FIX Translate pagetype names in list view 2022-04-19 16:04:20 +12:00
Guy Sartorelli
5840285d43
Merge pull request #2488 from andrewandante/FEAT/ground_control_to_pager_tom
FEATURE add config var for namespace mapping page->control
2022-04-14 16:02:20 +12:00
Steve Boyd
1b0b2154b4 ENH PHP 8.1 compatibility 2022-04-13 17:07:59 +12:00
Guy Sartorelli
13c1ae487f
Merge pull request #2731 from creative-commoners/pulls/4/p81fix
ENH Various fixes for PHP 8.1 compatibility
2022-04-13 16:10:56 +12:00
Andrew Aitken-Fincham
863ed24920 add config var for namespace mapping page->control, add test to confirm 2022-04-13 12:05:13 +12:00