Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
9b58dbf
Merge pull request #52 from cloudinary/master
Apr 2, 2020
31423e8
Merge pull request #56 from cloudinary/master
Apr 9, 2020
8dc11b9
Ensure 100% width for videos.
Apr 9, 2020
e6fb492
Merge pull request #58 from cloudinary/bug/cut-video
Apr 14, 2020
8f9c58a
Add check to see whether transformation is already applied
Apr 14, 2020
2359228
Simplify cache rebuild based on version update.
DavidCramer Apr 15, 2020
b072e06
add actual sync_key to uploaded items as well as down synced.
DavidCramer Apr 15, 2020
a7459d2
add video front-end style overrides
DavidCramer Apr 15, 2020
ef5785d
update readme for 5.4 support
DavidCramer Apr 15, 2020
3552218
remove green check
DavidCramer Apr 15, 2020
f88cb82
Merge pull request #60 from cloudinary/bug/duplicate-transformation-s…
Apr 15, 2020
a0e3b74
Merge pull request #61 from cloudinary/fix/CLOUD-384
Apr 15, 2020
97901ee
Merge pull request #63 from cloudinary/feature/CLOUD-382
Apr 15, 2020
4f93499
Merge pull request #64 from cloudinary/feature/CLOUD-367
Apr 15, 2020
c67a737
merge develop
DavidCramer Apr 15, 2020
5125df6
Merge pull request #62 from cloudinary/fix/CLOUD-376
Apr 15, 2020
13437da
Merge pull request #65 from cloudinary/develop
Apr 15, 2020
9f8fc74
Improve regex on connection URL
Apr 15, 2020
78ad070
Merge pull request #66 from cloudinary/feature/flexible-cloudinary-urls
Apr 16, 2020
665030c
revert static scripts enqueue
DavidCramer Apr 16, 2020
e9ce412
Merge pull request #67 from cloudinary/fix/static-function-revert
Apr 16, 2020
ed4e1e7
bump version
DavidCramer Apr 16, 2020
51a7df5
Merge pull request #68 from cloudinary/develop
Apr 16, 2020
66606b2
remove video.js
DavidCramer Apr 16, 2020
c1f9c7c
Merge pull request #69 from cloudinary/develop
Apr 16, 2020
eddcbae
add sync state styles
DavidCramer Apr 20, 2020
3baa03f
make default colum status as not synced
DavidCramer Apr 20, 2020
adc6af1
switch message based on sync state and add additional setting
DavidCramer Apr 20, 2020
743d2be
add new bulk and inline actions
DavidCramer Apr 20, 2020
a6e68b6
Adjust the texts in the sync settings page
Apr 20, 2020
0306d4a
add fluid class for responsive videos
DavidCramer Apr 21, 2020
59d18c1
Merge pull request #71 from cloudinary/fix/change-texts
Apr 21, 2020
13498ab
Merge pull request #72 from cloudinary/fix/CLOUD-372
Apr 21, 2020
a19b48a
Add breakpoint flag to convert_url()
Apr 23, 2020
7c33833
Fix typo
Apr 23, 2020
826ad0f
Merge pull request #74 from cloudinary/fix/change-texts
Apr 23, 2020
2d3bb27
Allow initial/primary URL to be changed on request.
DavidCramer Apr 24, 2020
2fc172d
correctly name to
DavidCramer Apr 24, 2020
c010866
merge develop
DavidCramer Apr 24, 2020
31e5857
clean up formatting
DavidCramer Apr 24, 2020
5f86637
clean up standards
DavidCramer Apr 24, 2020
6759ccc
set auto-upload off if upgrading from v1
DavidCramer Apr 24, 2020
86a6e62
remove old video config
DavidCramer Apr 24, 2020
a20b31e
add styles and rebuild assets
DavidCramer Apr 24, 2020
3d5fc9f
Bypass updating the attachment URL on admin
Apr 24, 2020
bbb6fba
add notice handling and ui on dashboard.
DavidCramer Apr 24, 2020
63224dd
Set default for enabled_breakpoints setting
Apr 24, 2020
9131d93
Confirm that $intermediate is an array
Apr 24, 2020
e4a6f6a
Initialize variable
Apr 24, 2020
687d3f3
improve consistancey on meta and allow switching between account types
DavidCramer Apr 25, 2020
5526d0e
clean up video js error
DavidCramer Apr 25, 2020
7117bf1
Merge pull request #77 from cloudinary/feature/CLOUD-389
Apr 25, 2020
dcd865e
Merge pull request #73 from cloudinary/feature/CLOUD-388
Apr 25, 2020
fc18114
Merge pull request #70 from cloudinary/feature/CLOUD-339
Apr 26, 2020
93f7dcd
update version
DavidCramer Apr 27, 2020
1af074a
Merge pull request #78 from cloudinary/develop
Apr 27, 2020
24abd9c
Prevent warnings when variable type does not match the expectation
Apr 30, 2020
a81fcf5
Merge pull request #80 from cloudinary/fix/CLOUD-376
May 4, 2020
a0970dc
merge develop to UAT
DavidCramer May 5, 2020
78bc23e
version bump
DavidCramer May 5, 2020
9fb654f
merge develop
DavidCramer May 5, 2020
0cfbe84
make method to get stat value.
DavidCramer May 8, 2020
bfa187f
merge develop
DavidCramer May 8, 2020
20399d2
Fix a if condition that could stop a listing page. See CLOUD 409.
May 13, 2020
547645e
Replace the bulk sync status feedback script
May 14, 2020
e41b014
Improve consistency
May 14, 2020
c79963d
Add running flag to the REST response
May 14, 2020
c9d6735
Add loading icon
May 14, 2020
f06bcea
Replace the out of status by the simple syncing icon
May 14, 2020
f696a04
update texts and remove forced reload.
DavidCramer May 19, 2020
068f235
Merge pull request #76 from cloudinary/feature/CLOUD-396
May 19, 2020
5760d7b
Update loading url
May 19, 2020
397ee44
Check vars before use them
May 26, 2020
1fe6402
Try to set SVGs size
May 26, 2020
6572de6
Move the queue resume to the shutdown
May 26, 2020
7b3d9f7
Add a fallback cron job that ensures that the queue is resumed
May 26, 2020
1a9d9fd
Use constants for better readability
May 27, 2020
24990f4
Check if the queue is running
May 27, 2020
60af7ff
Merge pull request #87 from cloudinary/fix/CLOUD-425
May 29, 2020
3efb566
merge dev
DavidCramer May 29, 2020
1599f75
Merge pull request #88 from cloudinary/fix/CLOUD-403
May 29, 2020
ca778f0
Merge pull request #85 from cloudinary/feature/CLOUD-408
May 29, 2020
6753876
Merge pull request #83 from cloudinary/fix/CLOUD-409
May 29, 2020
c5ca3d5
Merge pull request #90 from cloudinary/develop
May 29, 2020
1ea3f83
bump version
DavidCramer May 29, 2020
0e0bded
typo on size key
DavidCramer May 31, 2020
7d5663b
bump version
DavidCramer May 31, 2020
498fe93
if size not found, get basic full
DavidCramer May 31, 2020
5024210
bump version
DavidCramer Jun 1, 2020
690d3fe
fix missed typo
DavidCramer Jun 1, 2020
b4cb1fc
remove debug test code
DavidCramer Jun 1, 2020
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Cloudinary
* Plugin URI: https://cloudinary.com/documentation/wordpress_integration
* Description: With the Cloudinary plugin, you can upload and manage your media assets in the cloud, then deliver them to your users through a fast content delivery network, improving your website’s loading speed and overall user experience. Apply multiple transformations and take advantage of a full digital asset management solution without leaving WordPress.
* Version: 2.0.3
* Version: 2.1.1
* Author: Cloudinary Ltd., XWP
* Author URI: https://cloudinary.com/
* License: GPLv2+
Expand Down

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,95 +1,109 @@
@font-face {
font-family: 'cloudinary';
src: url('fonts/cloudinary.eot?fj77m5');
src: url('fonts/cloudinary.eot?fj77m5#iefix') format('embedded-opentype'),
font-family : 'cloudinary';
src : url('fonts/cloudinary.eot?fj77m5');
src : url('fonts/cloudinary.eot?fj77m5#iefix') format('embedded-opentype'),
url('fonts/cloudinary.ttf?fj77m5') format('truetype'),
url('fonts/cloudinary.woff?fj77m5') format('woff'),
url('fonts/cloudinary.svg?fj77m5#cloudinary') format('svg');
font-weight: normal;
font-style: normal;
font-weight : normal;
font-style : normal;
}

.dashicons {
&-cloudinary {
/* use !important to prevent issues with browser extensions that change fonts */
speak: none;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
speak : none;
font-style : normal;
font-weight : normal;
font-variant : normal;
text-transform : none;
line-height : 1;

/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing : antialiased;
-moz-osx-font-smoothing : grayscale;

&:before {
font-family: 'cloudinary' !important;
content: '\e900';
font-family : 'cloudinary' !important;
content : '\e900';
}

&.success {
color: $color-green;
color : $color-green;
}

&.error {
color: $color-red;
color : $color-red;

&:before {
content: '\e901';
content : '\e901';
}
}

&.warning {
color: $color-orange;
color : $color-orange;

&:before {
content: '\e902';
content : '\e902';
}
}

&.warning {
color: $color-orange;
color : $color-orange;
}

&.warning {
color: $color-orange;
color : $color-orange;
}
}
}

.column-cld_status {
width: 5.5em;
width : 5.5em;

.dashicons {
&-cloudinary {
display: inline-block;
display : inline-block;

&:before {
font-size: 1.8rem;
font-size : 1.8rem;
}
}
}
}

.form-field, .form-table {
.error-notice {
display: none;
color: $color-red;
display : none;
color : $color-red;
}

input.cld-field:invalid {
border-color: $color-red;
border-color : $color-red;

+ .error-notice {
display: inline-block;
display : inline-block;
}
}
}

.cloudinary-welcome {
background-image: url("logo.svg");
background-repeat: no-repeat;
background-size: 153px;
background-position: top 12px right 20px;
.cloudinary {
&-welcome {
background-image : url("logo.svg");
background-repeat : no-repeat;
background-size : 153px;
background-position : top 12px right 20px;
}
&-stats{
display: inline-block;
margin-left: 25px;
}
&-stat{
cursor: help;
}
&-percent {
font-size : 0.8em;
vertical-align : top;
color : $color-blue;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,19 @@
max-width : 300px;
display : none;
}

&-status {
&-disabled {
color : $color-red;
}

&-enabled {
color : $color-green;
}

&-button.button {
vertical-align : baseline;
}
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Frontend video styles.
.cld {
&-video {
&-player {
max-width: 100%;
}
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.cld-video-player{max-width:100%}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
let field = $(this),
value = field.val();

let reg = new RegExp(/^(cloudinary:\/\/){1}(\d)*[:]{1}[^:@]*[@]{1}[^@]*$/g );
let reg = new RegExp(/^(?:CLOUDINARY_URL=)?(cloudinary:\/\/){1}(\d)*[:]{1}[^:@]*[@]{1}[^@]*$/g );
if( reg.test( value ) ){
field.addClass( 'settings-valid-field' );
field.removeClass( 'settings-invalid-field' );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ const Sync = {
progress: document.getElementById( 'progress-wrapper' ),
submitButton: document.getElementById( 'submit' ),
stopButton: document.getElementById( 'stop-sync' ),
progressCount: document.getElementById( 'sync-progress' ),
barSyncCount: document.getElementById( 'sync-total' ),
completed: document.getElementById( 'completed-notice' ),
show: 'inline-block',
hide: 'none',
isRunning: false,
getStatus: function getStatus() {
var self = this,
resourceType = [],
Expand All @@ -22,8 +21,9 @@ const Sync = {
request.setRequestHeader( 'X-WP-Nonce', cloudinaryApi.nonce );
},
} ).done( function( data ) {
if ( data.done < data.total ) {
setTimeout( Sync.getStatus, 2000 );
Sync.isRunning = data.is_running;
if ( Sync.isRunning ) {
setTimeout( Sync.getStatus, 10000 );
}
Sync._updateUI( data );
} );
Expand All @@ -32,6 +32,8 @@ const Sync = {
var self = this,
url = cloudinaryApi.restUrl + 'cloudinary/v1/sync';

Sync.isRunning = false;

wp.ajax.send( {
url: url,
data: {
Expand All @@ -48,11 +50,16 @@ const Sync = {
var self = this,
url = cloudinaryApi.restUrl + 'cloudinary/v1/sync';

Sync.isRunning = true;
Sync.progress.style.display = Sync.show;

wp.ajax.send( {
url: url,
beforeSend: function( request ) {
request.setRequestHeader( 'X-WP-Nonce', cloudinaryApi.nonce );
},
} ).done( function ( data ) {
setTimeout( Sync.getStatus, 10000 );
} );
},
_updateUI: function _updateUI( data ) {
Expand All @@ -75,13 +82,14 @@ const Sync = {
this.stopButton.style.display = this.hide;
}

if ( data.percent < 100 ) {
this.barSyncCount.innerText = data.total;
this.progressCount.innerText = data.done;
if ( data.percent === 100 ) {
this.completed.style.display = this.show;
}

if ( this.isRunning ) {
this.progress.style.display = this.show;
}
else {
this.completed.style.display = this.show;
this.progress.style.display = this.hide;
}
},
Expand Down
Loading