0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-01-11 20:08:27 +00:00
Commit graph

102 commits

Author SHA1 Message Date
s.samko
0c67bd6892 PHP 8.2 - Fix WizardMarketing.php warning 2023-08-22 17:26:37 +01:00
Jack Anderson
aefadada27 Run rector on modules folder 2023-07-18 15:53:48 +01:00
Clemente Raposo
9aff7071bb Run rector on modules folder 2023-07-18 15:53:09 +01:00
Matt Lorimer
2c48735fbe Merge branch 'hotfix-7.10.x' into hotfix
# Conflicts:
#	README.md
#	composer.lock
#	data/BeanFactory.php
#	files.md5
#	modules/AOD_Index/AOD_Index.php
#	modules/AOR_Conditions/conditionLines.php
#	modules/AOW_Conditions/conditionLines.php
#	modules/Activities/SetAcceptStatus.php
#	modules/Administration/views/view.backups.php
#	modules/Calendar/controller.php
#	modules/Campaigns/WizardCampaignSave.php
#	modules/Contacts/AcceptDecline.php
#	modules/Emails/Compose.php
#	modules/Opportunities/OpportunityFormBase.php
#	modules/Project/chart.php
#	modules/SavedSearch/index.php
#	service/v3_1/SugarWebServiceUtilv3_1.php
#	soap/SoapPortalHelper.php
#	suitecrm_version.php
#	tests/unit/phpunit/data/SugarBeanTest.php
#	tests/unit/phpunit/include/SugarFolders/SugarFolderTest.php
#	tests/unit/phpunit/modules/AOS_Products/AOS_ProductsTest.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
2020-03-30 10:50:29 +01:00
j.dang
5c67dc1f51 Replace explicit bean instantiations in files 421 - 430
- File: '... /modules/Campaigns/Delete.php'

   - Replaced 1 occurrence(s) of 'new Campaign()'

- File: '... /modules/Campaigns/WizardHome.php'

   - Replaced 1 occurrence(s) of 'new ProspectList()'

   - Replaced 1 occurrence(s) of 'new Campaign()'

   - Replaced 1 occurrence(s) of 'new EmailMarketing()'

   - Replaced 1 occurrence(s) of 'new CampaignTracker()'

- File: '... /modules/Campaigns/Charts.php'

   - Replaced 3 occurrence(s) of 'new Campaign()'

   - Replaced 2 occurrence(s) of 'new Currency()'

- File: '... /modules/Campaigns/RemoveMe.php'

   - Replaced 1 occurrence(s) of 'new User()'

- File: '... /modules/Campaigns/WizardEmailSetupSave.php'

   - Replaced 1 occurrence(s) of 'new Administration()'

- File: '... /modules/Campaigns/WebToLeadCapture.php'

   - Replaced 1 occurrence(s) of 'new Lead()'

   - Replaced 1 occurrence(s) of 'new Campaign()'

   - Replaced 1 occurrence(s) of 'new EmailMarketing()'

   - Replaced 1 occurrence(s) of 'new CampaignLog()'

   - Replaced 1 occurrence(s) of 'new User()'

- File: '... /modules/Campaigns/WizardEmailSetup.php'

   - Replaced 1 occurrence(s) of 'new Email()'

   - Replaced 1 occurrence(s) of 'new Administration()'

- File: '... /modules/Campaigns/WizardMarketing.php'

   - Replaced 1 occurrence(s) of 'new ProspectList()'

   - Replaced 1 occurrence(s) of 'new Campaign()'

   - Replaced 1 occurrence(s) of 'new EmailMarketing()'

   - Replaced 1 occurrence(s) of 'new CampaignTracker()'

   - Replaced 1 occurrence(s) of 'new Note()'

- File: '... /modules/Campaigns/views/view.detail.php'

   - Replaced 1 occurrence(s) of 'new Currency()'

- File: '... /modules/Campaigns/views/view.modulelistmenu.php'

   - Replaced 1 occurrence(s) of 'new Tracker()'
2020-01-22 13:51:37 +00:00
Dillon-Brown
af4b1e71f5 Merge remote-tracking branch 'upstream/hotfix-7.10.x' into fix/merge_statechecker
# Conflicts:
#	README.md
#	composer.json
#	composer.lock
#	files.md5
#	include/StateChecker.php
#	include/utils.php
#	modules/ACLRoles/DetailView.php
#	modules/AOS_Products_Quotes/Line_Items.php
#	modules/Administration/ElasticSearchSettings.php
#	modules/Currencies/Currency.php
#	service/core/webservice.php
#	suitecrm_version.php
#	tests/SuiteCRM/Test/SuitePHPUnitFrameworkTestCase.php
#	tests/unit/phpunit/SuitePHPUnit_Framework_TestCase.php
#	tests/unit/phpunit/data/SugarBeanTest.php
#	tests/unit/phpunit/include/APIErrorObjectTest.php
#	tests/unit/phpunit/include/ErrorMessageTest.php
#	tests/unit/phpunit/include/Imap/ImapHandlerFactoryTest.php
#	tests/unit/phpunit/include/MVC/Controller/SugarControllerTest.php
#	tests/unit/phpunit/include/MVC/SugarApplicationTest.php
#	tests/unit/phpunit/include/MVC/View/SugarViewTest.php
#	tests/unit/phpunit/include/MVC/View/views/view.classicTest.php
#	tests/unit/phpunit/include/MVC/View/views/view.detailTest.php
#	tests/unit/phpunit/include/MVC/View/views/view.editTest.php
#	tests/unit/phpunit/include/MVC/View/views/view.importvcardsaveTest.php
#	tests/unit/phpunit/include/MVC/View/views/view.jsonTest.php
#	tests/unit/phpunit/include/SugarEmailAddress/SugarEmailAddressTest.php
#	tests/unit/phpunit/include/SugarFolders/SugarFolderTest.php
#	tests/unit/phpunit/include/utils/LogicHookTest.php
#	tests/unit/phpunit/include/utils/phpZipUtilsTest.php
#	tests/unit/phpunit/include/utils/securityUtilsTest.php
#	tests/unit/phpunit/lib/SuiteCRM/Utility/SuiteLoggerTest.php
#	tests/unit/phpunit/modules/ACLActions/ACLActionTest.php
#	tests/unit/phpunit/modules/AOW_WorkFlow/AOW_WorkFlowTest.php
#	tests/unit/phpunit/modules/Emails/EmailTest.php
#	tests/unit/phpunit/modules/FP_events/FP_eventsTest.php
#	tests/unit/phpunit/modules/ProspectLists/ProspectListTest.php
#	tests/unit/phpunit/modules/SchedulersJobs/SchedulersJobTest.php
#	tests/unit/phpunit/modules/Tasks/TaskTest.php
#	tests/unit/phpunit/modules/UserPreferences/UserPreferenceTest.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-11-19 14:32:37 +00:00
Dmitry
6c6d45af9d fix: replace seperator and seperate in whole codebase 2019-10-24 16:40:50 +03:00
Craig Panton
73ded274ee Merge remote-tracking branch 'remotes/origin/hotfix-7.10.x' into hotfix
# Conflicts:
#	.codecov.yml
#	.travis.yml
#	composer.lock
#	include/database/DBManager.php
#	include/phpmailer/class.phpmailer.php
#	include/phpmailer/extras/htmlfilter.php
#	include/tcpdf/fonts/utils/makefont.php
#	modules/AOD_Index/Lib/Zend/Search/Exception.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/Analyzer.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/Analyzer/Common.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/Token.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/TokenFilter.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Document/Docx.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Document/Exception.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Document/OpenXml.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Document/Pptx.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Document/Xlsx.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Exception.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/FSM.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/FSMAction.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Field.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Index/DictionaryLoader.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Index/DocsFilter.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Index/FieldInfo.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Index/Term.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Index/TermInfo.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Index/TermsPriorityQueue.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Interface/MultiSearcher.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/LockManager.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/MultiSearcher.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/PriorityQueue.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Highlighter/Default.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query/Empty.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query/Insignificant.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query/Preprocessing.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query/Range.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query/Term.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Query/Wildcard.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/QueryEntry.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/QueryHit.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/QueryParserContext.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/QueryParserException.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/QueryToken.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Similarity.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Weight.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Search/Weight/Empty.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Storage/Directory.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Storage/Directory/Filesystem.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Storage/File/Filesystem.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Storage/File/Memory.php
#	modules/Administration/metadata/adminpaneldefs.php
#	modules/Audit/Audit.php
#	modules/Calendar/CalendarDisplay.php
#	modules/Calls/Call.php
#	modules/Contacts/BusinessCard.php
#	modules/UpgradeWizard/language/en_us.lang.php
#	modules/Users/authentication/LDAPAuthenticate/LDAPAuthenticateUser.php
#	service/v3/SugarWebServiceImplv3.php
#	service/v4/SugarWebServiceUtilv4.php
#	tests/unit/phpunit/data/SugarBeanTest.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-10-23 11:10:20 +01:00
Dillon-Brown
a5ca90ac8b Removed unused description headers 2019-10-14 14:12:09 +01:00
Dillon-Brown
26fc406b5e method_argument_space 2019-01-25 14:14:52 +00:00
Dillon-Brown
3f39d9f153 braces 2019-01-25 13:51:46 +00:00
Gyula Madarasz
f5a310e859 Merge branch 'hotfix' of https://github.com/salesagility/SuiteCRM into develop_merge_hotfix 2018-10-30 18:04:30 +00:00
Dillon-Brown
bd4cf81608 Fixed - ChangePassword.php - syntax error missing curly braces 2018-09-26 11:03:11 +01:00
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
Horus68
a7dc2220a9 Fix part 4
fixing typos and license
2018-08-03 17:50:48 +01:00
Horus68
34eb8562c6 Copyright notice update - Hotfix
Copyright notice update for hotfix branch
Changes: 
- Year 
- Double spaces
- Brand fix for SalesAgility Ltd. (was Salesagility Ltd)

Created from latest hotfix branch.
2018-08-01 20:14:25 +01:00
Dillon-Brown
acf296012d Revert "Merge branch 'hotfix' into develop"
This reverts commit d08f74643d, reversing
changes made to b137595f91.
2018-07-31 15:24:44 +01:00
Dillon-Brown
c35f5bc49c @PSR2 2018-07-24 15:42:24 +01:00
Dillon-Brown
ae82881c3d no_useless_else 2018-07-20 22:00:34 +01:00
p.ernst
b5f0f5a10f Fix faulty logic causing EmailMarketing not loading properly 2018-07-18 15:58:37 +01:00
Dillon-Brown
32ca35db09 method_argument_space 2018-07-16 16:17:49 +01:00
Dillon-Brown
68f69400bc braces 2018-07-12 11:40:27 +01:00
Dillon-Brown
510c4549ff PSR2 - elseif 2018-06-21 21:22:45 +01:00
Dillon Brown
5a6d9a9e32 Merge branch 'develop' into remove_closing_tags
# Conflicts:
#	include/TemplateHandler/TemplateHandler.php
#	include/ytree/Tree.php
#	install/language/en_us.lang.php
#	modules/ACL/ACLController.php
#	modules/ACL/language/en_us.lang.php
#	modules/ACLRoles/language/en_us.lang.php
#	modules/AOS_Contracts/language/en_us.lang.php
#	modules/AOS_Invoices/language/en_us.lang.php
#	modules/AOS_PDF_Templates/sendEmail.php
#	modules/AOS_Products/language/en_us.lang.php
#	modules/AOS_Products_Quotes/language/en_us.lang.php
#	modules/AOS_Quotes/language/en_us.lang.php
#	modules/AOS_Quotes/views/view.detail.php
#	modules/Accounts/language/en_us.lang.php
#	modules/Activities/OpenListView.php
#	modules/Administration/RebuildRelationship.php
#	modules/Bugs/language/en_us.lang.php
#	modules/Calendar/Dashlets/CalendarDashlet/CalendarDashlet.en_us.lang.php
#	modules/Calendar/Dashlets/CalendarDashlet/CalendarDashlet.es_es.lang.php
#	modules/Calendar/Dashlets/CalendarDashlet/CalendarDashlet.ru_ru.lang.php
#	modules/Calendar/language/en_us.lang.php
#	modules/CampaignTrackers/language/en_us.lang.php
#	modules/Campaigns/language/en_us.lang.php
#	modules/Charts/Dashlets/CampaignROIChartDashlet/CampaignROIChartDashlet.en_us.lang.php
#	modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.en_us.lang.php
#	modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.en_us.lang.php
#	modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.en_us.lang.php
#	modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.en_us.lang.php
#	modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.en_us.lang.php
#	modules/Configurator/language/en_us.lang.php
#	modules/Connectors/connectors/sources/ext/rest/facebook/language/en_us.lang.php
#	modules/Connectors/connectors/sources/ext/rest/twitter/language/en_us.lang.php
#	modules/Contacts/language/en_us.lang.php
#	modules/Contacts/metadata/subpanels/default.php
#	modules/Documents/language/en_us.lang.php
#	modules/DynamicFields/language/en_us.lang.php
#	modules/EmailTemplates/Menu.php
#	modules/Emails/DetailView.php
#	modules/Emails/Email.php
#	modules/Emails/ListViewGroup.php
#	modules/Emails/ListViewHome.php
#	modules/Emails/MassDelete.php
#	modules/Emails/Menu.php
#	modules/Emails/SubPanelViewRecipients.php
#	modules/Emails/views/view.modulelistmenu.php
#	modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.en_us.lang.php
#	modules/Home/Dashlets/RSSDashlet/RSSDashlet.en_us.lang.php
#	modules/InboundEmail/language/en_us.lang.php
#	modules/Leads/language/en_us.lang.php
#	modules/MailMerge/language/en_us.lang.php
#	modules/Meetings/language/en_us.lang.php
#	modules/MergeRecords/language/en_us.lang.php
#	modules/ModuleBuilder/Module/StudioModule.php
#	modules/ModuleBuilder/Module/StudioModuleFactory.php
#	modules/ModuleBuilder/parsers/views/DashletMetaDataParser.php
#	modules/ModuleBuilder/parsers/views/PopupMetaDataParser.php
#	modules/Notes/Note.php
#	modules/ProjectTask/language/en_us.lang.php
#	modules/ProspectLists/language/en_us.lang.php
#	modules/ResourceCalendar/language/en_us.lang.php
#	modules/Schedulers/language/en_us.lang.php
#	modules/SugarFeed/language/en_us.lang.php
#	modules/Users/authentication/SugarAuthenticate/SugarAuthenticateUser.php
#	tests/tests/include/utils/LogicHookTest.php
#	tests/tests/modules/Employees/EmployeeTest.php
#	tests/tests/modules/Project/ProjectTest.php
#	tests/tests/modules/ProspectLists/ProspectListTest.php
2018-01-19 11:31:16 +00:00
Dillon-Brown
162c352b45 Merge remote-tracking branch 'upstream/hotfix-7.8.x' into remove_closing_tags
# Conflicts:
#	include/SugarFields/Parsers/MetaParser.php
#	install/UserDemoData.php
#	install/download_patches.php
#	install/installSystemCheck.php
#	install/systemOptions.php
#	modules/Audit/Popup_picker.php
#	modules/Emails/metadata/subpanels/ForUnlinkedEmailHistory.php
#	modules/Employees/EmployeeStatus.php
#	modules/Employees/metadata/editviewdefs.php
2018-01-14 08:07:56 +00:00
Dillon Brown
51b7913fe4 Merge branch 'hotfix' into develop_merge
# Conflicts:
#	include/SugarEmailAddress/SugarEmailAddress.php
#	include/javascript/EmailsComposeViewModal.js
#	include/language/en_us.lang.php
#	modules/AOW_WorkFlow/AOW_WorkFlow.php
#	modules/Campaigns/WizardNewsletter.php
#	modules/Campaigns/language/en_us.lang.php
#	modules/InboundEmail/InboundEmail.php
#	modules/Users/User.php
#	modules/Users/language/en_us.lang.php
#	modules/Users/login.js
#	suitecrm_version.php
#	themes/SuiteP/css/style.css
#	themes/SuiteP/css/suitep-base/login.scss
2017-12-15 14:50:34 +00:00
Dillon Brown
f3697d0dc7 Merge branch 'hotfix-7.8.x' into hotfix
# Conflicts:
#	modules/Campaigns/WizardMarketing.html
#	modules/OutboundEmailAccounts/language/en_us.lang.php
2017-12-13 11:02:40 +00:00
Gyula Madarasz
3873d83c8a add 'from' and 'reply-to' to campaign marketing wizard page 2017-12-08 11:20:57 +00:00
Jim Mackin
c00e428f67 Add Campaign changes. 2017-11-29 11:53:18 +00:00
Dillon-Brown
eba5ce7913 Removed PHP closing tag 2017-10-07 00:06:08 +00:00
Gyula Madarasz
a2b354cebf code review change requests 2017-07-06 12:53:04 +01:00
Gyula Madarasz
cff27a7d3c add some log info at php error fix 2017-07-05 15:36:47 +01:00
Gyula Madarasz
d938ae4426 fix some php error 2017-07-05 10:59:24 +01:00
Ashley Nicolson
be7554c460 Merge branch 'hotfix' into develop
Conflicts:
	README.md
	modules/InboundEmail/language/en_us.lang.php
2017-05-24 11:43:47 +01:00
Gyula Madarasz
fda648796c simple suite settings 2017-05-01 11:00:06 +01:00
Gyula Madarasz
f9cdfda5f1 clean up 2017-04-28 18:32:59 +01:00
Gyula Madarasz
28dd103447 insert variable interface 2017-04-28 16:12:54 +01:00
Gyula Madarasz
55cdb06ee7 editor js interface 2017-04-28 12:35:15 +01:00
pgorod
c62c9dc915 Fix local reference
Without the full path, the reference works because PHP ends up picking up the file from the local directory. However, if you move this `WizardMarketing.php` to `custom` to customize it, the reference will break.
2017-04-16 11:49:06 +01:00
Gyula Madarasz
4190bc4e07 Add additional field to Email Template (Campaigns and normal) for width 2017-02-27 16:51:31 +00:00
Gyula Madarasz
efa93f1ae4 set email tpl width 600px by default 2017-02-27 13:30:22 +00:00
gyula
cbb8393592 fix php notices 2016-06-24 12:11:25 +01:00
gymad
7fc8ca140a php notice fixed: test for requested variable is already set before test for value 2016-05-27 16:03:58 +01:00
gymad
370867c411 fix: Unable to create new marketing email record via the Marketing Email subpanel (via Campaign). This currently takes user to the correct position in wizard but you follow through the proceedure it willonly overwrite the current Email Marketing record rather than creating a new one - see notes 2016-05-26 12:35:59 +01:00
gymad
3e2fa3618b fix: no template pre-filled if marketing record createing 2016-05-26 10:26:59 +01:00
gymad
9c2179c708 fix login behind selected marketing record 2016-05-24 13:27:44 +01:00
gymad
29af83b129 Merge branch 'campaign-wizard-ui' of https://github.com/salesagility/SuiteCRM into campaign-wizard-ui 2016-05-23 14:28:12 +01:00
gymad
c45e9cffc5 Marketing record validation refact and refresh on change Marketing dropdown on Summary Page 2016-05-23 14:27:49 +01:00
Daniel Samson
77857258b7 Adding func hidden field to campaign wizard.
Using func to determine which page the wizard moves to .
2016-05-23 14:20:39 +01:00
gymad
cc20d306be resolve a conflict 2016-05-20 15:01:38 +01:00