Commit graph

6 commits

Author SHA1 Message Date
y.yerli
db9aca1460 Fix #475 - [Legacy] Keep upgrade log 2025-01-21 16:04:23 +03: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
Dillon-Brown
33fc2ee307 Merge commit '114b895b6d' into merge_develop
Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>

# Conflicts:
#	public/legacy/include/CleanCSV.php
#	public/legacy/suitecrm_version.php
#	public/legacy/tests/unit/phpunit/includes/CleanCSVTest.php
2021-08-30 10:18:23 +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