Jack Anderson
|
424a9fe830
|
Merge PHP 8.3 changes into Suite 8
|
2024-11-29 13:25:55 +00:00 |
|
Jack Anderson
|
f9c5b5b345
|
Merge next into suite 8
|
2024-10-25 08:33:37 +01:00 |
|
Jack Anderson
|
1e52927054
|
Merge next into suite 8
|
2024-07-24 14:00:02 +01:00 |
|
Jack Anderson
|
e3e9956e12
|
Merge next into suite 8
|
2024-05-22 15:58:18 +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 |
|
Jack Anderson
|
caf6df3b43
|
Merge next into suite 8
|
2023-02-28 14:12:02 +00:00 |
|
Clemente Raposo
|
efb6114313
|
Merge next into suite 8
|
2021-11-22 10:25:29 +00:00 |
|
Dillon-Brown
|
4fa237958d
|
Merge commit '75ea167930' into suite7merge
Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>
# Conflicts:
# public/legacy/suitecrm_version.php
|
2021-11-05 15:19:26 +00: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
|
35ada7898d
|
Merge commit '9c71e8c884' into fix/legacy_update
Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>
# Conflicts:
# public/legacy/.gitignore
# public/legacy/composer.json
# public/legacy/composer.lock
# public/legacy/include/language/en_us.lang.php
# public/legacy/modules/Administration/Search/View.php
# public/legacy/modules/Administration/metadata/adminpaneldefs.php
# public/legacy/modules/Home/UnifiedSearch.php
# public/legacy/modules/Home/UnifiedSearchAdvanced.php
# public/legacy/tests/unit/phpunit/include/utils/fileUtilsTest.php
# public/legacy/tests/unit/phpunit/modules/AOD_Index/AOD_IndexTest.php
# public/legacy/tests/unit/phpunit/modules/AOD_IndexEvent/AOD_IndexEventTest.php
|
2021-07-29 16:53:55 +01:00 |
|
Dillon-Brown
|
11be803da2
|
Merge commit '8e4cc94994' as 'public/legacy'
|
2021-03-31 15:37:32 +01:00 |
|
