Merge upstream/4.0-dev into origin/j4install (2)#39
Merged
Hackwar merged 37 commits intoHackwar:j4installfrom Mar 31, 2020
Merged
Merge upstream/4.0-dev into origin/j4install (2)#39Hackwar merged 37 commits intoHackwar:j4installfrom
Hackwar merged 37 commits intoHackwar:j4installfrom
Conversation
Replaces the windows style \ directory separator for the *nix style / which is more common when referring to server paths Fixes a typo to improve readbility
The feed on the post installation messages screen is hard coded. This PR adds the display of the feed-item-date. Without it the content of the feed is meaningless.
Super simple pr to change the markup so that field / label descriptions appear directly below the field and not the label
This PR adds active hightlighting and on hover highlighting to the sidebar used on the options page
As requested by @wilsonge this PR displays a simple description for the alias fields.
Moves the associations button so that it only appears when it can be used ie not on an unsaved article which is the same behaviour as versions and preview.
* language files for api * correction
… extensions, restructure protected extension list (joomla#28462)
Hackwar
pushed a commit
that referenced
this pull request
Dec 9, 2020
- Move the fonts abd their scss to `build/media_source/fonts` - Modify the the css build script so it copies the fonts and the compiled css to `media/fonts`. - Use a `filelist` field for selecting the fonts => No need to edit `templateDetails.xml` anymore for adding new fonts. - Dynamically register the asset so no need to edit `joomla.asset.json` anymore for adding new fonts.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.
Pull Request for joomla#28350.
Summary of Changes
Solve merge conflicts from joomla#28462 and updates your branch to latest changes in 4.0-dev.