Commit graph

14 commits

Author SHA1 Message Date
Jack Anderson
f9c5b5b345 Merge next into suite 8 2024-10-25 08:33:37 +01:00
Jack Anderson
deec3711e0 Merge next into suite 8 2023-11-06 16:01:06 +00:00
Jack Anderson
1a5aa0b081 Merge next into suite 8 2023-08-23 11:03:53 +01: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
Alcides Ojeda
681246791e Fix #243 - Add api bean mappers to the extensions for extensibility 2023-06-07 08:36:23 +01:00
Jack Anderson
caf6df3b43 Merge next into suite 8 2023-02-28 14:12:02 +00:00
Clemente Raposo
123e5a9f26 Merge commit '9d484f189a' into release/8.2.2
# Conflicts:
#	public/legacy/files.md5
#	public/legacy/modules/InboundEmail/EditView.html
#	public/legacy/modules/Users/tpls/EditViewFooter.tpl
#	public/legacy/suitecrm_version.php
2022-12-21 11:49:42 +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
4cb5dd107a Merge next into suite 8 2021-12-15 16:22:47 +00:00
Clemente Raposo
efb6114313 Merge next into suite 8 2021-11-22 10:25:29 +00:00
Clemente Raposo
ec69932fe4 [Legacy] Suite 8 extensions to legacy plugins
- Allow installing SuiteCRM 8 extensions in existing plugin system
2021-11-11 12:12:21 +00:00
Clemente Raposo
eea95133ba [Legacy] Move Legacy Filter Mapper to legacy 2021-07-26 12:31:21 +01:00
Dillon-Brown
561d2f71a6 Merge commit '2473298dc6' into beta2
# Conflicts:
#	public/legacy/composer.json
#	public/legacy/composer.lock
#	public/legacy/modules/AOD_Index/AOD_Index.php
#	public/legacy/modules/AOD_Index/AOD_Index_sugar.php
#	public/legacy/modules/AOD_Index/AOD_LogicHooks.php
#	public/legacy/modules/AOD_Index/LuceneUtils.php
#	public/legacy/modules/AOD_Index/PdfParser.php
#	public/legacy/modules/AOD_Index/controller.php
#	public/legacy/modules/AOD_Index/views/view.indexdata.php
#	public/legacy/modules/AOD_IndexEvent/AOD_IndexEvent_sugar.php
#	public/legacy/modules/SavedSearch/metadata/SearchFields.php
#	public/legacy/modules/Schedulers/_AddJobsHere.php
2021-05-20 11:55:03 +01:00
Dillon-Brown
11be803da2 Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00