0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-03-15 05:44:49 +00:00
Commit graph

43 commits

Author SHA1 Message Date
Clemente Raposo
9aff7071bb Run rector on modules folder 2023-07-18 15:53:09 +01: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
d3507776d6 Removed unused description headers 2019-10-14 14:09:52 +01: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
3f39d9f153 braces 2019-01-25 13:51:46 +00: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
Dillon-Brown
8f7fcdc842 Copyright revision 2018-12-31 14:25:24 +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
Horus68
3c2c0b4427 Fix part 3
fixing typos
2018-08-02 22:05:07 +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
Dillon-Brown
19cfb50dda single_blank_line_at_eof 2018-07-19 11:38:09 +01:00
Dillon-Brown
68f69400bc braces 2018-07-12 11:40:27 +01:00
Dillon Brown
8f2ad588d9 Merge branch 'hotfix' into develop
# Conflicts:
#	data/SugarBean.php
#	include/ListView/ListView.php
#	include/ListView/ListViewSmarty.php
#	include/SugarPHPMailer.php
#	install/install_utils.php
#	modules/Administration/PasswordManager.php
#	modules/Administration/UpgradeAccess.php
#	modules/Contacts/Contact.php
#	modules/SecurityGroups/SecurityGroup.php
#	themes/Suite7/css/colourSelector.php
#	themes/Suite7/css/style.css
#	themes/SuiteP/css/listview.scss
#	themes/SuiteR/css/style.css
2018-02-14 17:43:21 +00:00
horus68
0f37758c30 Fixed - Updating language copyright date on language files
Fixed  - Updating language copyright date on language files to 2018
2018-02-07 17:00:44 +00:00
Gyula Madarasz
203e518a6c handle opt in and fix a php notice 2018-01-19 11:56:08 +00:00
Daniel Samson
8ed62120c9 Merge remote-tracking branch 'upstream/feature/gdpr' into feature/gdpr_campaigns_merge 2018-01-17 13:16:38 +00:00
Daniel Samson
42a7340440 fixing spelling 2018-01-17 11:48:44 +00:00
Gyula Madarasz
794770d775 avoid new words and look for consistency 2018-01-16 13:26:24 +00:00
Gyula Madarasz
bf4e021b7e using correct field name 2018-01-16 10:05:23 +00:00
Gyula Madarasz
b48d874a1c log opt in sending date and refact var names 2018-01-15 18:17:49 +00:00
Daniel Samson
f63f693308 Update Email Settings to support drowndown instead of boolean 2018-01-15 18:03:55 +00:00
Daniel Samson
cbbf37923c Add confirm opt in process 2018-01-11 14:30:55 +00:00
Daniel Samson
24432adc0c Reformatting EmailAddress.php 2018-01-10 15:18:43 +00:00
Daniel Samson
80c49a2644 removing 'opt_in_email_created' 2018-01-08 16:57:44 +00:00
Daniel Samson
f48729bac6 adding public accessor to EmailAddress 2018-01-08 14:29:51 +00:00
Daniel Samson
42b099608c Adding missing fields to EmailAddress 2018-01-03 16:07:06 +00:00
Gyula Madarasz
f444d51b8e php cs fix on changed files in PR 2017-12-18 10:35:00 +00:00
Gyula Madarasz
9aa8d65a6d add 'confirm opt in' field to emails 2017-12-13 16:48:48 +00:00
Dillon Brown
af3f8a8b7e Fixed - Language files - PR for code re-format only 2017-08-28 13:18:10 +01:00
Dillon Brown
5f72b67719 Updated Liscence and entry points 2017-05-08 15:02:14 +01:00
Gyula Madarasz
4f960eb977 update usages of SugarEmailAddress::save() function calls to saveEmail() 2017-02-01 12:43:06 +00:00
jakabadambalazs
a5acea6133 applied php7fix patch 2016-03-24 10:22:58 +01:00
Matthew
4c9ecacca6 remove es_es lang from default 2016-01-17 15:08:26 +00:00
Matthew
9e412507e0 Removed redundant legacy language files 2015-11-18 14:40:10 +00:00
Matthew
b533ad20e5 Updated Script header 2014-07-07 16:33:41 +01:00
Lewis Jessett
89ec09bdc9 Initial Commit of Twitter and Facebook integration 2014-01-20 12:16:18 +00:00
Matthew
51ff3dc7b5 Merge branch 'likhobory-master' into hotfix-7.0.2 2014-01-13 11:54:44 +00:00
SalesAgility
3035b4327e Russian RAPIRA language file 2014-01-11 19:45:02 +04:00
Jorge Obeaga
91da069276 Base language package es_es 2013-11-19 11:40:57 -03:00
Matthew
8e51b0e900 initial commit 2013-09-23 20:30:44 +01:00