Merge branch '7' into 8 #878
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
API Standardise deprecations
skip empty 'where' clauses
Update FluentExtension.php
Also copy translations on duplicate
Implement onAfterDuplicate
feat: add absolute base url for locales
copy Bugfix for GridFieldAddExistingSearchButton from master to version 6.0
fixes #823 - The magic constant __TRAIT__ was inserting namespaces into localization keys, containing slashes that could not be parsed by the TextCollector task. These have been replaced w/ the Trait name as a string
FIX allows i18nTextCollector to concatenate keys
fix: don't invoke db for ready check outside of dev urls
# Conflicts: # src/Extension/FluentExtension.php
fix: check for request prior to access
New task is based on the original task built for SiteTree but is now extendable for any DataObject enabled with Fluent. To prevent duplicate code, the original task now extends the new task.
…taobjects New dev/task to initialise DataObjects for existing datasets
TLN Update translations
Merge branch '6.0' into 6
Merge branch '6' into 7
ENH Use class name instead of self
FIX Issues when running with other modules installed
FIX Preview link when no locale set
Merge branch '7.1' into 7
sass-lint went EOL ages ago
ENH Don't use keyword self
Merge branch '7.1' into 7
tractorcow
approved these changes
Aug 20, 2024
|
exciting. Approved from my pov. are you happy to merge when you're ready? |
|
Yup, merging now. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a straight merge from the
7branch to the8branch. There's no merge conflicts so I was able to create the PR directly without needing a fork in the middle.