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
..
Accounts	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
ACL	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
ACLActions	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
ACLRoles	[Legacy] Fix Role List User Styling	2021-07-02 11:20:19 +05:30
Activities	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
Administration	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
Alerts	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AM_ProjectTemplates	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AM_TaskTemplates	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AOBH_BusinessHours	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AOK_Knowledge_Base_Categories	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AOK_KnowledgeBase	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AOP_Case_Events	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AOP_Case_Updates	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
AOR_Charts	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
AOR_Conditions	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
AOR_Fields	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AOR_Reports	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
AOR_Scheduled_Reports	Merge commit '2473298dc6' into beta2	2021-05-20 11:55:03 +01:00
AOS_Contracts	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AOS_Invoices	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
AOS_Line_Item_Groups	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AOS_PDF_Templates	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
AOS_Product_Categories	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AOS_Products	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AOS_Products_Quotes	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
AOS_Quotes	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
AOW_Actions	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
AOW_Conditions	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AOW_Processed	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
AOW_WorkFlow	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
Audit	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Bugs	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
Calendar	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
Calls	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
Calls_Reschedule	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
CampaignLog	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Campaigns	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
CampaignTrackers	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Cases	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
Charts	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Configurator	[Legacy] History Subpanel Styling Changes	2021-08-27 11:47:50 +01:00
Connectors	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Contacts	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
Currencies	[Legacy] Currency Recordview styling changes	2021-06-11 18:30:47 +05:30
Delegates	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
DocumentRevisions	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Documents	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
DynamicFields	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
EAPM	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
EmailAddresses	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
EmailMan	[Legacy] Fix Campaign Email Settings Styling	2021-07-23 12:05:41 +00:00
EmailMarketing	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Emails	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
EmailTemplates	[Legacy] iFrame Modal Page Styling Changes	2021-06-21 07:42:54 +05:30
EmailText	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Employees	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Favorites	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
FP_Event_Locations	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
FP_events	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Groups	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Help	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
History	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Home	[Legacy] Fix Add Dashlet Tab via Enter Key in Home Page Redirects to Legacy	2021-08-27 11:47:50 +01:00
iCals	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Import	Merge commit '2473298dc6' into beta2	2021-05-20 11:55:03 +01:00
InboundEmail	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
jjwg_Address_Cache	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
jjwg_Areas	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
jjwg_Maps	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
jjwg_Markers	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
LabelEditor	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Leads	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
MailMerge	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Meetings	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
MergeRecords	[Legacy] Changes to support Legacy integration of Merge Duplicates action to Suite8	2021-06-07 17:29:30 +05:30
ModuleBuilder	Merge commit '2473298dc6' into beta2	2021-05-20 11:55:03 +01:00
MySettings	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
Notes	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
OAuth2Clients	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
OAuth2Tokens	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
OAuthKeys	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
OAuthTokens	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Opportunities	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
OptimisticLock	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
OutboundEmailAccounts	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Project	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
ProjectTask	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
ProspectLists	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
Prospects	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
Relationships	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Releases	[Legacy] Admin Release Styling Fixes	2021-08-27 11:47:50 +01:00
Reminders	[Legacy] User Profile Styling Changes	2021-05-14 12:17:46 +01:00
Reminders_Invitees	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
ResourceCalendar	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Roles	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
SavedSearch	[Legacy] Add SavedSearch module metadata	2021-05-14 12:17:46 +01:00
Schedulers	[Legacy] Remove advanced open discovery (AOD)	2021-04-23 12:47:53 +00:00
SchedulersJobs	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
SecurityGroups	[Legacy] Fix Security Suite Settings Styling	2021-07-08 09:05:26 +05:30
Spots	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Studio	[Legacy] Rename Modules Styling Changes	2021-07-30 10:06:37 +00:00
SugarFeed	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
SurveyQuestionOptions	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
SurveyQuestionResponses	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
SurveyQuestions	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
SurveyResponses	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Surveys	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Tasks	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
TemplateSectionLine	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Trackers	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
UpgradeWizard	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
UserPreferences	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
Users	Merge commit '114b895b6d' into merge_develop	2021-08-30 10:18:23 +01:00
vCals	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
BeanDictionary.php	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00
TableDictionary.php	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00