This makes sure that users running the test suite locally have the same error
reporting level th...

* Move old codecept tests to phpunit & make compatible
* Entry Point Tests. Also throw exceptio...

Fix email related to

Fixed #6485 - Users: Display opt-in ticks also for external email clients

Fix https://github.com/salesagility/SuiteCRM/issues/4361
Parameter $imageJSONEncode should also...

Fixed #5508 - Upgrade phpMailer to 6.x

Develop merge

# Conflicts:
# include/generic/SugarWidgets/SugarWidgetSubPanelEditSecurityGroupUserButton.php
#...

Fixed #6340 - From Dropdown on Email Compose has utf-8 issue

fixed #6050 No submit button while editing imported email

fixed #6440 - Emails imported automatically won't allow to change the user assigned to

elasticsearch pagination

Copyright revision

campaing wizard: fix template editor being shown in all steps

Fixed #4872 - Fix some async subpanel actions failing if refresh_page=1

In case the user had selected the external email client all email links would
not display any op...

Instead of manually building the same HTML in various places move the
HTML building code into a ...

Move the code for figuring out the user email client type in one
public method so it can be used...

The overriden function in the parent class passes the argument by reference,
so do the same in t...

In case the subpanel layout uses refresh_page=1 then showSubPanel() will start an
async request ...

Merge Upstream Develop

Develop merge