Merge upstream/4.0-dev into origin/j4install#37
Merged
Hackwar merged 73 commits intoHackwar:j4installfrom Mar 26, 2020
Merged
Conversation
* Adapt Toolbar of messages to other toolbars * remove whitespace
* Array to string conversion * CS
…e and not having privilege to create a new one (joomla#28345) * Handle exceptions from database installation In configuration model, delete configuration file in case of exceptions and re throw, in controller enqueue exception message in that case. * Handle RuntimeExceptions
* Namespace System - Privacy Consent plugin * Move form * Update file list in manifest * Remove constructor * Use FormHelper directly
- Move webpack config to media manager - Ensure dev assets aren't in production builds - Cleanup media manager XML file
Use old pseudo null date in 4.0.0-2019-07-02.sql for checked out time because the real null date value change is done with a later update script.
Author
|
The diff here might look scary, but if you compare my branch with 4.0-dev it should show your desired changes from your PR: joomla/joomla-cms@4.0-dev...richard67:4.0-dev-hannes-j4install-mod-1. |
Author
|
@Hackwar Merging this PR will be equivalent to updating your branch to base branch 4.0-dev from upstream plus solving merge conflicts. |
* api fix for content * api content multilanguage
[4.0] Add 'type' attribute to some com_media fields
* Dependency updates of javascript - mainly eslint + airbnb base * Run eslint fix
This pr adjust the padding on badges to improve legibility
…bases also in the component's install sql (joomla#28455) * Unicode collation in com_finder install.mysql.sql * Comments in com_finder install.postgresql.sql
* Add packager to drone * Sign drone * Don't validate js files in build/tmp folder * Remove unneeded export commands * Sign Drone
Author
|
@Hackwar Just updated to latest changes in 4.0-dev. |
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
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#28345 and joomla#28319.