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

80 commits

Author SHA1 Message Date
Jan Siero
b39d9610f7 Fix salesagility#10207 salesagility#10209 salesagility#8899 - Multiple Elasticsearch indexing issues 2024-01-18 16:03:09 +00:00
s.samko
fc13483abc Fix - Problem running ElasticsearchIndexerScheduler from cron 2024-01-12 14:53:58 +00: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
Ken Gaillot
0141f3065e Fix - cron.php fails with "must be compatible" error from AOPInboundEmail.php 2022-10-25 13:22:13 +01:00
Clemente Raposo
687ab79049 Fix - Add utf normalization repair command
- Add normalization service
- Add Synchronous execution option
- Add Asynchronous execution option
- Entry to administration repair page
2022-01-25 14:21:23 +00:00
m.crews
77bf446337 Fix : Update pollMonitoredInboxesAOP to check SugarFolder has been retrieved correctly. 2021-11-18 12:10:11 +00:00
Dillon-Brown
fd8758bd80 Deprecate advanced open discovery (AOD)
Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>
2021-09-08 16:41:19 +01:00
j.buchanan
87c55918d5 Fix - Scheduled report execute several times
Update query to be compatible with SQL server, reduce 6 hours to 2
2020-06-08 15:55:29 +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
Matt Lorimer
2a0a28145e Fix , Fix 8577 DBManager::convert calls abstract function 2020-03-18 22:05:34 +00:00
Matt Lorimer
2edb1f595d Fix , Fix 8577 DBManager::convert calls abstract function 2020-03-18 19:59:25 +00:00
j.dang
f2e90e4f93 Replace explicit bean instantiations in files 461 - 470
- File: '... /modules/Calendar/controller.php'

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

- File: '... /modules/Calendar/views/view.getgrusers.php'

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

- File: '... /modules/Calendar/CalendarGrid.php'

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

- File: '... /modules/Calendar/CalendarActivity.php'

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

- File: '... /modules/Accounts/Dashlets/MyAccountsDashlet/MyAccountsDashlet.php'

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

- File: '... /modules/Accounts/AccountsQuickCreate.php'

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

- File: '... /modules/Accounts/Account.php'

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

- File: '... /modules/Accounts/AccountFormBase.php'

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

   - Replaced 6 occurrence(s) of 'new Account()'

- File: '... /modules/Accounts/ShowDuplicates.php'

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

- File: '... /modules/Schedulers/_AddJobsHere.php'

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

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

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

   - Replaced 4 occurrence(s) of 'new InboundEmail()'

   - Replaced 1 occurrence(s) of 'new AOW_WorkFlow()'
2020-01-22 13:51:43 +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
Connor Shea
de2a546cb7 Replace all uses of the deprecated db_utils functions.
The only remaining uses of these three functions is in their unit tests.
2019-10-23 12:51:15 -06: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
1a1503cd8a Replaced alias functions
There's no reason to use aliases when we can just call the origin.
2019-10-17 13:30:22 +01:00
Dillon-Brown
4c5e32af6f PSR-2 2019-02-01 12:17:24 +00:00
Dillon-Brown
84a5b32f19 single_blank_line_at_eof + single_class_element_per_statement + single_import_per_statement + single_line_after_imports 2019-01-25 14:26:18 +00:00
Dillon-Brown
a11f2aea67 no_trailing_whitespace + no_trailing_whitespace_in_comment 2019-01-25 14:24:15 +00:00
Dillon-Brown
3f39d9f153 braces 2019-01-25 13:51:46 +00:00
Benjamin Long
1487beb258
Sync w/Upstream 2019-01-04 22:48:22 -05:00
Dillon-Brown
10d772c15f Merge remote-tracking branch 'upstream/hotfix' into develop_merge_2
# Conflicts:
#	include/generic/SugarWidgets/SugarWidgetSubPanelEditSecurityGroupUserButton.php
#	modules/Emails/include/ListView/ListViewDataEmails.php
2019-01-04 11:03:30 +00:00
Ross Moroney
6ec40125e9 Fixed: SugarBean Issue 2019-01-02 17:54:02 +00:00
Ross Moroney
7bfc829a54 Fixed: Importing of emails 2019-01-02 15:41:25 +00:00
Gyula Madarasz
cc8f0aa8cf fixing tests, cleanup, todos 2018-12-28 15:05:03 +00:00
Dillon-Brown
e00a99f3da Merge branch 'hotfix' into develop_merge
# Conflicts:
#	.travis.yml
#	README.md
#	composer.json
#	composer.lock
#	include/MVC/Controller/entry_point_registry.php
#	include/SugarFolders/SugarFolders.php
#	include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php
#	include/utils/layout_utils.php
#	include/utils/php_zip_utils.php
#	install/ready.php
#	modules/Administration/SyncInboundEmailAccounts.php
#	modules/Administration/SyncInboundEmailAccounts/SyncInboundEmailAccountsPage.php
#	modules/Administration/SyncInboundEmailAccounts/SyncInboundEmailAccountsSubActionHandler.php
#	modules/Campaigns/WizardEmailSetup.php
#	modules/Campaigns/utils.php
#	modules/Emails/Email.php
#	modules/InboundEmail/EditView.php
#	modules/InboundEmail/InboundEmail.php
#	modules/OAuthTokens/OAuthToken.php
#	modules/Schedulers/_AddJobsHere.php
#	modules/UpgradeWizard/uw_utils.php
#	modules/Users/Save.php
#	modules/Users/User.php
#	modules/jjwg_Maps/views/view.geocoded_counts.php
#	suitecrm_version.php
#	tests/_support/Step/Acceptance/EmailManTester.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Enumerator/SugarBeanRelationshipType.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Interpreters/ByPreMadeFilters/TodayTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Interpreters/FilterInterpreterTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Operators/Comparators/EqualsOperatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Operators/Comparators/GreaterThanOperatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Operators/Comparators/GreaterThanOrEqualsOperatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Operators/Comparators/InOperatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Operators/Comparators/LessThanOperatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Operators/Comparators/LessThanOrEqualsOperatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Operators/Comparators/NotEqualsOperatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Operators/Comparators/NotInOperatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Operators/FieldOperatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Operators/OperatorsTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Operators/SpecialOperatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Operators/Strings/LikeOperatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Operators/Strings/NotLikeOperatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Parsers/FilterParserMock.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Parsers/FilterParserTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Validators/FieldValidatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/JsonApi/v1/Filters/Validators/ValueValidatorTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/ApiExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/BadRequestExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/ConflictExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/EmptyBodyExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/ForbiddenExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/InvalidJsonApiRequestExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/InvalidJsonApiResponseExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/ModuleNotFoundExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/NotAcceptableExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/NotAllowedExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/NotFoundExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/NotImplementedExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/ReservedKeywordsNotAllowedExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/API/v8/Exception/UnsupportedMediaTypeExceptionTest.php
#	tests/unit/codecept/lib/SuiteCRM/Utility/OperatingSystemTest.php
#	tests/unit/phpunit/lib/SuiteCRM/Exception/ExceptionTest.php
#	tests/unit/phpunit/lib/SuiteCRM/Utility/SuiteLoggerTest.php
#	tests/unit/phpunit/modules/AOR_Scheduled_Reports/AOR_Scheduled_ReportsTest.php
#	tests/unit/phpunit/modules/Contacts/ContactTest.php
#	tests/unit/phpunit/modules/Project/ProjectTest.php
#	tests/unit/phpunit/modules/ProspectLists/ProspectListTest.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
2018-12-17 14:38:23 +00:00
Ashley Nicolson
e938c762d1
Merge branch 'develop' into feature/google_calendar_sync 2018-11-15 09:36:17 +00:00
Ashley Nicolson
2770d97aeb
Merge branch 'develop' into feature/elasticsearch-merged 2018-11-13 14:46:12 +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
1d575ec959 Merge remote-tracking branch 'upstream/hotfix' into hotfix_inboundemail_tests 2018-10-29 13:40:54 +00:00
Gyula Madarasz
dc85c805b8 removing 'confusing' condition 2018-10-23 14:34:43 +01:00
Gyula Madarasz
b849b96c71 using suite validator 2018-10-23 14:33:55 +01:00
Gyula Madarasz
31ba3f9360 type fix 2018-10-23 13:49:15 +01:00
Gyula Madarasz
30a9a17210 fixing php error in cron 2018-10-23 13:43:03 +01:00
Dillon-Brown
016413d68d Merge branch 'hotfix-7.8.x' into hotfix_merge
# Conflicts:
#	modules/Schedulers/Scheduler.php
#	modules/Schedulers/_AddJobsHere.php
2018-10-18 11:08:21 +01:00
Gyula Madarasz
6521b2d92e Imap wrapper in _AddJobsHere 2018-10-15 15:05:43 +01:00
Gyula Madarasz
00061fbdcf Imap wrapper in _AddJobsHere 2018-10-15 15:03:14 +01:00
Ashley Nicolson
c03fd06b5b
Merge pull request from Dillon-Brown/issue-6204
Fixed  - Syntax error in _AddJobsHere.php causes scheduled report not to render properly
2018-10-01 11:49:15 +01:00
Dillon-Brown
bd4cf81608 Fixed - ChangePassword.php - syntax error missing curly braces 2018-09-26 11:03:11 +01:00
Dillon-Brown
6a5f461b50 Merge branch 'hotfix-7.8.x' into hotfix
# Conflicts:
#	README.md
#	modules/Meetings/language/en_us.lang.php
#	suitecrm_version.php
2018-09-20 15:18:48 +01:00
Dillon-Brown
de700c5e08
Merge branch 'hotfix' into issue-5360-1 2018-09-14 12:13:04 +01:00
Dillon-Brown
d7db8f8e91 Fixed - undefined variable in _AddJobsHere.php 2018-09-10 10:48:03 +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
Dillon-Brown
b6db737b01 Merge remote-tracking branch 'upstream/develop' into feature/google_calendar_sync
# Conflicts:
#	modules/Schedulers/Scheduler.php
#	modules/Users/UserViewHelper.php
2018-08-29 10:06:16 +01:00
Jose C. Massón
c21d0974f6 FIX - Emails imported automatically in group inbound account are not marked as read 2018-08-10 15:57:01 -03:00
Dillon-Brown
1a8555a61f Merge remote-tracking branch 'upstream/hotfix' into copynotice2018 2018-08-07 15:27:15 +01:00
Horus68
7a8c3afa48 fix part 2
fixing typos
2018-08-02 19:01:56 +01:00
Vittorio Iocolano
67c47aced7 Merge branch 'feature/elasticsearch' into feature/elasticsearch-merged 2018-08-02 14:34:54 +01:00
Vittorio Iocolano
710f1f890f Improve ElasticSearchIndexer scheduler 2018-08-02 14:16:29 +01:00