Jack Anderson
|
424a9fe830
|
Merge PHP 8.3 changes into Suite 8
|
2024-11-29 13:25:55 +00: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
|
f808beab75
|
Merge next into suite 8
|
2023-09-28 14:00:36 +01: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 |
|
balumahendran
|
d8d8c0563a
|
[Legacy] - Import Page Styling Fixes
|
2022-12-21 11:41:39 +00:00 |
|
Jack Anderson
|
6b586e1678
|
Merge next into suite 8
|
2022-11-10 09:41:20 +00:00 |
|
Clemente Raposo
|
5d69939637
|
Merge next into suite 8
Merge commit '588534d022' into release/8.0.2
# Conflicts:
# public/legacy/include/Services/NormalizeRecords/NormalizeRecordsSchedulerJob.php
# public/legacy/modules/Administration/templates/RepairUtfEncoding.tpl
# public/legacy/modules/Administration/templates/RepairUtfEncodingStatus.tpl
# public/legacy/modules/Administration/templates/RepairUtfEncodingSyncStatus.tpl
# public/legacy/suitecrm_version.php
# public/legacy/themes/suite8/css/Dawn/style.scss
# public/legacy/themes/suite8/css/suitep-base/admin-backup.scss
# public/legacy/themes/suite8/css/suitep-base/editview.scss
# public/legacy/themes/suite8/css/suitep-base/meetings.scss
# public/legacy/themes/suite8/css/suitep-base/scheduler.scss
|
2022-01-26 12:16:09 +00:00 |
|
balumahendran
|
752453dd38
|
[Legacy] Admin Import Styling Fixes
|
2021-12-09 10:02:19 +00:00 |
|
Clemente Raposo
|
efb6114313
|
Merge next into suite 8
|
2021-11-22 10:25:29 +00:00 |
|
Dillon-Brown
|
a6437b16b6
|
Merge commit 'dd455a1c2d' into legacy_update_2
|
2021-09-29 10:57:55 +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 |
|
