8 commits

Author	SHA1	Message	Date
Jack Anderson	c9f078c3ff	Merge next into suite 8	2024-01-24 09:41:06 +00:00
Clemente Raposo	5aa0daf046	Merge next into suite 8 ... Merge commit 'de4bf25cb3' into release/8.4.0-beta # Conflicts: # public/legacy/data/SugarBean.php # public/legacy/include/Smarty/plugins/function.sugarvar.php # public/legacy/include/SugarDateTime.php # public/legacy/include/database/MysqliManager.php # public/legacy/modules/Alerts/metadata/listviewdefs.php # public/legacy/modules/SugarFeed/Dashlets/SugarFeedDashlet/SugarFeedDashlet.php # public/legacy/modules/Trackers/metadata/SearchFields.php # public/legacy/modules/Trackers/metadata/listviewdefs.php # public/legacy/modules/UpgradeWizard/SugarMerge/EditViewMerge.php # public/legacy/suitecrm_version.php	2023-07-21 15:22:52 +01:00
Jack Anderson	caf6df3b43	Merge next into suite 8	2023-02-28 14:12:02 +00:00
Jack Anderson	6b586e1678	Merge next into suite 8	2022-11-10 09:41:20 +00:00
Clemente Raposo	a0d06eb70b	[Legacy] Add textblock field ... - Add textlock detail and edit view implementation - Add textblock field template to studio - change html field template on studio to convert to textblock	2022-03-15 16:52:58 +00:00
Clemente Raposo	63b969478d	Merge next into suite 8 ... Merge commit '5fa70e2794' into release/8.0.4 # Conflicts: # public/legacy/suitecrm_version.php	2022-03-01 14:38:06 +00:00
Clemente Raposo	efb6114313	Merge next into suite 8	2021-11-22 10:25:29 +00:00
Dillon-Brown	11be803da2	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00