Skip to content

[4.0] 3.9.12 Merge into J4#27056

Merged
wilsonge merged 61 commits intojoomla:4.0-devfrom
wilsonge:3912-merge
Nov 12, 2019
Merged

[4.0] 3.9.12 Merge into J4#27056
wilsonge merged 61 commits intojoomla:4.0-devfrom
wilsonge:3912-merge

Conversation

@wilsonge
Copy link
Contributor

@wilsonge wilsonge commented Nov 12, 2019

Merges 3.9.12 into 4.0-dev branch.

Always merge with a merge commit. NEVER squash/rebase and merge

Note I have not merged the conflicts from #23213 in here - most of this needs to go into the framework first I think

I've also had to modify #27056 as we have a onContentBeforeSave in J4 to deal with workflows. Nothing should have changed - it should be cosmetic - but just to document the change in case.

@brianteeman you might want to look at #26342 in the J4 branch. Looks like all the new language files in J4 have inherited the old incorrect header referencing LICENSE.php

gslitt91 and others added 30 commits October 16, 2018 14:20
Import from database dump only imports first table .
The following keys had no translation
JLIB_LOGIN_AUTHORISATION="Your access has been authorised."
JLIB_LOGIN_DENIED="Your access has been denied."
JLIB_LOGIN_EXPIRED="Your authentication has expired."

From the relevant section in the codebase it is not very clear exactly what they should be

			// Validate that the user should be able to login (different to being authenticated).
			// This permits authentication plugins blocking the user

So these are fairly generic and the plugin creator can override them if they want. Nothing in core will trigger them to be displayed so I wouldn't waste much time on them.
* Simplify description language

It is important that the text we use in the UI is understandable. As many people will be using Joomla in English even if it is not their most proficient language simpler language is more useful. It is also part of the new WECAG 2.1 accessibility guidelines for cognitive ability.

* add one more

* thanks @Quy
zero-24 and others added 15 commits September 13, 2019 14:10
…3502)

Implemented pausing mechanisms into cli/finder_indexer.php.
The reason for that is, that with thousands of articles or K2 items, the server would often become unresponsive, because of a lot of processing and IO/WAiT on the mysql server.
This patch implements a pausing mechanism that pauses for a defined or dynamically adjusted amount of time between batches, therefore giving the server a little time to catch up.
* Added Vary:Accept-Encoding header
/media/system/js/fields/calendar.js at lines 861 and 864 call
date.getOtherFullYear(this.params.dateType, year);

But this function defined in
/media/system/js/fields/calendar-locales/date/jalali/date-helper.js
does not have a second parameter - year, so it can not be changed...

Here's a fix for this issue...

Fixes issue: joomla#19926
Joomla! 3.9.12 Release
@wilsonge wilsonge merged commit 4bcb1d8 into joomla:4.0-dev Nov 12, 2019
@wilsonge wilsonge deleted the 3912-merge branch November 12, 2019 13:30
@Quy Quy added this to the Joomla 4.0 milestone Nov 12, 2019
@wilsonge wilsonge removed this from the Joomla 4.0 milestone Nov 14, 2019
@rdeutz rdeutz modified the milestone: Joomla 4.0 Feb 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.