Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
655a58a
Merge pull request #65 from GiritInteractive/v1.7.6
Feb 17, 2019
7e98747
Merge pull request #66 from GiritInteractive/CLOUDINARY-74
Feb 17, 2019
64eb9f9
Merge pull request #67 from GiritInteractive/CLOUDINARY-74
Feb 20, 2019
c4f046c
Merge pull request #68 from GiritInteractive/CLOUDINARY-74
Feb 21, 2019
8115f50
Merge pull request #69 from GiritInteractive/CLOUDINARY-74
Feb 26, 2019
2c37cee
Merge pull request #70 from GiritInteractive/CLOUDINARY-74
Feb 26, 2019
dce2c12
Merge pull request #71 from GiritInteractive/CLOUDINARY-74
Feb 26, 2019
e882e94
Merge pull request #72 from GiritInteractive/CLOUDINARY-74
Feb 26, 2019
18f80fa
Merge pull request #73 from GiritInteractive/CLOUDINARY-74
Feb 26, 2019
1aa3495
Merge pull request #74 from GiritInteractive/CLOUDINARY-74
Feb 26, 2019
a5da3e9
Merge pull request #75 from GiritInteractive/CLOUDINARY-74
Feb 26, 2019
6c34264
Merge pull request #76 from GiritInteractive/CLOUDINARY-74
Feb 27, 2019
b8c58af
Merge pull request #77 from GiritInteractive/CLOUDINARY-74
Mar 3, 2019
64e95da
Merge pull request #78 from GiritInteractive/CLOUDINARY-74
Mar 3, 2019
f3e8a04
Merge pull request #79 from GiritInteractive/v1.8.0
Mar 7, 2019
fc8688a
Merge pull request #80 from GiritInteractive/v1.8.0
Mar 14, 2019
c7fbdad
Merge pull request #81 from GiritInteractive/v1.8.0
Mar 14, 2019
7cf9e4d
CLOUDINARY-102: Working on Cloudinary-Product-Gallery implementation …
Mar 13, 2019
ea2ec05
CLOUDINARY-102: Working on Cloudinary-Product-Gallery implementation
Mar 14, 2019
74b7e96
CLOUDINARY-102: Working on Cloudinary-Product-Gallery implementation
Mar 14, 2019
7e33a99
Merge pull request #82 from GiritInteractive/v1.9.0
Mar 14, 2019
1fa0296
CLOUDINARY-102: Working on Cloudinary-Product-Gallery implementation
Mar 14, 2019
1add72f
Merge pull request #83 from GiritInteractive/v1.9.0
Mar 14, 2019
da7117e
CLOUDINARY-102: Working on Cloudinary-Product-Gallery implementation …
Mar 17, 2019
845a287
Merge pull request #84 from GiritInteractive/v1.9.0
Mar 17, 2019
7154d96
CLOUDINARY-102: Working on Cloudinary-Product-Gallery implementation …
Mar 17, 2019
c3bc463
Merge pull request #85 from GiritInteractive/v1.9.0
Mar 17, 2019
7373bcc
CLOUDINARY-102: Working on Cloudinary-Product-Gallery implementation …
Mar 17, 2019
0f67290
Merge pull request #86 from GiritInteractive/v1.9.0
Mar 17, 2019
3d397d1
CLOUDINARY-102: Working on Cloudinary-Product-Gallery implementation …
Mar 17, 2019
6e50c69
Merge pull request #87 from GiritInteractive/v1.9.0
Mar 17, 2019
31318df
CLOUDINARY-102: Working on Cloudinary-Product-Gallery implementation …
Mar 17, 2019
c6215fa
Merge pull request #88 from GiritInteractive/v1.9.0
Mar 17, 2019
17384f4
CLOUDINARY-105,CLOUDINARY-107: Minor content fixes
Mar 17, 2019
6f1e3df
Merge pull request #89 from GiritInteractive/v1.9.0
Mar 17, 2019
b30cea8
Merge pull request #90 from GiritInteractive/v1.8.0
Mar 18, 2019
67dacdd
Merge pull request #91 from GiritInteractive/v1.8.0
Mar 18, 2019
d6f196d
Merge pull request #92 from GiritInteractive/v1.8.0
Mar 18, 2019
99d0541
Merge pull request #93 from GiritInteractive/v1.8.0
Mar 18, 2019
04c90d6
Merge pull request #94 from GiritInteractive/v1.9.0
Mar 18, 2019
50e19e6
Merge pull request #95 from GiritInteractive/v1.9.0
Mar 18, 2019
31297cb
Merge pull request #96 from GiritInteractive/v1.9.0
Mar 20, 2019
0f5c13f
Merge pull request #97 from GiritInteractive/v1.9.0
Apr 1, 2019
14c643c
Merge pull request #98 from GiritInteractive/v1.9.0
Apr 4, 2019
2f75c54
Merge pull request #99 from GiritInteractive/v1.9.0
Apr 4, 2019
f9f6702
Merge pull request #100 from GiritInteractive/v1.9.0
Apr 4, 2019
3d2fc13
Merge pull request #101 from GiritInteractive/v1.9.0
Apr 4, 2019
f6ec4c9
Merge pull request #102 from GiritInteractive/v1.9.0
Apr 10, 2019
3d878cb
Merge pull request #103 from GiritInteractive/v1.9.0
Apr 14, 2019
8683ce7
Merge pull request #104 from GiritInteractive/v1.9.0
Apr 21, 2019
4ea07a3
Merge pull request #105 from GiritInteractive/v1.9.0
Apr 21, 2019
436ed79
Merge pull request #106 from GiritInteractive/v1.9.0
Apr 24, 2019
c01391f
Merge pull request #107 from GiritInteractive/v1.9.0
Apr 24, 2019
ae26cfd
CLOUDINARY-134: Fixed Magento 2.3.1 issue on wysiwyg from GH issue #29
Jul 3, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Model/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public function getCdnSubdomainStatus()
*/
public function getUserPlatform()
{
return sprintf(self::USER_PLATFORM_TEMPLATE, '1.9.0', '2.0.0');
return sprintf(self::USER_PLATFORM_TEMPLATE, '1.9.1', '2.0.0');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "cloudinary/cloudinary-magento2",
"description": "Cloudinary Magento 2 Integration.",
"type": "magento2-module",
"version": "1.9.0",
"version": "1.9.1",
"license": "MIT",
"require": {
"cloudinary/cloudinary_php": "*"
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Cloudinary_Cloudinary" setup_version="1.9.0">
<module name="Cloudinary_Cloudinary" setup_version="1.9.1">
<sequence>
<module name="Magento_ProductVideo"/>
</sequence>
Expand Down
2 changes: 1 addition & 1 deletion marketplace.composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cloudinary/cloudinary",
"type": "magento2-module",
"version": "1.9.0",
"version": "1.9.1",
"description": "Cloudinary Magento 2 Integration.",
"license": "MIT",
"require": {
Expand Down
6 changes: 5 additions & 1 deletion view/adminhtml/layout/cms_wysiwyg_images_index.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
<referenceContainer name="root">
<block class="Cloudinary\Cloudinary\Block\Adminhtml\Cms\Wysiwyg\Images\Content" name="wysiwyg_images.content" template="Cloudinary_Cloudinary::browser/content.phtml">
<block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree" name="wysiwyg_images.tree" template="Magento_Cms::browser/tree.phtml"/>
<block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader" name="wysiwyg_images.uploader" template="Magento_Cms::browser/content/uploader.phtml"/>
<block class="Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader" name="wysiwyg_images.uploader" template="Magento_Cms::browser/content/uploader.phtml">
<arguments>
<argument name="image_upload_config_data" xsi:type="object">Magento\Backend\Block\DataProviders\ImageUploadConfig</argument>
</arguments>
</block>
</block>
</referenceContainer>
</layout>
1 change: 1 addition & 0 deletions view/adminhtml/web/js/cloudinary-media-library-modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ define([
this.cloudinary_ml = window.cloudinary_ml[this.options.cldMLid] = cloudinary.createMediaLibrary(
this.options.cloudinaryMLoptions, {
insertHandler: function(data) {
$('body').first().css('overflow', 'initial');
return widget.cloudinaryInsertHandler(data);
}
}
Expand Down