Skip to content

Conversation

@wilsonge
Copy link
Contributor

@wilsonge wilsonge commented Mar 14, 2020

Merges in 3.9.16. Merge with a merge commit when tests pass. DO NOT SQUASH OR REBASE.

@Fedik is anything required to port from #27561 - I'm really not sure right now - I feel like it's not an issue because nested fields are entirely encapsulated - but not 100%

eXsiLe95 and others added 30 commits September 4, 2017 10:26
* Render values in profile

* Remove blank line

Co-Authored-By: Quy <[email protected]>

Co-authored-by: Quy <[email protected]>
* Show correct message when file is too large

* Move media helper

* Typo

Co-Authored-By: Quy <[email protected]>

* Case insensitive comparison for filter

* Typo in comment

Co-Authored-By: Quy <[email protected]>
Co-authored-by: Robert Deutz <[email protected]>
…la#20294)

* Update folderlist.php

* Update folderlist.php

Return if (!is_dir($path) && !is_dir(JPATH_ROOT . '/' . $path))

Co-authored-by: Quy <[email protected]>
Co-authored-by: Robert Deutz <[email protected]>
I deleted a line that I don't think we need
joomla#27744 allow showing ucm_content items with core_access=0. Similar fi…
Remove all default values for type 'text' or 'mediumtext' - redo of PR joomla#17860
…ld (joomla#27561)

* Do not ignore subform filter

* Do not foreach empty value

Co-authored-by: Robert Deutz <[email protected]>
* Fix submitting forms with empty repeatable subforms

* Use the validation rule
…inks (joomla#28055)

* Add new "sponsored" and "ugc" options to rel attribute for external links

Pull Request for joomla#26312

###Why
https://support.google.com/webmasters/answer/96569?hl=en
Advanced users (copywriters, bloggers, etc.) are very concerned about SEO.
Their projects often live thanks to affiliation, sponsorship and advertising.
It is important to provide them with all the tools necessary for a correct supply of information to the search engine, so as not to be penalized and to constantly improve aspects such as indexing and positioning.
These two options specifically help Google identify the behavior of outbound links from Joomla sites, thus providing correct information on what to expect from the connected external source.

### Summary of Changes
Add new "sponsored" and "ugc" options to rel attribute of external URL menu type.

### Testing Instructions
Add new menu item
Select System Links > URL
Click **Link Type** tab
Click **Link Rel Attribute** dropdown
See **spondored** and **ugc** option

### Next Step (not in this PR)
Users should select more than one option for "rel" attribute.
https://www.w3.org/TR/html401/struct/links.html#adef-rel
> rel = link-types [CI]
> This attribute describes the relationship from the current document to the anchor specified by the href attribute.
> The value of this attribute is a space-separated list of link types.

* Alphabetical order for new rel options
zero-24 and others added 12 commits February 29, 2020 09:29
* only collect contacts when requested

* thanks @SharkyKZ and @joomdonation
* Update en-GB.plg_system_privacyconsent.ini

* rollback

* return value username
Signed-off-by: Harald Leithner <[email protected]>
# Conflicts:
#	administrator/language/en-GB/en-GB.xml
#	administrator/language/en-GB/install.xml
#	administrator/manifests/files/joomla.xml
#	administrator/manifests/packages/pkg_en-GB.xml
#	installation/language/en-GB/en-GB.xml
#	language/en-GB/en-GB.xml
#	language/en-GB/install.xml
#	libraries/src/Version.php
@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 14, 2020
@Fedik
Copy link
Member

Fedik commented Mar 14, 2020

@wilsonge yes it need to fix for J4 also, but I already made a pull for that #27562
you can skip "porting", and check that pull instead ;)

const countnew = Math.max(this.lastRowIndex, count);
const groupnew = basename + countnew; // new group name

this.lastRowIndex = countnew + 1;
Copy link
Member

Choose a reason for hiding this comment

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

please revert this file, it was need only for j3

@wilsonge
Copy link
Contributor Author

The stuff in #27562 is already ported in here. Just the sub form field itself change that I mentioned and if not porting it is the correct fix that’s perfect :)

@joomla-cms-bot joomla-cms-bot removed the NPM Resource Changed This Pull Request can't be tested by Patchtester label Mar 14, 2020
@wilsonge wilsonge merged commit 615c71a into joomla:4.0-dev Mar 14, 2020
@wilsonge wilsonge deleted the 3916-merge branch March 14, 2020 12:17
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.