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
|
b2a6d655b4
|
Fix zend backwards comparability
|
2019-08-15 16:10:25 +01:00 |
|
Connor Shea
|
0da7a3144a
|
Try moving Zend to Composer.
|
2019-08-01 10:14:41 -06: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
|
6745e82ba0
|
indentation_type
|
2018-07-19 11:46:25 +01:00 |
|
Dillon-Brown
|
5d954f4d61
|
no_trailing_whitespace
|
2018-07-19 11:23:34 +01:00 |
|
Dillon-Brown
|
59d433fc5a
|
lowercase_constants
|
2018-07-17 15:38:41 +01:00 |
|
Matthew
|
8e51b0e900
|
initial commit
|
2013-09-23 20:30:44 +01:00 |
|