Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating 4.3-dev with changes from 4.2-dev #39626

Merged
merged 36 commits into from
Jan 13, 2023

Conversation

obuisard
Copy link
Contributor

No description provided.

heelc29 and others added 30 commits January 5, 2023 13:26
…ing with MySQLi driver (joomla#39391)

* Catch also RuntimeException when update SQL fails

* Fix missing backslash for global name space

* Catch only \RuntimeException

Co-authored-by: SharkyKZ <[email protected]>

* Remove obsolete use statement

Co-authored-by: SharkyKZ <[email protected]>
* Clean the logo URL

* fix the logos

* meh
* Clean the logo URL

* remove debugging

* fixit
* Define tags variable in helper class

* doc

* old and new tags property
…omla#37376)

* Fix deprecated warning for Calendar form fields

* Phase 1 convert BRANCH to PSR-12

* Phase 2 convert BRANCH to PSR-12

* Remove magic format conversion

* Remove unused import
* Encode path parm in MM API calls

* revert
laoneo and others added 6 commits January 12, 2023 16:59
…#39608)

* Add the missing props to the password form field

Co-authored-by: Roland Dalmulder <[email protected]>
…39603)

* Add the missing props to the captcha form field

Co-authored-by: Harald Leithner <[email protected]>
* [4.2] content history alerts

Converts from the ugly browser dependent alerts to use the joomla rendermessage

## To test
run npm build:js or use a prebuilt package

Create and save an article and then edit it and save again
Click on Versions
Click on all versions and then preview
### before

### after

Click on all versions and then restore
### before

### after

Click on one version and then compare

* missed one
* Converted read more alert to joomla-alert

* Fix javascript code style error

Co-authored-by: Richard Fath <[email protected]>

Co-authored-by: Richard Fath <[email protected]>
@joomla-cms-bot
Copy link

Please add more information to your issue. Without test instructions and/or any description we will close this issue within 4 weeks. Thanks.
This is an automated message from the J!Tracker Application.

@obuisard obuisard merged commit 7d27799 into joomla:4.3-dev Jan 13, 2023
@obuisard obuisard deleted the upmerge-2023-01-13 branch September 15, 2023 18:44
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.