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
|
c9f078c3ff
|
Merge next into suite 8
|
2024-01-24 09:41:06 +00: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 |
|
Jack Anderson
|
8c553f7c3c
|
Merge next into suite 8
|
2023-06-30 10:54:51 +01:00 |
|
Clemente Raposo
|
eba6af8139
|
Merge next into suite 8
Merge commit '601c0c039b' into release/8.3.0
# Conflicts:
# public/legacy/files.md5
# public/legacy/suitecrm_version.php
|
2023-05-08 12:37:33 +01:00 |
|
Jack Anderson
|
caf6df3b43
|
Merge next into suite 8
|
2023-02-28 14:12:02 +00:00 |
|
Jack Anderson
|
10efe5a340
|
Merge next into suite 8
|
2023-01-24 10:56:09 +00:00 |
|
Clemente Raposo
|
123e5a9f26
|
Merge commit '9d484f189a' into release/8.2.2
# Conflicts:
# public/legacy/files.md5
# public/legacy/modules/InboundEmail/EditView.html
# public/legacy/modules/Users/tpls/EditViewFooter.tpl
# public/legacy/suitecrm_version.php
|
2022-12-21 11:49:42 +00:00 |
|
Jack Anderson
|
6b586e1678
|
Merge next into suite 8
|
2022-11-10 09:41:20 +00:00 |
|
Jack Anderson
|
696388d662
|
Merge next into suite 8
Merge commit '3fb6e4bb8e' into release/8.1.3
# Conflicts:
# public/legacy/files.md5
# public/legacy/suitecrm_version.php
|
2022-08-11 14:03:24 +01:00 |
|
Clemente Raposo
|
b9e45ecc54
|
Merge next into suite 8
|
2022-05-17 19:03:14 +01:00 |
|
Clemente Raposo
|
63b969478d
|
Merge next into suite 8
Merge commit '5fa70e2794' into release/8.0.4
# Conflicts:
# public/legacy/suitecrm_version.php
|
2022-03-01 14:38:06 +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 |
|
Clemente Raposo
|
4cb5dd107a
|
Merge next into suite 8
|
2021-12-15 16:22:47 +00:00 |
|
Dillon-Brown
|
e6591e3d13
|
[Legacy] Increment suitecrm_version
|
2021-05-20 13:55:17 +01:00 |
|
Dillon-Brown
|
11be803da2
|
Merge commit '8e4cc94994' as 'public/legacy'
|
2021-03-31 15:37:32 +01:00 |
|
