Dillon-Brown 27e748bcc7 Merge branch 'hotfix-7.8.x' into hotfix ... # Conflicts: # .gitignore # .travis.yml # ModuleInstall/ModuleScanner.php # README.md # composer.json # composer.lock # data/Link2.php # data/Relationships/M2MRelationship.php # data/Relationships/One2MBeanRelationship.php # data/SugarBean.php # include/EditView/SugarVCR.php # include/InlineEditing/InlineEditing.php # include/InlineEditing/inlineEditing.js # include/ListView/ListViewData.php # include/ListView/ListViewDisplay.php # include/ListView/ListViewSmarty.php # include/MVC/SugarApplication.php # include/MVC/View/SugarView.php # include/MVC/View/views/view.list.php # include/MVC/View/views/view.sugarpdf.php # include/MassUpdate.php # include/Popups/PopupSmarty.php # include/SearchForm/SearchForm.php # include/SearchForm/SearchForm2.php # include/StateChecker.php # include/StateCheckerCestAbstract.php # include/StateCheckerCodeceptionTrait.php # include/StateCheckerConfig.php # include/StateCheckerPHPUnitTestCaseAbstract.php # include/StateCheckerTrait.php # include/StateCheckerUnitAbstract.php # include/StateSaver.php # include/SugarEmailAddress/SugarEmailAddress.php # include/SugarFields/Fields/Address/DetailView.tpl # include/SugarFields/Fields/Address/en_us.DetailView.tpl # include/SugarObjects/forms/PersonFormBase.php # include/SugarTheme/SugarTheme.php # include/Sugarpdf/Sugarpdf.php # include/TimeDate.php # include/database/DBManager.php # include/entryPoint.php # include/generic/LayoutManager.php # include/generic/Save2.php # include/generic/SugarWidgets/SugarWidgetFieldcurrency.php # include/generic/SugarWidgets/SugarWidgetFieldenum.php # include/generic/SugarWidgets/SugarWidgetFieldfloat.php # include/generic/SugarWidgets/SugarWidgetFieldid.php # include/generic/SugarWidgets/SugarWidgetFieldint.php # include/generic/SugarWidgets/SugarWidgetFieldmultienum.php # include/generic/SugarWidgets/SugarWidgetFieldname.php # include/generic/SugarWidgets/SugarWidgetFieldsingleenum.php # include/generic/SugarWidgets/SugarWidgetFieldtext.php # include/generic/SugarWidgets/SugarWidgetFielduser_name.php # include/generic/SugarWidgets/SugarWidgetFieldvarchar.php # include/generic/SugarWidgets/SugarWidgetReportField.php # include/generic/SugarWidgets/SugarWidgetSubPanelConcat.php # include/generic/SugarWidgets/SugarWidgetSubPanelEditRoleButton.php # include/generic/SugarWidgets/SugarWidgetSubPanelEditSecurityGroupUserButton.php # include/generic/SugarWidgets/SugarWidgetSubPanelRelFieldEditButton.php # include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButtonAccount.php # include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButtonProjects.php # include/javascript/jsAlerts.php # include/language/en_us.lang.php # include/nusoap/nusoap.php # include/social/hooks.php # include/upload_file.php # include/utils.php # include/utils/db_utils.php # include/utils/file_utils.php # include/utils/layout_utils.php # include/utils/logic_utils.php # include/utils/mvc_utils.php # include/utils/security_utils.php # install/install_utils.php # install/seed_data/quotes_SeedData.php # modules/ACL/ACLController.php # modules/ACLActions/ACLAction.php # modules/ACLRoles/ACLRole.php # modules/AM_ProjectTemplates/controller.php # modules/AM_ProjectTemplates/views/view.ganttchart.php # modules/AOD_Index/views/view.indexdata.php # modules/AOD_IndexEvent/AOD_IndexEvent_sugar.php # modules/AOP_Case_Updates/AOPAssignManager.php # modules/AOP_Case_Updates/CaseUpdatesHook.php # modules/AOR_Conditions/AOR_Condition.php # modules/AOR_Fields/AOR_Field.php # modules/AOR_Reports/AOR_Report.js # modules/AOR_Reports/AOR_Report.php # modules/AOR_Reports/Menu.php # modules/AOR_Reports/aor_utils.php # modules/AOR_Reports/controller.php # modules/AOR_Reports/views/view.detail.php # modules/AOS_Contracts/AOS_Contracts.php # modules/AOS_Line_Item_Groups/AOS_Line_Item_Groups.php # modules/AOS_PDF_Templates/generatePdf.php # modules/AOS_Products_Quotes/AOS_Products_Quotes.php # modules/AOS_Products_Quotes/AOS_Utils.php # modules/AOS_Quotes/converToInvoice.php # modules/AOS_Quotes/createContract.php # modules/AOW_Actions/AOW_Action.php # modules/AOW_Actions/actions/templateParser.php # modules/AOW_Conditions/AOW_Condition.php # modules/AOW_WorkFlow/AOW_WorkFlow.php # modules/AOW_WorkFlow/aow_utils.php # modules/Accounts/AccountFormBase.php # modules/Activities/Popup_picker.php # modules/Administration/Diagnostic.php # modules/Administration/DiagnosticRun.php # modules/Administration/DisplayWarnings.php # modules/Administration/Locale.php # modules/Administration/RebuildFulltextIndices.php # modules/Administration/RebuildRelationship.php # modules/Administration/RepairFieldCasing.php # modules/Administration/RepairIndex.php # modules/Administration/RepairSeedUsers.php # modules/Administration/Upgrade.php # modules/Administration/UpgradeFields.php # modules/Administration/UpgradeWizard_commit.php # modules/Administration/index.tpl # modules/Administration/language/en_us.lang.php # modules/Administration/updater_utils.php # modules/Calendar/CalendarUtils.php # modules/Calendar/views/view.getgr.php # modules/Calls/Call.php # modules/Calls/Dashlets/MyCallsDashlet/MyCallsDashlet.php # modules/Campaigns/GenerateWebToLeadForm.php # modules/Campaigns/ProcessBouncedEmails.php # modules/Campaigns/Schedule.php # modules/Campaigns/WizardHome.php # modules/Campaigns/WizardMarketing.php # modules/Campaigns/language/en_us.lang.php # modules/Campaigns/utils.php # modules/Cases/Case.php # modules/Cases/views/view.edit.php # modules/Contacts/views/view.retrieveemail.php # modules/Currencies/Currency.php # modules/DocumentRevisions/DocumentRevision.php # modules/Documents/Document.php # modules/Documents/TreeData.php # modules/DynamicFields/UpgradeFields.php # modules/DynamicFields/templates/Fields/TemplateCurrency.php # modules/DynamicFields/templates/Fields/TemplateDecimal.php # modules/DynamicFields/templates/Fields/TemplateField.php # modules/DynamicFields/templates/Fields/TemplateFloat.php # modules/DynamicFields/templates/Fields/TemplateInt.php # modules/EAPM/EAPM.php # modules/EmailMan/EmailMan.php # modules/EmailMarketing/EmailMarketing.php # modules/EmailTemplates/EmailTemplate.php # modules/Emails/Email.php # modules/Emails/EmailUI.php # modules/Emails/EmailUIAjax.php # modules/Emails/ListViewGroup.php # modules/Emails/templates/addressSearch.tpl # modules/Emails/templates/advancedSearch.tpl # modules/FP_events/controller.php # modules/FP_events/responseEntryPoint.php # modules/Favorites/Favorites.php # modules/Home/UnifiedSearchAdvanced.php # modules/Import/UsersLastImport.php # modules/Import/views/view.last.php # modules/InboundEmail/InboundEmail.php # modules/Leads/Lead.php # modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.php # modules/Meetings/Meeting.php # modules/Meetings/language/en_us.lang.php # modules/Meetings/views/view.listbytype.php # modules/MySettings/StoreQuery.php # modules/OAuthTokens/OAuthToken.php # modules/Opportunities/Opportunity.php # modules/Opportunities/OpportunityFormBase.php # modules/Project/Project.php # modules/Project/controller.php # modules/Project/delete_project_tasks.php # modules/Project/language/en_us.lang.php # modules/Project/views/view.ganttchart.php # modules/ProjectTask/ProjectTask.php # modules/ProjectTask/views/view.list.php # modules/ProspectLists/ProspectList.php # modules/ProspectLists/TargetListUpdate.php # modules/Prospects/Prospect.php # modules/Relationships/RelationshipHandler.php # modules/Releases/Release.php # modules/Roles/Role.php # modules/SavedSearch/SavedSearch.php # modules/SavedSearch/UpgradeSavedSearch.php # modules/Schedulers/Scheduler.php # modules/Schedulers/views/view.detail.php # modules/Schedulers/views/view.edit.php # modules/SchedulersJobs/SchedulersJob.php # modules/SecurityGroups/AssignGroups.php # modules/SecurityGroups/SaveSecurityGroupUserRelationship.php # modules/SecurityGroups/SecurityGroup.php # modules/SecurityGroups/language/en_us.lang.php # modules/Studio/config.php # modules/SugarFeed/Dashlets/SugarFeedDashlet/SugarFeedDashlet.php # modules/SugarFeed/SugarFeed.php # modules/SugarFeed/SugarFeedFlush.php # modules/Tasks/Task.php # modules/Trackers/BreadCrumbStack.php # modules/Trackers/store/DatabaseStore.php # modules/Trackers/store/TrackerQueriesDatabaseStore.php # modules/Trackers/store/TrackerSessionsDatabaseStore.php # modules/UpgradeWizard/layouts.php # modules/UpgradeWizard/silentUpgrade_dce_step1.php # modules/UpgradeWizard/silentUpgrade_dce_step2.php # modules/UpgradeWizard/silentUpgrade_step1.php # modules/UpgradeWizard/silentUpgrade_step2.php # modules/UpgradeWizard/uw_ajax.php # modules/UpgradeWizard/uw_main.tpl # modules/UpgradeWizard/uw_utils.php # modules/UserPreferences/UserPreference.php # modules/Users/ChangePassword.php # modules/Users/Changenewpassword.php # modules/Users/Error.php # modules/Users/Save.php # modules/Users/User.php # modules/Users/authentication/EmailAuthenticate/EmailAuthenticateUser.php # modules/Users/authentication/LDAPAuthenticate/LDAPAuthenticateUser.php # modules/Users/language/en_us.lang.php # modules/Users/reassignUserRecords.php # modules/Users/tpls/EditViewFooter.tpl # modules/Users/views/view.edit.php # modules/jjwg_Address_Cache/jjwg_Address_Cache.php # modules/jjwg_Areas/jjwg_Areas.php # modules/jjwg_Maps/jjwg_Maps.php # modules/jjwg_Markers/jjwg_Markers.php # modules/vCals/vCal.php # service/core/SoapHelperWebService.php # service/core/SugarWebServiceImpl.php # service/v3/SugarWebServiceImplv3.php # service/v3/SugarWebServiceUtilv3.php # service/v3_1/SugarWebServiceImplv3_1.php # service/v4/SugarWebServiceImplv4.php # service/v4/SugarWebServiceUtilv4.php # service/v4_1/SugarWebServiceImplv4_1.php # soap/SoapData.php # soap/SoapDeprecated.php # soap/SoapHelperFunctions.php # soap/SoapPortalHelper.php # soap/SoapPortalUsers.php # soap/SoapRelationshipHelper.php # soap/SoapSugarUsers.php # suitecrm_version.php # tests/phpunit.xml.dist # tests/tests/configTest.php # tests/tests/include/MVC/Controller/ControllerFactoryTest.php # tests/tests/include/MVC/Controller/SugarControllerTest.php # tests/tests/include/MVC/SugarApplicationTest.php # tests/tests/include/MVC/SugarModuleTest.php # tests/tests/include/MVC/View/SugarViewTest.php # tests/tests/include/MVC/View/ViewFactoryTest.php # tests/tests/include/MVC/View/views/view.ajaxTest.php # tests/tests/include/MVC/View/views/view.ajaxuiTest.php # tests/tests/include/MVC/View/views/view.classicTest.php # tests/tests/include/MVC/View/views/view.detailTest.php # tests/tests/include/MVC/View/views/view.editTest.php # tests/tests/include/MVC/View/views/view.favoritesTest.php # tests/tests/include/MVC/View/views/view.htmlTest.php # tests/tests/include/MVC/View/views/view.importvcardTest.php # tests/tests/include/MVC/View/views/view.importvcardsaveTest.php # tests/tests/include/MVC/View/views/view.jsonTest.php # tests/tests/include/MVC/View/views/view.listTest.php # tests/tests/include/MVC/View/views/view.metadataTest.php # tests/tests/include/MVC/View/views/view.modulelistmenuTest.php # tests/tests/include/MVC/View/views/view.multieditTest.php # tests/tests/include/MVC/View/views/view.noaccessTest.php # tests/tests/include/MVC/View/views/view.popupTest.php # tests/tests/include/MVC/View/views/view.quickTest.php # tests/tests/include/MVC/View/views/view.quickcreateTest.php # tests/tests/include/MVC/View/views/view.quickeditTest.php # tests/tests/include/MVC/View/views/view.serializedTest.php # tests/tests/include/MVC/View/views/view.sugarpdfTest.php # tests/tests/include/MVC/View/views/view.vcardTest.php # tests/tests/include/MVC/View/views/view.xmlTest.php # tests/tests/include/utils/LogicHookTest.php # tests/tests/include/utils/activityUtilsTest.php # tests/tests/include/utils/arrayUtilsTest.php # tests/tests/include/utils/autoloaderTest.php # tests/tests/include/utils/dbUtilsTest.php # tests/tests/include/utils/encryptionUtilsTest.php # tests/tests/include/utils/fileUtilsTest.php # tests/tests/include/utils/layoutUtilsTest.php # tests/tests/include/utils/logicUtilsTest.php # tests/tests/include/utils/mvcUtilsTest.php # tests/tests/include/utils/phpZipUtilsTest.php # tests/tests/include/utils/progressBarUtilsTest.php # tests/tests/include/utils/securityUtilsTest.php # tests/tests/include/utils/sugarFileUtilsTest.php # tests/tests/include/utils/zipUtilsTest.php # tests/tests/modules/ACLActions/ACLActionTest.php # tests/tests/modules/ACLRoles/ACLRoleTest.php # tests/tests/modules/AM_ProjectTemplates/AM_ProjectTemplatesTest.php # tests/tests/modules/AM_TaskTemplates/AM_TaskTemplatesTest.php # tests/tests/modules/AOD_Index/AOD_IndexTest.php # tests/tests/modules/AOD_IndexEvent/AOD_IndexEventTest.php # tests/tests/modules/AOK_KnowledgeBase/AOK_KnowledgeBaseTest.php # tests/tests/modules/AOK_Knowledge_Base_Categories/AOK_Knowledge_Base_CategoriesTest.php # tests/tests/modules/AOP_Case_Events/AOP_Case_EventsTest.php # tests/tests/modules/AOP_Case_Updates/AOP_Case_UpdatesTest.php # tests/tests/modules/AOR_Charts/AOR_ChartTest.php # tests/tests/modules/AOR_Conditions/AOR_ConditionTest.php # tests/tests/modules/AOR_Fields/AOR_FieldTest.php # tests/tests/modules/AOR_Reports/AOR_ReportTest.php # tests/tests/modules/AOR_Scheduled_Reports/AOR_Scheduled_ReportsTest.php # tests/tests/modules/AOS_Contracts/AOS_ContractsTest.php # tests/tests/modules/AOS_Invoices/AOS_InvoicesTest.php # tests/tests/modules/AOS_Line_Item_Groups/AOS_Line_Item_GroupsTest.php # tests/tests/modules/AOS_PDF_Templates/AOS_PDF_TemplatesTest.php # tests/tests/modules/AOS_Product_Categories/AOS_Product_CategoriesTest.php # tests/tests/modules/AOS_Products/AOS_ProductsTest.php # tests/tests/modules/AOS_Products_Quotes/AOS_Products_QuotesTest.php # tests/tests/modules/AOS_Quotes/AOS_QuotesTest.php # tests/tests/modules/AOW_Actions/AOW_ActionTest.php # tests/tests/modules/AOW_Conditions/AOW_ConditionTest.php # tests/tests/modules/AOW_Processed/AOW_ProcessedTest.php # tests/tests/modules/AOW_WorkFlow/AOW_WorkFlowTest.php # tests/tests/modules/Accounts/AccountTest.php # tests/tests/modules/Administration/AdministrationTest.php # tests/tests/modules/Alerts/AlertTest.php # tests/tests/modules/Audit/AuditTest.php # tests/tests/modules/Bugs/BugTest.php # tests/tests/modules/Calls/CallTest.php # tests/tests/modules/Calls_Reschedule/Calls_RescheduleTest.php # tests/tests/modules/CampaignLog/CampaignLogTest.php # tests/tests/modules/CampaignTrackers/CampaignTrackerTest.php # tests/tests/modules/Campaigns/CampaignTest.php # tests/tests/modules/Cases/CaseTest.php # tests/tests/modules/Contacts/ContactTest.php # tests/tests/modules/Currencies/CurrencyTest.php # tests/tests/modules/DocumentRevisions/DocumentRevisionTest.php # tests/tests/modules/Documents/DocumentTest.php # tests/tests/modules/EAPM/EAPMTest.php # tests/tests/modules/EmailAddresses/EmailAddressTest.php # tests/tests/modules/EmailMan/EmailManTest.php # tests/tests/modules/EmailMarketing/EmailMarketingTest.php # tests/tests/modules/EmailTemplates/EmailTemplateTest.php # tests/tests/modules/EmailText/EmailTextTest.php # tests/tests/modules/Emails/EmailTest.php # tests/tests/modules/Employees/EmployeeTest.php # tests/tests/modules/FP_Event_Locations/FP_Event_LocationsTest.php # tests/tests/modules/FP_events/FP_eventsTest.php # tests/tests/modules/Favorites/FavoritesTest.php # tests/tests/modules/Groups/GroupTest.php # tests/tests/modules/InboundEmail/InboundEmailTest.php # tests/tests/modules/Leads/LeadTest.php # tests/tests/modules/Meetings/MeetingTest.php # tests/tests/modules/MergeRecords/MergeRecordTest.php # tests/tests/modules/Notes/NoteTest.php # tests/tests/modules/OAuthKeys/OAuthKeyTest.php # tests/tests/modules/OAuthTokens/OAuthTokenTest.php # tests/tests/modules/Opportunities/OpportunityTest.php # tests/tests/modules/Project/ProjectTest.php # tests/tests/modules/ProjectTask/ProjectTaskTest.php # tests/tests/modules/ProspectLists/ProspectListTest.php # tests/tests/modules/Prospects/ProspectTest.php # tests/tests/modules/Relationships/RelationshipTest.php # tests/tests/modules/Releases/ReleaseTest.php # tests/tests/modules/Roles/RoleTest.php # tests/tests/modules/SavedSearch/SavedSearchTest.php # tests/tests/modules/Schedulers/SchedulerTest.php # tests/tests/modules/SchedulersJobs/SchedulersJobTest.php # tests/tests/modules/SecurityGroups/SecurityGroupTest.php # tests/tests/modules/SugarFeed/SugarFeedTest.php # tests/tests/modules/Tasks/TaskTest.php # tests/tests/modules/Trackers/TrackerTest.php # tests/tests/modules/UserPreferences/UserPreferenceTest.php # tests/tests/modules/Users/UserTest.php # tests/tests/modules/iCals/iCalTest.php # tests/tests/modules/jjwg_Address_Cache/jjwg_Address_CacheTest.php # tests/tests/modules/jjwg_Areas/jjwg_AreasTest.php # tests/tests/modules/jjwg_Maps/jjwg_MapsTest.php # tests/tests/modules/jjwg_Markers/jjwg_MarkersTest.php # tests/tests/modules/vCals/vCalTest.php # themes/SuiteP/css/style.css # themes/SuiteP/include/SearchForm/tpls/header.tpl # themes/SuiteP/modules/Calendar/tpls/header.tpl		2018-08-31 13:58:25 +01:00
..
footer.tpl	Copyright notice update - Hotfix	2018-08-01 20:14:25 +01:00
footerPopup.tpl	Copyright notice update - Hotfix	2018-08-01 20:14:25 +01:00
header.tpl	Merge branch 'hotfix-7.8.x' into hotfix	2018-08-31 13:58:25 +01:00
headerPopup.tpl	Copyright notice update - Hotfix	2018-08-01 20:14:25 +01:00
SearchFormGeneric.tpl	Copyright notice update - Hotfix	2018-08-01 20:14:25 +01:00
SearchFormGenericAdvanced.tpl	Fix part 4	2018-08-03 17:50:48 +01:00
SubpanelSearchFormGeneric.tpl	Copyright notice update - Hotfix	2018-08-01 20:14:25 +01:00
SugarSpot.tpl	Copyright notice update - Hotfix	2018-08-01 20:14:25 +01:00