Skip to content

[5.0] Upmerge 4.4#40292

Merged
HLeithner merged 35 commits intojoomla:5.0-devfrom
HLeithner:upmerge/4.4-5.0
Apr 2, 2023
Merged

[5.0] Upmerge 4.4#40292
HLeithner merged 35 commits intojoomla:5.0-devfrom
HLeithner:upmerge/4.4-5.0

Conversation

@HLeithner
Copy link
Copy Markdown
Member

As title says

brianteeman and others added 30 commits March 23, 2023 16:04
* test for contact form

* updates

* updates

* add a blank line at last

* updates

* updates

* updates

* updates

* adding endline

* Update and rename Form.cy.js to contact_details_page.cy.js

* Rename contact_details_page.cy.js to Contact.cy.js

* Update Contact.cy.js

* Update Contact.cy.js

* Update Contact.cy.js

* Update Contact.cy.js

---------

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
…la#40142)

* Update pagenavigation.xml

* Delete pagenavigation.php

* Create provider.php

* Create PageNavigation.php

* Update default.php

* Update default.php

* correction

* correction

* Delete PageNavigation.php

* Delete provider.php

* correction

wrong folder

* correction

wrong folder

* correction

wrong file

* removed

@phpcs:disable ....

* use Text methods instead

* oops __DEPLOY_VERSION__

_DEPLOY_VERSION__
becomes
__DEPLOY_VERSION__

---------

Co-authored-by: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com>
* add cypress banner test

* add cypress banner test to modules

* Delete banner.cy.js

* code fix

* fix2

* fix3 type:1 set as default

* fix4

* Delete Banners.cy.js
* Small update

* Lower case to upper case

* small update

---------

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
Co-authored-by: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com>
Co-authored-by: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com>
…er>src</folder> (joomla#40204)

* swap services to src

* swap services to src

* swap services to src

* swap services to src

* swap services to src

* swap services to src
* Split the back end CRUD tests into single tests

* change to install

* cs

* types

* login

* id?

* cache login

* cs

* clear on logout
…40186)

* add test for field com_contact

* updates

* changes

* changes

* updates

* updates

* adding more default values

* updates

* updates

* Update db.js

---------

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
…omla#40178)

* add categories view for contacts

* changes

* changes

* updates

* updates

* adding more default values

* Update db.js

* Update Categories.cy.js

* Update db.js

---------

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* Test not featured articles

* cs

* strict

* fix

---------
…omla#40224)

* Introduce local variables to replace repeating method calls

* CS

* Move variable higher
* Set a higher timeout for cypress verification

* debug

* map

* simpler commands

* wrong
* change JPATH_PLATFORM

* change JPATH_PLATFORM

* change JPATH_PLATFORM

* change JPATH_PLATFORM

* change JPATH_PLATFORM

* change JPATH_PLATFORM
* Convert user plugins to service provider

* form path

* Update plugins/user/contactcreator/services/provider.php

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>

* Update plugins/user/joomla/services/provider.php

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>

* Update plugins/user/profile/services/provider.php

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>

* Update plugins/user/terms/services/provider.php

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>

* Update plugins/user/token/services/provider.php

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>

* Update plugins/user/joomla/src/Extension/Joomla.php

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>

* Update plugins/user/joomla/src/Extension/Joomla.php

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>

* revert debug

* private

* Fix account notification email language (#28)

* Update plugins/user/joomla/src/Extension/Joomla.php

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>

* minor change

---------

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: Tuan Pham Ngoc <github@joomdonation.com>
laoneo and others added 5 commits March 30, 2023 08:18
* Convert privacy plugins to service provider

* Update plugins/privacy/contact/services/provider.php

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>

* Update plugins/privacy/content/services/provider.php

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>

* Update plugins/privacy/content/services/provider.php

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>

* Update plugins/privacy/message/services/provider.php

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>

* Update plugins/privacy/message/src/Extension/Message.php

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>

* rename

---------

Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
# Conflicts:
#	.drone.yml
#	build/media_source/plg_system_guidedtours/js/guidedtours.es6.js
@HLeithner HLeithner requested review from Hackwar and rdeutz as code owners April 2, 2023 07:54
@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-5.0-dev Unit/System Tests labels Apr 2, 2023
@HLeithner HLeithner merged commit 542eaf2 into joomla:5.0-dev Apr 2, 2023
@HLeithner HLeithner deleted the upmerge/4.4-5.0 branch April 2, 2023 08:37
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 Unit/System Tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.