Merge 2 to 3 #75
Closed
Merge 2 to 3 #75
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
* NEW: Empty link title fallbacks to Page. * PR fixes.
* Add table_name config to all models * Update namespace and table names * Update template location
BUG: Change link type in via a GridField edit form.
BUG: Fix Composer autoload settings. Bump PHP versions for the test suite.
* Add PhoneField. Add migration helpers from Linkable Co-authored-by: Chris Penny <cpenny@silverstripe.com> Co-authored-by: Mojmir Fendek <mfendek@silverstripe.com>
…g, missing feature).
# Conflicts: # README.md # _config/graphql.yml # client/dist/js/bundle.js # client/src/boot/index.js # client/src/boot/registerReducers.js # client/src/components/LinkField/LinkField.js # client/src/components/LinkModal/FileLinkModal.js # client/src/components/LinkModal/LinkModal.js # client/src/components/LinkPicker/LinkPicker.js # client/src/tests/sample-test.js # composer.json # docs/en/linkable-migration.md # src/Extensions/ModalController.php # src/GraphQL/LinkDescriptionQuery.php # src/GraphQL/LinkDescriptionType.php # src/GraphQL/LinkTypeQuery.php # src/GraphQL/LinkTypeType.php # src/Models/EmailLink.php # src/Models/ExternalLink.php # src/Models/FileLink.php # src/Models/Link.php # src/Models/PhoneLink.php # src/Models/SiteTreeLink.php # src/Tasks/LinkableMigrationTask.php # templates/SilverStripe/LinkField/Models/Link.ss # tests/php/Models/LinkTest.php
# Conflicts: # src/Models/SiteTreeLink.php # src/Tasks/LinkableMigrationTask.php
# Conflicts: # src/Models/FileLink.php
…er the default setup.
# Conflicts: # src/Models/SiteTreeLink.php
# Conflicts: # src/Models/SiteTreeLink.php
# Conflicts: # src/Models/ExternalLink.php # src/Models/FileLink.php # src/Models/SiteTreeLink.php # src/Type/Registry.php
mfendeksilverstripe
force-pushed
the
feature/merge-2-to-3
branch
from
f8f4fc5
to
8f659c3
Compare
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.
Merge 2 to 3
2branch with CMS 5 upgrade change