Commit graph

16 commits

Author SHA1 Message Date
Jack Anderson
424a9fe830 Merge PHP 8.3 changes into Suite 8 2024-11-29 13:25:55 +00: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
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
Jack Anderson
59ae53e60f [Legacy] Add label to history search defs 2023-04-24 11:54:10 +01:00
balumahendran
996980a77b [Legacy] Project Resources Styling Fixes 2022-10-04 13:13:19 +01: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
cc2ea5d164 [Legacy] Add New Task Modal Styling Fixes 2022-01-13 17:05:03 +05:30
Clemente Raposo
4cb5dd107a Merge next into suite 8 2021-12-15 16:22:47 +00:00
p.kumar
b0b1f74c42 [Legacy] fix redirect from projects subpanel 2021-11-22 11:04:52 +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
balumahendran
1a62d28ad9 [Legacy] Project Resource Calendar Styling Changes 2021-05-28 14:17:41 +05:30
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