0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-02-24 22:16:10 +00:00
Commit graph

123 commits

Author SHA1 Message Date
sinergiacrm
10c3be5d43 Fix - Javascript message error when bulk updating all user records 2023-02-23 09:56:47 +00:00
Horus68
2497153d26 https url fix 2021-08-19 13:53:32 +01:00
Craig Panton
845eab91e4 Merge remote-tracking branch 'remotes/upstream/v7.10.23-CF' into fix/merge_statechecker
# Conflicts:
#	include/Smarty/plugins/function.sugar_phone.php
#	modules/Configurator/tpls/EditView.tpl
#	tests/unit/phpunit/data/SugarBeanMock.php
#	tests/unit/phpunit/data/SugarBeanTest.php
#	tests/unit/phpunit/include/MVC/Controller/SugarControllerTest.php
#	tests/unit/phpunit/include/MVC/View/views/view.serializedTest.php
#	tests/unit/phpunit/include/SugarFolders/SugarFolderTest.php
#	tests/unit/phpunit/include/utils/securityUtilsTest.php
#	tests/unit/phpunit/modules/Emails/EmailTest.php
#	tests/unit/phpunit/modules/SchedulersJobs/SchedulersJobTest.php
2019-12-06 14:19:56 +00:00
Ashley Nicolson
fcb6beb898
Merge pull request from crgrieve/7.10.x
More inclusive language
2019-11-26 13:07:46 +00:00
Carole Rennie Logan
a88329d9a2
Update en_us.lang.php 2019-10-31 21:09:50 +00: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
54c574bdc6
Merge pull request from cameronblaikie/issue5652
FIXED  - Ending spaces in language strings
2019-10-04 11:38:32 +01:00
Mac Rae
ac0365425b
Merge pull request from cameronblaikie/issue7613
FIXED  - Status/State usage causing translation errors (State/Region)
2019-10-03 15:29:14 +01:00
cameronblaikie
f769979db3 FIXED - Ending spaces in language strings UPDATE 2019-09-23 16:50:49 +01:00
Dillon-Brown
66954ac3af Merge remote-tracking branch 'upstream/hotfix-7.10.x' into hotfix
# Conflicts:
#	.travis.yml
#	README.md
#	data/SugarBean.php
#	include/MVC/View/SugarView.php
#	include/Smarty/plugins/function.fetch.php
#	include/SugarFields/Fields/File/SugarFieldFile.php
#	include/SugarObjects/templates/person/Person.php
#	include/SugarXHprof/SugarXHprof.php
#	include/SugarXHprof/xhprof_lib/utils/xhprof_runs.php
#	include/nusoap/class.nusoap_base.php
#	include/nusoap/class.soap_transport_http.php
#	include/nusoap/class.soapclient.php
#	include/nusoap/class.wsdl.php
#	include/nusoap/class.wsdlcache.php
#	include/parsecsv.lib.php
#	include/social/get_feed_data.php
#	include/tcpdf/barcodes.php
#	lib/Robo/Plugin/Commands/CodeCoverageCommands.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Storage/File.php
#	modules/AOR_Charts/lib/pChart/class/pBarcode128.class.php
#	modules/AOR_Charts/lib/pChart/class/pBarcode39.class.php
#	modules/AOR_Charts/lib/pChart/class/pCache.class.php
#	modules/AOR_Charts/lib/pChart/class/pData.class.php
#	modules/AOR_Charts/lib/pChart/class/pDraw.class.php
#	modules/AOR_Charts/lib/pChart/class/pImage.class.php
#	modules/AOR_Charts/lib/pChart/class/pSpring.class.php
#	modules/AOS_PDF_Templates/templateParser.php
#	modules/AOS_Products/AOS_Products.php
#	modules/AOW_Actions/FormulaCalculator.php
#	modules/AOW_WorkFlow/aow_utils.php
#	modules/Trackers/store/DatabaseStore.php
#	phpcs.xml
#	service/core/REST/SugarRest.php
#	service/example/Rest_Proxy.php
#	suitecrm_version.php
#	tests/SuiteCRM/Test/SuitePHPUnit_Framework_TestCase.php
#	tests/unit/phpunit/data/SugarBeanTest.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.editTest.php
#	tests/unit/phpunit/include/utils/securityUtilsTest.php
#	tests/unit/phpunit/modules/ACLActions/ACLActionTest.php
#	tests/unit/phpunit/modules/Emails/EmailTest.php
#	tests/unit/phpunit/modules/ProspectLists/ProspectListTest.php
#	tests/unit/phpunit/modules/SchedulersJobs/SchedulersJobTest.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-09-20 14:53:13 +01:00
cameronblaikie
e4bc6f060d FIXED - Title/Job Title [translations] (|Title - Job Title) 1 2019-09-17 14:49:57 +01:00
cameronblaikie
545165a6f2 FIXED - Status/State usage causing translation errors (State/Region) 2019-09-12 15:30:13 +01: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
Ashley Nicolson
e938c762d1
Merge branch 'develop' into feature/google_calendar_sync 2018-11-15 09:36:17 +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
ChangezKhan
e78e50f074 Fixed - Empty help message when creating user 2018-10-10 10:12:26 +01:00
Dillon-Brown
de700c5e08
Merge branch 'hotfix' into issue-5360-1 2018-09-14 12:13:04 +01:00
p.ernst
d10c36b270 Merge branch 'hotfix' of https://github.com/salesagility/SuiteCRM into feature/collapsed-subpanel-row-count 2018-07-31 15:59:31 +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
37d5c5364f
Merge branch 'hotfix' into issue-5360-1 2018-07-23 15:40:53 +01:00
Benjamin Long
7ffc0d5cac Coding Standards & Fixes
Follow Quote & PSR-2 Php Coding Standards.
Remove unused var.
Add check for var.
Fix Php doc blocks.
Remove cruft.
2018-07-13 14:59:33 -04:00
Horus68
3585954b9b
Typo in comments
typo: EmialTemplate
2018-07-13 09:27:56 +01:00
Benjamin Long
a4b8f8a345 JSON config feedback. Handle EntryPoint Error. Add help text.
The 'System Settings' administration screen now shows if the
JSON file is configured and valid JSON.

The saveGoogleApiKey entry point now handles error by informing
the user, and unknown data by silently returning to the users
profile.

The help text on the JSON and API Token fields is now useful
instead of just 'HELP GOES HERE'.
2018-07-11 11:54:20 -04:00
Benjamin Long
d82d5d22ec Inital Commit of Meeting <> Google Calendar Sync 2018-07-10 17:32:26 -04:00
p.ernst
a3346b855e Add user config option to toggle this functionality 2018-03-23 10:46:11 +00:00
Dillon-Brown
bd0f554eae Merge remote-tracking branch 'upstream/hotfix' into issue-5360-1
# Conflicts:
#	modules/Users/language/en_us.lang.php
2018-03-22 11:19:10 +00:00
Dillon-Brown
7613994529 LBL_SUGAR_LOGIN 2018-03-22 10:53:27 +00:00
p.ernst
d0b875dab1 Merge branch 'hotfix' of https://github.com/salesagility/SuiteCRM into feature/sort-modules-by-name
# Conflicts:
#	include/MVC/View/SugarView.php
#	modules/Users/Save.php
2018-03-16 14:28:04 +00:00
Daniel Samson
5494578656 Merge remote-tracking branch 'upstream/develop' into merge_develop_feature_gdpr
# Conflicts:
#	modules/Emails/Email.php
#	modules/Emails/EmailUI.php @see SugarWidgetSubPanelEmailLink.php
#	tests/unit/modules/EmailMan/EmailManTest.php
#	tests/unit/modules/Employees/EmployeeTest.php
#	tests/unit/modules/Leads/LeadTest.php
#	tests/unit/modules/Users/UserTest.php
2018-02-05 15:03:19 +00:00
Dillon Brown
caf2e96925 Merge branch 'hotfix' into develop
# Conflicts:
#	include/language/en_us.lang.php
#	modules/AOS_Quotes/controller.php
#	modules/Documents/Document.php
#	modules/Emails/Email.php
#	modules/Emails/EmailUI.php
#	modules/Users/language/en_us.lang.php
#	modules/jjwg_Maps/jjwg_Maps.php
#	suitecrm_version.php
#	themes/SuiteP/css/forms.scss
#	themes/SuiteP/css/style.css
2018-01-26 14:12:07 +00:00
Gyula Madarasz
f253add4cd fixing a disappeared 'Import Campaign' menu item 2018-01-24 10:20:06 +00:00
Dillon Brown
97995dfb1a Fixed footer LBL's 2018-01-22 12:34:32 +00:00
Matt Lorimer
8bf6968276 Update License 2018-01-19 13:22:30 +00:00
Dillon-Brown
6fff9dbcb6 Fixed - Duplicated language strings (7.10-beta-2) 2018-01-19 11:04:25 +00:00
Dillon-Brown
097201a17f
Merge pull request from horus68/patch-5
Removing line breaks in long sentences - Users language file
2018-01-19 02:53:21 -08:00
Dillon Brown
41a33e86b6 Merge branch 'hotfix' into hotfix_merge
# Conflicts:
#	include/Popups/PopupSmarty.php
#	include/SubPanel/SubPanelDefinitions.php
#	include/SugarEmailAddress/SugarEmailAddress.php
#	include/javascript/alerts.js
#	include/language/en_us.lang.php
#	modules/AOR_Reports/tpls/EditViewFooter.tpl
#	modules/InboundEmail/InboundEmail.php
#	modules/ModuleBuilder/parsers/views/AbstractMetaDataImplementation.php
#	modules/ModuleBuilder/parsers/views/UndeployedMetaDataImplementation.php
#	modules/Users/language/en_us.lang.php
#	suitecrm_version.php
#	themes/SuiteP/css/style.css
#	themes/SuiteP/css/suitep-base/listview.scss
2018-01-17 09:59:49 +00:00
p.ernst
b5e44eb9ce Formatting
(cherry picked from commit d0cb7fd)
2018-01-10 14:07:45 +00:00
Horus68
608aa8e209 Update en_us.lang.php 2018-01-10 10:56:06 +00:00
p.ernst
bbb4138579 Add profile setting to choose sorting preference 2017-12-29 12:55:37 +00:00
pgorod
d597cbde50
Update en_us.lang.php 2017-12-20 18:50:39 +00:00
pgorod
7983ee9575
simple label fixes 2017-12-20 18:29:14 +00:00
Horus68
e3cee2e1ea
space added 2017-12-20 16:24:45 +00:00
Horus68
b759b9d5bd
Removing line breaks in long sentences
Removing line breaks in long sentences. A sentence should't have a line break unless its stated with formatting tags.
2017-12-19 11:17:50 +00:00
Daniel Samson
5cb28f3241 Updating theme defs to use string for keys instead of numbers 2017-12-08 10:17:33 +00:00
Daniel Samson
a1fb103bdb Adding theme chooser 2017-12-08 09:42:59 +00:00
Gyula Madarasz
b5b0230f0a theme select per users
(cherry picked from commit bd5987b)
2017-12-08 09:02:04 +00:00
Gyula Madarasz
f7d2a85d42 code cleanup 2017-11-27 15:10:32 +00:00
Gyula Madarasz
5dbc7ca61c validate for SMTP settings before two factor set 2017-11-27 15:05:20 +00:00
Gyula Madarasz
e7b2bda92c code cleanup 2017-11-27 14:05:46 +00:00