archive/salesagility_SuiteCRM
0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-03-13 04:53:21 +00:00
Code Issues Projects Releases Wiki Activity
16250 commits 10 branches 230 tags 252 MiB
Commit graph

54 commits

Author SHA1 Message Date
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
Dillon-Brown
d94fb0c717 Fixed - PHP Fatal error in modules/Connectors/connectors/sources/ext/rest/twitter/config.php PHP version 7.1.31 2019-09-02 17:25:36 +01:00
Dillon-Brown
564c4d01dc Merge remote-tracking branch 'upstream/hotfix-7.10.x' into hotfix_merge_17 
# Conflicts:
#	README.md
#	Zend/Exception.php
#	Zend/Gdata.php
#	Zend/Gdata/App.php
#	Zend/Gdata/App/Base.php
#	Zend/Gdata/App/BaseMediaSource.php
#	Zend/Gdata/App/CaptchaRequiredException.php
#	Zend/Gdata/App/Entry.php
#	Zend/Gdata/App/Extension/Author.php
#	Zend/Gdata/App/Extension/Category.php
#	Zend/Gdata/App/Extension/Content.php
#	Zend/Gdata/App/Extension/Contributor.php
#	Zend/Gdata/App/Extension/Control.php
#	Zend/Gdata/App/Extension/Draft.php
#	Zend/Gdata/App/Extension/Edited.php
#	Zend/Gdata/App/Extension/Element.php
#	Zend/Gdata/App/Extension/Email.php
#	Zend/Gdata/App/Extension/Generator.php
#	Zend/Gdata/App/Extension/Icon.php
#	Zend/Gdata/App/Extension/Id.php
#	Zend/Gdata/App/Extension/Link.php
#	Zend/Gdata/App/Extension/Logo.php
#	Zend/Gdata/App/Extension/Name.php
#	Zend/Gdata/App/Extension/Person.php
#	Zend/Gdata/App/Extension/Published.php
#	Zend/Gdata/App/Extension/Rights.php
#	Zend/Gdata/App/Extension/Source.php
#	Zend/Gdata/App/Extension/Subtitle.php
#	Zend/Gdata/App/Extension/Summary.php
#	Zend/Gdata/App/Extension/Text.php
#	Zend/Gdata/App/Extension/Title.php
#	Zend/Gdata/App/Extension/Updated.php
#	Zend/Gdata/App/Extension/Uri.php
#	Zend/Gdata/App/Feed.php
#	Zend/Gdata/App/FeedEntryParent.php
#	Zend/Gdata/App/FeedSourceParent.php
#	Zend/Gdata/App/HttpException.php
#	Zend/Gdata/App/LoggingHttpClientAdapterSocket.php
#	Zend/Gdata/App/MediaEntry.php
#	Zend/Gdata/App/MediaFileSource.php
#	Zend/Gdata/App/Util.php
#	Zend/Gdata/AuthSub.php
#	Zend/Gdata/Books.php
#	Zend/Gdata/Books/CollectionEntry.php
#	Zend/Gdata/Books/CollectionFeed.php
#	Zend/Gdata/Books/Extension/AnnotationLink.php
#	Zend/Gdata/Books/Extension/BooksCategory.php
#	Zend/Gdata/Books/Extension/BooksLink.php
#	Zend/Gdata/Books/Extension/Embeddability.php
#	Zend/Gdata/Books/Extension/InfoLink.php
#	Zend/Gdata/Books/Extension/PreviewLink.php
#	Zend/Gdata/Books/Extension/Review.php
#	Zend/Gdata/Books/Extension/ThumbnailLink.php
#	Zend/Gdata/Books/Extension/Viewability.php
#	Zend/Gdata/Books/VolumeEntry.php
#	Zend/Gdata/Books/VolumeFeed.php
#	Zend/Gdata/Books/VolumeQuery.php
#	Zend/Gdata/Calendar.php
#	Zend/Gdata/Calendar/EventEntry.php
#	Zend/Gdata/Calendar/EventFeed.php
#	Zend/Gdata/Calendar/EventQuery.php
#	Zend/Gdata/Calendar/Extension/AccessLevel.php
#	Zend/Gdata/Calendar/Extension/Color.php
#	Zend/Gdata/Calendar/Extension/Hidden.php
#	Zend/Gdata/Calendar/Extension/Link.php
#	Zend/Gdata/Calendar/Extension/QuickAdd.php
#	Zend/Gdata/Calendar/Extension/Selected.php
#	Zend/Gdata/Calendar/Extension/SendEventNotifications.php
#	Zend/Gdata/Calendar/Extension/Timezone.php
#	Zend/Gdata/Calendar/Extension/WebContent.php
#	Zend/Gdata/Calendar/ListEntry.php
#	Zend/Gdata/Calendar/ListFeed.php
#	Zend/Gdata/ClientLogin.php
#	Zend/Gdata/Contacts.php
#	Zend/Gdata/Contacts/Extension/Address.php
#	Zend/Gdata/Contacts/Extension/Birthday.php
#	Zend/Gdata/Contacts/Extension/Email.php
#	Zend/Gdata/Contacts/Extension/Name.php
#	Zend/Gdata/Contacts/Extension/Organization.php
#	Zend/Gdata/Contacts/Extension/PhoneNumber.php
#	Zend/Gdata/Contacts/ListEntry.php
#	Zend/Gdata/Docs.php
#	Zend/Gdata/Docs/DocumentListEntry.php
#	Zend/Gdata/Docs/DocumentListFeed.php
#	Zend/Gdata/Docs/Query.php
#	Zend/Gdata/DublinCore.php
#	Zend/Gdata/DublinCore/Extension/Creator.php
#	Zend/Gdata/DublinCore/Extension/Date.php
#	Zend/Gdata/DublinCore/Extension/Description.php
#	Zend/Gdata/DublinCore/Extension/Format.php
#	Zend/Gdata/DublinCore/Extension/Identifier.php
#	Zend/Gdata/DublinCore/Extension/Language.php
#	Zend/Gdata/DublinCore/Extension/Publisher.php
#	Zend/Gdata/DublinCore/Extension/Rights.php
#	Zend/Gdata/DublinCore/Extension/Subject.php
#	Zend/Gdata/DublinCore/Extension/Title.php
#	Zend/Gdata/Entry.php
#	Zend/Gdata/Exif.php
#	Zend/Gdata/Exif/Entry.php
#	Zend/Gdata/Exif/Extension/Distance.php
#	Zend/Gdata/Exif/Extension/Exposure.php
#	Zend/Gdata/Exif/Extension/FStop.php
#	Zend/Gdata/Exif/Extension/Flash.php
#	Zend/Gdata/Exif/Extension/FocalLength.php
#	Zend/Gdata/Exif/Extension/ImageUniqueId.php
#	Zend/Gdata/Exif/Extension/Iso.php
#	Zend/Gdata/Exif/Extension/Make.php
#	Zend/Gdata/Exif/Extension/Model.php
#	Zend/Gdata/Exif/Extension/Tags.php
#	Zend/Gdata/Exif/Extension/Time.php
#	Zend/Gdata/Exif/Feed.php
#	Zend/Gdata/Extension.php
#	Zend/Gdata/Extension/AttendeeStatus.php
#	Zend/Gdata/Extension/AttendeeType.php
#	Zend/Gdata/Extension/Comments.php
#	Zend/Gdata/Extension/EntryLink.php
#	Zend/Gdata/Extension/EventStatus.php
#	Zend/Gdata/Extension/ExtendedProperty.php
#	Zend/Gdata/Extension/FeedLink.php
#	Zend/Gdata/Extension/OpenSearchItemsPerPage.php
#	Zend/Gdata/Extension/OpenSearchStartIndex.php
#	Zend/Gdata/Extension/OpenSearchTotalResults.php
#	Zend/Gdata/Extension/OriginalEvent.php
#	Zend/Gdata/Extension/Rating.php
#	Zend/Gdata/Extension/Recurrence.php
#	Zend/Gdata/Extension/RecurrenceException.php
#	Zend/Gdata/Extension/Reminder.php
#	Zend/Gdata/Extension/Transparency.php
#	Zend/Gdata/Extension/Visibility.php
#	Zend/Gdata/Extension/When.php
#	Zend/Gdata/Extension/Where.php
#	Zend/Gdata/Extension/Who.php
#	Zend/Gdata/Feed.php
#	Zend/Gdata/Gapps.php
#	Zend/Gdata/Gapps/EmailListEntry.php
#	Zend/Gdata/Gapps/EmailListFeed.php
#	Zend/Gdata/Gapps/EmailListQuery.php
#	Zend/Gdata/Gapps/EmailListRecipientEntry.php
#	Zend/Gdata/Gapps/EmailListRecipientFeed.php
#	Zend/Gdata/Gapps/EmailListRecipientQuery.php
#	Zend/Gdata/Gapps/Error.php
#	Zend/Gdata/Gapps/Extension/EmailList.php
#	Zend/Gdata/Gapps/Extension/Login.php
#	Zend/Gdata/Gapps/Extension/Name.php
#	Zend/Gdata/Gapps/Extension/Nickname.php
#	Zend/Gdata/Gapps/Extension/Property.php
#	Zend/Gdata/Gapps/Extension/Quota.php
#	Zend/Gdata/Gapps/GroupEntry.php
#	Zend/Gdata/Gapps/GroupFeed.php
#	Zend/Gdata/Gapps/GroupQuery.php
#	Zend/Gdata/Gapps/MemberEntry.php
#	Zend/Gdata/Gapps/MemberFeed.php
#	Zend/Gdata/Gapps/MemberQuery.php
#	Zend/Gdata/Gapps/NicknameEntry.php
#	Zend/Gdata/Gapps/NicknameFeed.php
#	Zend/Gdata/Gapps/NicknameQuery.php
#	Zend/Gdata/Gapps/OwnerEntry.php
#	Zend/Gdata/Gapps/OwnerFeed.php
#	Zend/Gdata/Gapps/OwnerQuery.php
#	Zend/Gdata/Gapps/Query.php
#	Zend/Gdata/Gapps/ServiceException.php
#	Zend/Gdata/Gapps/UserEntry.php
#	Zend/Gdata/Gapps/UserFeed.php
#	Zend/Gdata/Gapps/UserQuery.php
#	Zend/Gdata/Gbase.php
#	Zend/Gdata/Gbase/Entry.php
#	Zend/Gdata/Gbase/Extension/BaseAttribute.php
#	Zend/Gdata/Gbase/ItemEntry.php
#	Zend/Gdata/Gbase/ItemQuery.php
#	Zend/Gdata/Gbase/Query.php
#	Zend/Gdata/Gbase/SnippetQuery.php
#	Zend/Gdata/Geo.php
#	Zend/Gdata/Geo/Entry.php
#	Zend/Gdata/Geo/Extension/GeoRssWhere.php
#	Zend/Gdata/Geo/Extension/GmlPoint.php
#	Zend/Gdata/Geo/Extension/GmlPos.php
#	Zend/Gdata/Geo/Feed.php
#	Zend/Gdata/Health.php
#	Zend/Gdata/Health/ProfileEntry.php
#	Zend/Gdata/Health/ProfileListEntry.php
#	Zend/Gdata/Health/Query.php
#	Zend/Gdata/HttpAdapterStreamingProxy.php
#	Zend/Gdata/HttpAdapterStreamingSocket.php
#	Zend/Gdata/HttpClient.php
#	Zend/Gdata/Kind/EventEntry.php
#	Zend/Gdata/Media.php
#	Zend/Gdata/Media/Entry.php
#	Zend/Gdata/Media/Extension/MediaCategory.php
#	Zend/Gdata/Media/Extension/MediaContent.php
#	Zend/Gdata/Media/Extension/MediaCopyright.php
#	Zend/Gdata/Media/Extension/MediaCredit.php
#	Zend/Gdata/Media/Extension/MediaDescription.php
#	Zend/Gdata/Media/Extension/MediaGroup.php
#	Zend/Gdata/Media/Extension/MediaHash.php
#	Zend/Gdata/Media/Extension/MediaKeywords.php
#	Zend/Gdata/Media/Extension/MediaPlayer.php
#	Zend/Gdata/Media/Extension/MediaRating.php
#	Zend/Gdata/Media/Extension/MediaRestriction.php
#	Zend/Gdata/Media/Extension/MediaText.php
#	Zend/Gdata/Media/Extension/MediaThumbnail.php
#	Zend/Gdata/Media/Extension/MediaTitle.php
#	Zend/Gdata/Media/Feed.php
#	Zend/Gdata/MediaMimeStream.php
#	Zend/Gdata/MimeBodyString.php
#	Zend/Gdata/MimeFile.php
#	Zend/Gdata/Photos.php
#	Zend/Gdata/Photos/AlbumEntry.php
#	Zend/Gdata/Photos/AlbumFeed.php
#	Zend/Gdata/Photos/AlbumQuery.php
#	Zend/Gdata/Photos/CommentEntry.php
#	Zend/Gdata/Photos/Extension/Access.php
#	Zend/Gdata/Photos/Extension/AlbumId.php
#	Zend/Gdata/Photos/Extension/BytesUsed.php
#	Zend/Gdata/Photos/Extension/Checksum.php
#	Zend/Gdata/Photos/Extension/Client.php
#	Zend/Gdata/Photos/Extension/CommentCount.php
#	Zend/Gdata/Photos/Extension/CommentingEnabled.php
#	Zend/Gdata/Photos/Extension/Height.php
#	Zend/Gdata/Photos/Extension/Id.php
#	Zend/Gdata/Photos/Extension/Location.php
#	Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php
#	Zend/Gdata/Photos/Extension/Name.php
#	Zend/Gdata/Photos/Extension/Nickname.php
#	Zend/Gdata/Photos/Extension/NumPhotos.php
#	Zend/Gdata/Photos/Extension/NumPhotosRemaining.php
#	Zend/Gdata/Photos/Extension/PhotoId.php
#	Zend/Gdata/Photos/Extension/Position.php
#	Zend/Gdata/Photos/Extension/QuotaCurrent.php
#	Zend/Gdata/Photos/Extension/QuotaLimit.php
#	Zend/Gdata/Photos/Extension/Rotation.php
#	Zend/Gdata/Photos/Extension/Size.php
#	Zend/Gdata/Photos/Extension/Thumbnail.php
#	Zend/Gdata/Photos/Extension/Timestamp.php
#	Zend/Gdata/Photos/Extension/User.php
#	Zend/Gdata/Photos/Extension/Version.php
#	Zend/Gdata/Photos/Extension/Weight.php
#	Zend/Gdata/Photos/Extension/Width.php
#	Zend/Gdata/Photos/PhotoEntry.php
#	Zend/Gdata/Photos/PhotoFeed.php
#	Zend/Gdata/Photos/PhotoQuery.php
#	Zend/Gdata/Photos/TagEntry.php
#	Zend/Gdata/Photos/UserEntry.php
#	Zend/Gdata/Photos/UserFeed.php
#	Zend/Gdata/Photos/UserQuery.php
#	Zend/Gdata/Query.php
#	Zend/Gdata/Spreadsheets.php
#	Zend/Gdata/Spreadsheets/CellEntry.php
#	Zend/Gdata/Spreadsheets/CellFeed.php
#	Zend/Gdata/Spreadsheets/CellQuery.php
#	Zend/Gdata/Spreadsheets/DocumentQuery.php
#	Zend/Gdata/Spreadsheets/Extension/Cell.php
#	Zend/Gdata/Spreadsheets/Extension/ColCount.php
#	Zend/Gdata/Spreadsheets/Extension/Custom.php
#	Zend/Gdata/Spreadsheets/Extension/RowCount.php
#	Zend/Gdata/Spreadsheets/ListEntry.php
#	Zend/Gdata/Spreadsheets/ListFeed.php
#	Zend/Gdata/Spreadsheets/ListQuery.php
#	Zend/Gdata/Spreadsheets/SpreadsheetEntry.php
#	Zend/Gdata/Spreadsheets/SpreadsheetFeed.php
#	Zend/Gdata/Spreadsheets/WorksheetEntry.php
#	Zend/Gdata/Spreadsheets/WorksheetFeed.php
#	Zend/Gdata/YouTube.php
#	Zend/Gdata/YouTube/ActivityEntry.php
#	Zend/Gdata/YouTube/ActivityFeed.php
#	Zend/Gdata/YouTube/CommentEntry.php
#	Zend/Gdata/YouTube/CommentFeed.php
#	Zend/Gdata/YouTube/ContactEntry.php
#	Zend/Gdata/YouTube/ContactFeed.php
#	Zend/Gdata/YouTube/Extension/AboutMe.php
#	Zend/Gdata/YouTube/Extension/Age.php
#	Zend/Gdata/YouTube/Extension/Books.php
#	Zend/Gdata/YouTube/Extension/Company.php
#	Zend/Gdata/YouTube/Extension/Control.php
#	Zend/Gdata/YouTube/Extension/CountHint.php
#	Zend/Gdata/YouTube/Extension/Description.php
#	Zend/Gdata/YouTube/Extension/Duration.php
#	Zend/Gdata/YouTube/Extension/FirstName.php
#	Zend/Gdata/YouTube/Extension/Gender.php
#	Zend/Gdata/YouTube/Extension/Hobbies.php
#	Zend/Gdata/YouTube/Extension/Hometown.php
#	Zend/Gdata/YouTube/Extension/LastName.php
#	Zend/Gdata/YouTube/Extension/Link.php
#	Zend/Gdata/YouTube/Extension/Location.php
#	Zend/Gdata/YouTube/Extension/MediaContent.php
#	Zend/Gdata/YouTube/Extension/MediaCredit.php
#	Zend/Gdata/YouTube/Extension/MediaGroup.php
#	Zend/Gdata/YouTube/Extension/MediaRating.php
#	Zend/Gdata/YouTube/Extension/Movies.php
#	Zend/Gdata/YouTube/Extension/Music.php
#	Zend/Gdata/YouTube/Extension/NoEmbed.php
#	Zend/Gdata/YouTube/Extension/Occupation.php
#	Zend/Gdata/YouTube/Extension/PlaylistId.php
#	Zend/Gdata/YouTube/Extension/PlaylistTitle.php
#	Zend/Gdata/YouTube/Extension/Position.php
#	Zend/Gdata/YouTube/Extension/Private.php
#	Zend/Gdata/YouTube/Extension/QueryString.php
#	Zend/Gdata/YouTube/Extension/Racy.php
#	Zend/Gdata/YouTube/Extension/Recorded.php
#	Zend/Gdata/YouTube/Extension/Relationship.php
#	Zend/Gdata/YouTube/Extension/ReleaseDate.php
#	Zend/Gdata/YouTube/Extension/School.php
#	Zend/Gdata/YouTube/Extension/State.php
#	Zend/Gdata/YouTube/Extension/Statistics.php
#	Zend/Gdata/YouTube/Extension/Status.php
#	Zend/Gdata/YouTube/Extension/Token.php
#	Zend/Gdata/YouTube/Extension/Uploaded.php
#	Zend/Gdata/YouTube/Extension/Username.php
#	Zend/Gdata/YouTube/Extension/VideoId.php
#	Zend/Gdata/YouTube/InboxEntry.php
#	Zend/Gdata/YouTube/InboxFeed.php
#	Zend/Gdata/YouTube/MediaEntry.php
#	Zend/Gdata/YouTube/PlaylistListEntry.php
#	Zend/Gdata/YouTube/PlaylistListFeed.php
#	Zend/Gdata/YouTube/PlaylistVideoEntry.php
#	Zend/Gdata/YouTube/PlaylistVideoFeed.php
#	Zend/Gdata/YouTube/SubscriptionEntry.php
#	Zend/Gdata/YouTube/SubscriptionFeed.php
#	Zend/Gdata/YouTube/UserProfileEntry.php
#	Zend/Gdata/YouTube/VideoEntry.php
#	Zend/Gdata/YouTube/VideoFeed.php
#	Zend/Gdata/YouTube/VideoQuery.php
#	Zend/Http/Client.php
#	Zend/Http/Client/Adapter/Curl.php
#	Zend/Http/Client/Adapter/Proxy.php
#	Zend/Http/Client/Adapter/Socket.php
#	Zend/Http/Client/Adapter/Stream.php
#	Zend/Http/Client/Adapter/Test.php
#	Zend/Http/Client/Exception.php
#	Zend/Http/Exception.php
#	Zend/Http/Response.php
#	Zend/Http/Response/Stream.php
#	Zend/Loader.php
#	Zend/Oauth/Client.php
#	Zend/Oauth/Config.php
#	Zend/Oauth/Consumer.php
#	Zend/Oauth/Exception.php
#	Zend/Oauth/Http.php
#	Zend/Oauth/Http/AccessToken.php
#	Zend/Oauth/Http/RequestToken.php
#	Zend/Oauth/Http/Utility.php
#	Zend/Oauth/Provider.php
#	Zend/Oauth/Signature/Hmac.php
#	Zend/Oauth/Signature/Plaintext.php
#	Zend/Oauth/Signature/Rsa.php
#	Zend/Oauth/Signature/SignatureAbstract.php
#	Zend/Oauth/Token.php
#	Zend/Oauth/Token/Access.php
#	Zend/Oauth/Token/AuthorizedRequest.php
#	Zend/Registry.php
#	Zend/Uri.php
#	Zend/Uri/Http.php
#	Zend/Validate/Abstract.php
#	Zend/Validate/Hostname.php
#	Zend/Validate/Hostname/Com.php
#	Zend/Validate/Ip.php
#	composer.json
#	composer.lock
#	files.md5
#	include/InlineEditing/inlineEditing.js
#	include/Smarty/Config_File.class.php
#	include/Smarty/internals/core.assemble_plugin_filepath.php
#	include/Smarty/internals/core.assign_smarty_interface.php
#	include/Smarty/internals/core.create_dir_structure.php
#	include/Smarty/internals/core.display_debug_console.php
#	include/Smarty/internals/core.get_include_path.php
#	include/Smarty/internals/core.get_microtime.php
#	include/Smarty/internals/core.is_secure.php
#	include/Smarty/internals/core.load_plugins.php
#	include/Smarty/internals/core.load_resource_plugin.php
#	include/Smarty/internals/core.rm_auto.php
#	include/Smarty/internals/core.rmdir.php
#	include/Smarty/internals/core.run_insert_handler.php
#	include/Smarty/internals/core.smarty_include_php.php
#	include/Smarty/internals/core.write_compiled_resource.php
#	include/Smarty/internals/core.write_file.php
#	include/SugarCharts/SugarChartFactory.php
#	include/SugarOAuthServer.php
#	include/Sugar_Smarty.php
#	modules/Users/User.php
#	suitecrm_version.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-08-21 03:25:39 +00:00
Dillon-Brown
40c6647dba Optimise images 2019-07-26 11:06:12 +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
a11f2aea67 no_trailing_whitespace + no_trailing_whitespace_in_comment 2019-01-25 14:24:15 +00:00
Dillon-Brown
2d243d3c9f no_spaces_after_function_name + no_spaces_inside_parenthesis 2019-01-25 14:22:15 +00:00
Dillon-Brown
26fc406b5e method_argument_space 2019-01-25 14:14:52 +00:00
Dillon-Brown
c4941aa5ed function_declaration 2019-01-25 14:04:38 +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
c1e486d675 fix part 1 
fixing typos
 2018-08-02 18:33:00 +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
5d954f4d61 no_trailing_whitespace 2018-07-19 11:23:34 +01:00
Dillon-Brown
cf4b6aa9f3 no_spaces_after_function_name 2018-07-19 11:16:55 +01:00
Dillon-Brown
32ca35db09 method_argument_space 2018-07-16 16:17:49 +01:00
Dillon-Brown
6caa071e62 no_spaces_inside_parenthesis 2018-07-12 15:44:45 +01:00
Dillon-Brown
68f69400bc braces 2018-07-12 11:40:27 +01:00
Dillon-Brown
4775b14953 function_declaration 2018-07-12 11:20:31 +01:00
Daniel Samson
3dcd0c8b42
Merge pull request from Dillon-Brown/psr-2-2 
PSR2 - elseif
 2018-07-10 11:42:15 +01:00
Dillon-Brown
510c4549ff PSR2 - elseif 2018-06-21 21:22:45 +01:00
Dillon-Brown
835a46058a PSR2 - class_definition 2018-06-21 21:05:18 +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
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
eba5ce7913 Removed PHP closing tag 2017-10-07 00:06:08 +00:00
Dillon Brown
af3f8a8b7e Fixed - Language files - PR for code re-format only 2017-08-28 13:18:10 +01:00
Dillon-Brown
29ce8ed5bf Fixed - Unused language strings - Part 2 (insideview) 2017-07-23 18:50:03 +00:00
Dillon-Brown
4b48d4b394 Merge branch 'hotfix' into combined_language_file_update_1 2017-07-13 13:07:21 +01:00
Dillon Brown
e6b46ca271 Updated license and entry points (modules/Connectors/connectors/sources/ext/rest) 2017-05-09 16:19:53 +01:00
Dillon Brown
9485210b61 Updated all language file license's and entry points. 2017-05-08 15:11:17 +01:00
Gyula Madarasz
c95baa65f3 Fix for SQ issue (ref: AVaef9CU6a8oOfyEoiFH) 2017-03-01 12:08:17 +00:00
Matthew
d0c4910bfb Merge branch 'develop' into nmcustom 
Conflicts:
	include/generic/SugarWidgets/SugarWidgetSubPanelDelegatesSelectButton.php
	modules/jjwg_Maps/language/es_es.lang.php
 2016-01-17 15:10:25 +00:00
Matthew
4c9ecacca6 remove es_es lang from default 2016-01-17 15:08:26 +00:00
Matthew
62297a49e3 remove connectors from custom 2016-01-17 13:18:44 +00:00
Gyula Madarasz
87c557bb63 Strict standards: Accessing static property ext_rest_insideview:: as non static 2015-12-15 11:25:56 +00:00
Matthew
9e412507e0 Removed redundant legacy language files 2015-11-18 14:40:10 +00:00
Horus68
ff93f6af7f Twitter connector typo 
Twitter not Facebook!
 2015-11-02 17:56:53 +00:00
Jim Mackin
3b8a63926f Remove the deprecated linkedin code. 2015-08-24 15:18:44 +01:00
Matthew
02d50560c1 upgraded to sugarcrm 6.5.18 2014-09-24 14:03:12 +01:00
Matthew
b533ad20e5 Updated Script header 2014-07-07 16:33:41 +01:00
Matthew
37591e8504 Fixed twitter/facebook connector defaults 2014-07-04 11:05:59 +01:00
Matthew
1edd21afb6 Merge branch 'develop' of https://github.com/likhobory/SuiteCRM into likhobory-develop 
Conflicts:
	custom/application/Ext/Language/ru_ru.lang.ext.php
 2014-03-31 11:40:01 +01:00
Lewis Jessett
89ec09bdc9 Initial Commit of Twitter and Facebook integration 2014-01-20 12:16:18 +00:00