Skip to content

Joomla 3.9.11 merge#26111

Merged
wilsonge merged 36 commits intojoomla:4.0-devfrom
wilsonge:3911-merge
Sep 1, 2019
Merged

Joomla 3.9.11 merge#26111
wilsonge merged 36 commits intojoomla:4.0-devfrom
wilsonge:3911-merge

Conversation

@wilsonge
Copy link
Copy Markdown
Contributor

@wilsonge wilsonge commented Sep 1, 2019

  • Merge with a merge commit don't squash/rebase

HLeithner and others added 30 commits July 10, 2019 17:05
* Use correct language strings

* Fix unknown column

* Fix sort header

* Assign column

* Update administrator/components/com_fields/models/fields.php

Co-Authored-By: SharkyKZ <sharkykz@gmail.com>

* Fix language column

* Fix language column

* Fix language column
* Adding missing lang strings for XTD plugins

* No use for sidebar in frontend for fields xtd
…oomla#25556)

* Update en-GB.ini

* Update en-GB.ini

* Update en-GB.com_content.ini
* Include user.css in error page protostar

* Move user.css to bottom
…ostgresql (joomla#25795)


There is a memcache problem current travis ubuntu build:
php: symbol lookup error: /home/travis/.phpenv/versions/5.6.40/lib/php/extensions/no-debug-zts-20131226/memcache.so: undefined symbol: mmc_queue_pop
* Fix not converted boolean in route::_ and log warning

* Fix not converted parameter in route::_ and log warning

* Fix warning.
@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 Sep 1, 2019
@wilsonge wilsonge merged commit a629d4b into joomla:4.0-dev Sep 1, 2019
@wilsonge wilsonge deleted the 3911-merge branch September 1, 2019 01:10
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.