search

tractorcow-farm / silverstripe-fluent

Multi-language translate module for Silverstripe, without having to manage separate site trees.
BSD 3-Clause "New" or "Revised" License
91 stars 109 forks source link

Merge branch '7' into 8 #855

Closed GuySartorelli closed 3 months ago

GuySartorelli commented 3 months ago

The gha-merge-up action won't merge up because of changes in the yarn.lock file when merging up from the 7 branch to the 8 branch: https://github.com/tractorcow-farm/silverstripe-fluent/actions/runs/9217277458/job/25358976247

There is also a merge conflict - the FluentSiteTreeExtension::updateLocalisationTabColumns() method is removed in 7 but in 8 the visibility was updated, which caused a conflict. Resolution is to remove that method (see https://github.com/tractorcow-farm/silverstripe-fluent/pull/838)

I lack the required level of access to push directly to the 8 branch, so the only way I can resolve it is with a PR.

NOTE: DO NO SQUASH

Issue