Jack Anderson
deec3711e0
Merge next into suite 8
2023-11-06 16:01: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
Clemente Raposo
205f60ddfe
Fix #98 - Add missing global declaration
...
- Caused problems on install
- Dictionary being populated without being initialized as a global
- modules/TableDictionary.php called with require_onced wasn't loaded again. Since it was already required and loaded.
2022-06-01 11:48:34 +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