Dillon-Brown 18eb0f0360 Merge branch 'hotfix-7.10.x' into hotfix_merge_14 ... # Conflicts: # .gitignore # README.md # data/Relationships/One2MBeanRelationship.php # data/SugarBean.php # files.md5 # include/HTMLPurifier/HTMLPurifier.standalone.php # include/HTTP_WebDAV_Server/Server.php # include/HTTP_WebDAV_Server/Tools/_parse_lockinfo.php # include/HTTP_WebDAV_Server/Tools/_parse_propfind.php # include/HTTP_WebDAV_Server/Tools/_parse_proppatch.php # include/MassUpdate.php # include/Pear/XML_HTMLSax3/HTMLSax3/States.php # include/Smarty/Smarty.class.php # include/Smarty/Smarty_Compiler.class.php # include/Smarty/internals/core.get_php_resource.php # include/Smarty/internals/core.is_trusted.php # include/Smarty/internals/core.process_cached_inserts.php # include/Smarty/internals/core.process_compiled_include.php # include/Smarty/internals/core.read_cache_file.php # include/Smarty/internals/core.write_cache_file.php # include/Smarty/internals/core.write_compiled_include.php # include/Smarty/plugins/block.minify.php # include/Smarty/plugins/function.config_load.php # include/Smarty/plugins/function.html_select_date.php # include/Smarty/plugins/function.html_select_time.php # include/Smarty/plugins/modifier.spacify.php # include/Smarty/plugins/modifier.truncate.php # include/Smarty/plugins/outputfilter.trimwhitespace.php # include/Smarty/plugins/shared.make_timestamp.php # include/SugarXHprof/xhprof_lib/display/xhprof.php # include/SugarXHprof/xhprof_lib/utils/callgraph_utils.php # include/SugarXHprof/xhprof_lib/utils/xhprof_lib.php # include/javascript/checkbox.js # include/nusoap/class.soap_parser.php # include/nusoap/class.xmlschema.php # include/pclzip/pclzip.lib.php # include/php-sql-parser.php # include/phpmailer/class.phpmailer.php # include/phpmailer/extras/htmlfilter.php # include/reCaptcha/recaptchalib.php # include/social/facebook/facebook_sdk/src/base_facebook.php # include/social/facebook/facebook_sdk/src/facebook.php # include/social/facebook/facebook_sdk/tests/tests.php # include/tcpdf/tcpdf.php # include/utils/zip_utils.php # install.php # lib/Robo/Plugin/Commands/BuildCommands.php # lib/Robo/Plugin/Commands/CleanCacheCommands.php # lib/Robo/Plugin/Commands/TestEnvironmentCommands.php # lib/Robo/Traits/CliRunnerTrait.php # modules/AOD_Index/Lib/Zend/Search/Lucene.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Document/Html.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Index/SegmentInfo.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Index/SegmentMerger.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Index/SegmentWriter.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Index/Writer.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query/Boolean.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query/Fuzzy.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query/MultiTerm.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query/Phrase.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/QueryEntry/Phrase.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/QueryEntry/Term.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/QueryLexer.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/QueryParser.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Weight/Boolean.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Weight/MultiTerm.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Weight/Phrase.php # modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Weight/Term.php # modules/AOR_Reports/AOR_Report.php # modules/AOR_Scheduled_Reports/metadata/subpaneldefs.php # modules/AOS_PDF_Templates/PDF_Lib/classes/barcode.php # modules/AOS_PDF_Templates/PDF_Lib/classes/bmp.php # modules/AOS_PDF_Templates/PDF_Lib/classes/cssmgr.php # modules/AOS_PDF_Templates/PDF_Lib/classes/directw.php # modules/AOS_PDF_Templates/PDF_Lib/classes/form.php # modules/AOS_PDF_Templates/PDF_Lib/classes/grad.php # modules/AOS_PDF_Templates/PDF_Lib/classes/indic.php # modules/AOS_PDF_Templates/PDF_Lib/classes/meter.php # modules/AOS_PDF_Templates/PDF_Lib/classes/svg.php # modules/AOS_PDF_Templates/PDF_Lib/classes/tocontents.php # modules/AOS_PDF_Templates/PDF_Lib/classes/ttfontsuni.php # modules/AOS_PDF_Templates/PDF_Lib/classes/ttfontsuni_analysis.php # modules/AOS_PDF_Templates/PDF_Lib/classes/wmf.php # modules/AOS_PDF_Templates/PDF_Lib/config_cp.php # modules/AOS_PDF_Templates/PDF_Lib/graph.php # modules/AOS_PDF_Templates/PDF_Lib/includes/functions.php # modules/AOS_PDF_Templates/PDF_Lib/includes/out.php # modules/AOS_PDF_Templates/PDF_Lib/mpdf.php # modules/AOS_PDF_Templates/PDF_Lib/mpdfi/filters/FilterASCII85.php # modules/AOS_PDF_Templates/PDF_Lib/mpdfi/filters/FilterLZW.php # modules/AOS_PDF_Templates/PDF_Lib/mpdfi/fpdi_pdf_parser.php # modules/AOS_PDF_Templates/PDF_Lib/mpdfi/pdf_context.php # modules/AOS_PDF_Templates/PDF_Lib/mpdfi/pdf_parser.php # modules/AOS_PDF_Templates/PDF_Lib/utils/font_coverage.php # modules/AOS_PDF_Templates/PDF_Lib/utils/font_dump.php # modules/AOS_PDF_Templates/PDF_Lib/utils/font_names.php # modules/AOW_WorkFlow/AOW_WorkFlow.php # modules/Contacts/Contact.php # modules/Emails/views/view.compose.php # modules/FP_events/controller.php # modules/UpgradeWizard/silentUpgrade.php # modules/UpgradeWizard/silentUpgrade_step1.php # modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/Response.php # service/core/SoapHelperWebService.php # service/v2/registry.php # service/v2_1/registry.php # service/v3/SugarWebServiceUtilv3.php # service/v3/registry.php # service/v3_1/registry.php # service/v4/registry.php # service/v4_1/SugarWebServiceImplv4_1.php # service/v4_1/registry.php # soap/SoapHelperFunctions.php # soap/SoapPortalUsers.php # soap/SoapSugarUsers.php # suitecrm_version.php # tests/_support/Step/Acceptance/Accounts.php # tests/acceptance/Core/BasicModuleCest.php # tests/acceptance/Core/CompanyModuleCest.php # tests/acceptance/Core/FileModuleCest.php # tests/acceptance/Core/IssueModuleCest.php # tests/acceptance/Core/ModuleBuilderFieldsCest.php # tests/acceptance/Core/PersonModuleCest.php # tests/acceptance/Core/SaleModuleCest.php # tests/acceptance/modules/AOW_Workflow/AOW_WorkflowCest.php # tests/acceptance/modules/Accounts/AccountsCest.php # tests/acceptance/modules/Activities/ActivitiesCest.php # tests/acceptance/modules/Calls/CallsCest.php # tests/acceptance/modules/Cases/CasesCest.php # tests/acceptance/modules/Contracts/ContractsCest.php # tests/acceptance/modules/History/HistoryCest.php # tests/acceptance/modules/Opportunities/OpportunitiesCest.php # tests/acceptance/modules/Users/UsersCest.php # tests/acceptance/modules/jjwg_Maps/jjwg_MapsCest.php # themes/SuiteP/css/Dawn/style.css # themes/SuiteP/css/Day/style.css # themes/SuiteP/css/Dusk/style.css # themes/SuiteP/css/Night/style.css		2019-07-25 13:00:22 +01:00
..
registry.php	PSR-2	2019-07-04 17:06:34 +01:00
rest.php	Copyright notice update - Hotfix	2018-08-01 20:14:25 +01:00
soap.php	Merge branch 'hotfix' of https://github.com/salesagility/SuiteCRM into develop_merge_hotfix	2018-10-30 18:04:30 +00:00
SugarSoapService2.php	Merge branch 'hotfix' of https://github.com/salesagility/SuiteCRM into develop_merge_hotfix	2018-10-30 18:04:30 +00:00