Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 3.8.11 Release into Joomla 4 #24068

Merged
merged 52 commits into from
Mar 3, 2019
Merged

Conversation

wilsonge
Copy link
Contributor

@wilsonge wilsonge commented Mar 2, 2019

Please don't squash merge as this will loose commit history. Only ever merge with a merge commit

SharkyKZ and others added 30 commits June 27, 2018 16:55
[plg_user_profile] Add RTL check to ToS field
…21098)

* Exceptions in Joomla\CMS\Table\Usergroup refer to categories

Pull Request for Issue joomla#21092 .

### Summary of Changes
remove todo that is clearly a copy paste error from somewhere else
change exception message to usergroups from catergory

NOTE the first exception` if ($this->id == 0)`
I am not sure if that should even be present - doesn't look like it to me - please advise

* Update Usergroup.php
* Speed up regex in emailcloak plugin

* Fix comment
* Fix subform.repeatable-table multi field styling

* Fix staging less/css

* revert previous
…and update sites rebuild (joomla#16355)

* Fix a problem with older language packs

Language packs installed under older Joomla versions are registered in the database under their package name, not under their name and since rebuild function fails on them.

e.g. package with 
  <name>Afrikaans (South Africa)</name>
  <packagename>af-ZA</packagename>

has name column in #_extensions table set as 	af-ZA and since existing query fails.

* Update updatesites.php
rigin and others added 20 commits July 23, 2018 15:43
…tact and newsfeeds (joomla#21180)

* [3.x FIX] Getting the correct associations in sidebyside view for
contact and newsfeeds

* undefined property

* correction in js
* [fix] fixed PluginHelper import of xtd-editors plugins

* [imp] small adjustment and comment
* Don't need a closure, jQuery ready function is enough. Use strict.

* Fix errors exposed by strict. Undeclared variables. wrong regex backreference

* Fix some undeclared/wrongly declared variables

* Avoid some redundant calls of $(this)

* Remove some redundant (also wrong) code.
* make the text clealer

Make the PLG_TWOFACTORAUTH_TOTP_STEP3_TEXT text clealer.

* thans @brianteeman
PR for joomla#12448

## Steps to reproduce the issue

Effects all appended input fields. Eg. Navigate to a single article menu item (Menus -> MainMenu -> Home) and resize the screen below 767px. Input fields extend outside the viewport.
…accidental deletion with last release's post-update script
@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester PR-4.0-dev labels Mar 2, 2019
@@ -245,7 +246,9 @@ jQuery(document).ready(function($) {
var reference = document.getElementById('reference-association');
var referenceId = reference.getAttribute('data-id');
var languageCode = reference.getAttribute('data-language').replace(/-/, '_');
var title = $(reference).contents().find('#jform_title').val();
var target = document.getElementById('target-association');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this correct - there is var target a few lines later ??

Copy link
Contributor Author

@wilsonge wilsonge Mar 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean the target is used on the next line here and then overridden after being used. Which seems like a bad naming convention for all kinds of reasons. But something to be fixed again outside the scope of this PR (same thing in staging https://github.com/joomla/joomla-cms/blob/staging/media/com_associations/js/sidebyside-uncompressed.js#L290-L293)

@wilsonge wilsonge merged commit 071bb74 into joomla:4.0-dev Mar 3, 2019
@wilsonge wilsonge deleted the 3811-merge branch March 3, 2019 00:13
@wilsonge wilsonge modified the milestone: Joomla 4.0 Mar 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester
Projects
None yet
Development

Successfully merging this pull request may close these issues.