Skip to content

Merge upstream/4.0-dev into origin/j4install#37

Merged
Hackwar merged 73 commits intoHackwar:j4installfrom
richard67:4.0-dev-hannes-j4install-mod-1
Mar 26, 2020
Merged

Merge upstream/4.0-dev into origin/j4install#37
Hackwar merged 73 commits intoHackwar:j4installfrom
richard67:4.0-dev-hannes-j4install-mod-1

Conversation

@richard67
Copy link
Copy Markdown

Pull Request for joomla#28350.

Summary of Changes

Solve merge conflicts from joomla#28345 and joomla#28319.

wilsonge and others added 23 commits March 15, 2020 13:52
* Adapt Toolbar of messages to other toolbars

* remove whitespace
…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.
@richard67
Copy link
Copy Markdown
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.

@richard67
Copy link
Copy Markdown
Author

@Hackwar Merging this PR will be equivalent to updating your branch to base branch 4.0-dev from upstream plus solving merge conflicts.

wilsonge and others added 26 commits March 24, 2020 10:48
[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
@richard67 richard67 requested a review from Hackwar as a code owner March 26, 2020 10:42
@richard67
Copy link
Copy Markdown
Author

@Hackwar Just updated to latest changes in 4.0-dev.

@Hackwar Hackwar merged commit 70dd0f4 into Hackwar:j4install Mar 26, 2020
@richard67 richard67 deleted the 4.0-dev-hannes-j4install-mod-1 branch March 26, 2020 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.