Skip to content

Comments

[5.0] Upmerge#41708

Merged
HLeithner merged 23 commits intojoomla:5.0-devfrom
Digital-Peak:upmerge
Sep 12, 2023
Merged

[5.0] Upmerge#41708
HLeithner merged 23 commits intojoomla:5.0-devfrom
Digital-Peak:upmerge

Conversation

@laoneo
Copy link
Member

@laoneo laoneo commented Sep 12, 2023

Upmerge from 4.4-dev

tecpromotion and others added 21 commits September 4, 2023 10:26
* Remove filter="url" for wrapper iframe

* remove validate

---------
Signed-off-by: Martin Kopp <kopp05@infotech.ch>
joomla#40761)

* Improve Calendar form field style

* Improve Calendar form field style

* Improve Calendar form field style

* Add files via upload

* Improve Calendar form field style (add RTL)

* Add files via upload

* Improve Calendar form field style

* Improve Calendar form field style

* Improve Calendar form field style

---------

Co-authored-by: Olivier Buisard <olivier.buisard@simplifyyourweb.com>
* system test com_modules webservices

* wrong client id

* cs

* moreendpoint

* cs

* 1file1endpoint

* Delete tests/System/integration/api/com_modules/Request.cy.js

* cs

* cs

* cs

* cs

* cs

* cs

* LF

* cs

* grr
* api plugin test

* Rename

---------

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
* start

* phpcs fix

* docblock fix

* docblocks fix

* custom memory collector

* cs fix

* fix cs

* even more cs

* Update plugins/system/cache/cache.php

Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>

* Update plugins/system/debug/src/DataCollector/MemoryCollector.php

Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>

* Update plugins/system/debug/src/DataCollector/MemoryCollector.php

Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>

* Update plugins/system/debug/src/DataCollector/ProfileCollector.php

Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>

* Update plugins/system/debug/src/DataCollector/ProfileCollector.php

Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>

* cs

* cs

* revert ProfileCollector constructor.

* fix

* Remove 'afterRespond' mark

* fix

* Phase 1 convert BRANCH to PSR-12

* Phase 2 convert BRANCH to PSR-12

* fix

* fix CS

* fix

* short Event, try to re-start drone

---------

Co-authored-by: Denitz <pandenitz@mail.ru>
Co-authored-by: Phil E. Taylor <phil@phil-taylor.com>
Co-authored-by: Joomla! Bot <release+joomla-bot@joomla.org>
* Change the version in the bump script for package.json

* Updated package file

* cs
* Update package.json

* Update .drone.yml

* Update package-lock.json

* changing signature

* Update package-lock.json

* Update package.json

* Reset the indantation to 2 spaces
* fix

* CS

* CS

* bind it!

* Make Postgres happy

* Postgressssss

* CS

* Update plugins/system/schedulerunner/schedulerunner.php

Quy's suggestion

Co-authored-by: Quy <quy@fluxbb.org>

* Update plugins/system/schedulerunner/schedulerunner.php

Quy's suggestion

Co-authored-by: Quy <quy@fluxbb.org>

* Update plugins/system/schedulerunner/schedulerunner.php

Quy's suggestion

Co-authored-by: Quy <quy@fluxbb.org>

* fix

* Use model method

* Phase 1 convert BRANCH to PSR-12

* Phase 2 convert BRANCH to PSR-12

* fix CS

* fix CS

* Update administrator/components/com_scheduler/src/Model/TasksModel.php

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>

* Update administrator/components/com_scheduler/src/Model/TasksModel.php

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>

---------

Co-authored-by: Denitz <pandenitz@mail.ru>
Co-authored-by: Quy <quy@fluxbb.org>
Co-authored-by: Joomla! Bot <release+joomla-bot@joomla.org>
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
Co-authored-by: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com>
@joomla-cms-bot joomla-cms-bot added Composer Dependency Changed Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester PR-5.0-dev labels Sep 12, 2023
@laoneo laoneo changed the title Upmerge [5.0] Upmerge Sep 12, 2023
@HLeithner HLeithner merged commit f69d4a9 into joomla:5.0-dev Sep 12, 2023
@HLeithner HLeithner deleted the upmerge branch September 12, 2023 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Composer Dependency Changed 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.