WordPress.org

Plugin Directory

Changeset 592441


Ignore:
Timestamp:
08/30/12 15:14:27 (20 months ago)
Author:
andy
Message:

jetpack multiuser: merge from trunk

Location:
jetpack/branches/multiuser
Files:
1 deleted
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • jetpack/branches/multiuser

  • jetpack/branches/multiuser/modules/custom-css/csstidy/data-wp.inc.php

    r589031 r592441  
    3030} 
    3131 
     32foreach ( $GLOBALS['csstidy']['multiple_properties'] as $property ) { 
     33    if ( '-' != $property[0] ) { 
     34        $GLOBALS['csstidy']['multiple_properties'][] = '-o-' . $property; 
     35        $GLOBALS['csstidy']['multiple_properties'][] = '-ms-' . $property; 
     36        $GLOBALS['csstidy']['multiple_properties'][] = '-webkit-' . $property; 
     37        $GLOBALS['csstidy']['multiple_properties'][] = '-moz-' . $property; 
     38        $GLOBALS['csstidy']['multiple_properties'][] = '-khtml-' . $property; 
     39    } 
     40} 
     41 
    3242/** 
    3343 * CSS Animation 
     
    4050 
    4151/** 
    42  * Non-standard CSS properties.  They're not part of any spec, but we say  
     52 * Non-standard CSS properties.  They're not part of any spec, but we say 
    4353 * they're in all of them so that we can support them. 
    4454 */ 
     55$GLOBALS['csstidy']['all_properties']['-webkit-filter'] = 'CSS2.0,CSS2.1,CSS3.0'; 
     56$GLOBALS['csstidy']['all_properties']['-moz-filter'] = 'CSS2.0,CSS2.1,CSS3.0'; 
     57$GLOBALS['csstidy']['all_properties']['-ms-filter'] = 'CSS2.0,CSS2.1,CSS3.0'; 
    4558$GLOBALS['csstidy']['all_properties']['filter'] = 'CSS2.0,CSS2.1,CSS3.0'; 
    4659$GLOBALS['csstidy']['all_properties']['scrollbar-face-color'] = 'CSS2.0,CSS2.1,CSS3.0'; 
     
    5265$GLOBALS['csstidy']['all_properties']['-webkit-font-smoothing'] = 'CSS3.0'; 
    5366$GLOBALS['csstidy']['all_properties']['-font-smooth'] = 'CSS3.0'; 
    54 $GLOBALS['csstidy']['all_properties']['font-smoothing'] = 'CSS3.0'; 
     67$GLOBALS['csstidy']['all_properties']['-o-object-fit'] = 'CSS3.0'; 
     68$GLOBALS['csstidy']['all_properties']['object-fit'] = 'CSS3.0'; 
     69$GLOBALS['csstidy']['all_properties']['-o-object-position'] = 'CSS3.0'; 
     70$GLOBALS['csstidy']['all_properties']['object-position'] = 'CSS3.0'; 
     71 
  • jetpack/branches/multiuser/modules/custom-css/csstidy/data.inc.php

    r589031 r592441  
    587587 * @global array $GLOBALS['csstidy']['quoted_string_properties'] 
    588588 */ 
    589 $GLOBALS['csstidy']['multiple_properties'] = array('background', 'background-image'); 
     589$GLOBALS['csstidy']['multiple_properties'] = array('background', 'background-image', 'transition'); 
    590590 
    591591/** 
  • jetpack/branches/multiuser/modules/module-info.php

    r589031 r592441  
    113113        'blip.tv' => 'http://support.wordpress.com/videos/bliptv/', 
    114114        'dailymotion' => 'http://support.wordpress.com/videos/dailymotion/', 
    115         'digg' => 'http://support.wordpress.com/digg/', 
    116115        'flickr' => 'http://support.wordpress.com/videos/flickr-video/', 
    117         'googlevideo' => 'http://support.wordpress.com/videos/google-video/', 
    118116        'scribd' => 'http://support.wordpress.com/scribd/', 
    119         'slide' => 'http://support.wordpress.com/slideshows/slide/', 
    120117        'slideshare' => 'http://support.wordpress.com/slideshows/slideshare/', 
    121118        'soundcloud' => 'http://support.wordpress.com/audio/soundcloud-audio-player/', 
  • jetpack/branches/multiuser/modules/sharedaddy/sharing-sources.php

    r587975 r592441  
    705705                'it_IT' => 100, 
    706706                'ja_JP' => 100, 
     707                'nl_NL' => 130, 
    707708                'ru_RU' => 128, 
    708709            ); 
  • jetpack/branches/multiuser/readme.txt

    r589516 r592441  
    11=== Jetpack by WordPress.com === 
    2 Contributors: automattic, apeatling, beaulebens, hugobaeta, joen, mdawaffe, andy, designsimply, hew, westi, eoigal, tmoorewp, matt, pento 
     2Contributors: automattic, apeatling, beaulebens, hugobaeta, joen, mdawaffe, andy, designsimply, hew, westi, eoigal, tmoorewp, matt, pento, cfinke 
    33Tags: WordPress.com, statistics, stats, views, tweets, twitter, widget, gravatar, hovercards, profile, equations, latex, math, maths, youtube, shortcode, archives, audio, blip, bliptv, dailymotion, digg, flickr, googlevideo, google, googlemaps, kyte, kytetv, livevideo, redlasso, rockyou, rss, scribd, slide, slideshare, soundcloud, vimeo, shortlinks, wp.me, subscriptions 
    44Requires at least: 3.2 
Note: See TracChangeset for help on using the changeset viewer.