Merge pull request #1 from Automattic/master

Sync with upstream

.gitignore

@@ -1 +1,3 @@
 /vendor/
+.DS_Store
+.sass-cache

.svnignore

@@ -0,0 +1,8 @@
+.git/
+.gitignore
+.travis.yml
+readme.md
+tests/
+_inc/lib/icalendar-reader.php
+modules/shortcodes/upcoming-events.php
+modules/widgets/upcoming-events.php

.travis.yml

@@ -3,38 +3,54 @@
 # Tell Travis CI we're using PHP
 language: php
 
-# Versions of PHP to test against
+# PHP version used in first build configuration.
 php:
-    - "5.2"
-    - "5.3"
-    - "5.4"
+    - "5.5"
 
-# Specify versions of WordPress to test against
-# WP_VERSION = WordPress version number (use "master" for SVN trunk)
-# WP_MULTISITE = whether to test multisite (use either "0" or "1")
+# WordPress version used in first build configuration.
 env:
-    - WP_VERSION=master WP_MULTISITE=0
-    - WP_VERSION=3.6 WP_MULTISITE=0
-    - WP_VERSION=3.5.2 WP_MULTISITE=0
-#    - WP_VERSION=3.4.2 WP_MULTISITE=0
-#    - WP_VERSION=3.3.3 WP_MULTISITE=0
-#    - WP_VERSION=3.2.1 WP_MULTISITE=0 
-    - WP_VERSION=master WP_MULTISITE=1
-    - WP_VERSION=3.6 WP_MULTISITE=1
-    - WP_VERSION=3.5.2 WP_MULTISITE=1
-#    - WP_VERSION=3.4.2 WP_MULTISITE=1
-#    - WP_VERSION=3.3.3 WP_MULTISITE=1 
-#    - WP_VERSION=3.2.1 WP_MULTISITE=1
-
-# Grab the setup script and execute
+    - WP_VERSION=master
+
+# Next we define our matrix of additional build configurations to test against.
+# The versions listed above will automatically create our first configuration,
+# so it doesn't need to be re-defined below.
+
+# WP_VERSION specifies the tag to use. The way these tests are configured to run
+# requires at least WordPress 3.8. Specify "master" to test against SVN trunk.
+
+# Note that Travis CI supports listing these above to automatically build a
+# matrix of configurations, but we're being nice here by manually building a
+# total of four configurations even though we're testing 4 versions of PHP
+# along with 2 versions of WordPress (which would build 8 configs otherwise).
+# This takes half as long to run while still providing adequate coverage.
+
+matrix:
+  include:
+#    - php: "5.3"
+#      env: WP_VERSION=master
+#    - php: "5.4"
+#      env: WP_VERSION=3.8
+#    - php: "5.2"
+#      env: WP_VERSION=3.8
+
+# Clones WordPress and configures our testing environment.
 before_script:
-    - wget https://raw.github.com/tierra/wordpress-plugin-tests/setup/setup.sh
-    - source setup.sh
+    - export PLUGIN_SLUG=$(basename $(pwd))
+    - git clone https://github.com/tierra/wordpress.git /tmp/wordpress
+# - git clone . "/tmp/wordpress/src/wp-content/plugins/$PLUGIN_SLUG"
+    - cd ..
+    - mv $PLUGIN_SLUG "/tmp/wordpress/src/wp-content/plugins/$PLUGIN_SLUG"
+    - cd /tmp/wordpress
+    - git checkout $WP_VERSION
+    - mysql -e "CREATE DATABASE wordpress_tests;" -uroot
+    - cp wp-tests-config-sample.php wp-tests-config.php
+    - sed -i "s/youremptytestdbnamehere/wordpress_tests/" wp-tests-config.php
+    - sed -i "s/yourusernamehere/travis/" wp-tests-config.php
+    - sed -i "s/yourpasswordhere//" wp-tests-config.php
+    - cd "/tmp/wordpress/src/wp-content/plugins/$PLUGIN_SLUG"
 
 script: phpunit
 
-# wordpress-plugin-tests specific config
-# Tells Travis CI not to run unit tests against the setup branch
-branches:
-    except:
-        - setup
+notifications:
+   email:
+       - [email protected]

3rd-party/3rd-party.php

@@ -0,0 +1,8 @@
+<?php
+
+/*
+ * Placeholder to load 3rd party plugin tweaks until a legit system
+ * is architected
+ */
+
+require_once( 'buddypress.php' );

3rd-party/buddypress.php

@@ -0,0 +1,9 @@
+<?php
+
+add_filter( 'bp_core_pre_avatar_handle_upload', 'blobphoto' );
+function blobphoto( $bool ) {
+
+	add_filter( 'jetpack_photon_skip_image', '__return_true' );
+
+	return $bool;
+}

_inc/genericons.php

@@ -8,6 +8,6 @@
 add_action( 'init', 'jetpack_register_genericons', 1 );
 function jetpack_register_genericons() {
 	if ( ! wp_style_is( 'genericons', 'registered' ) ) {
-		wp_register_style( 'genericons', plugins_url( 'genericons/genericons.css', __FILE__ ), false, '3.0.2' );
+		wp_register_style( 'genericons', plugins_url( 'genericons/genericons.css', __FILE__ ), false, '3.0.3' );
 	}
 }

_inc/genericons/README.txt

@@ -74,6 +74,14 @@ ____ _  _ ____ _  _ ____ ____ _    ____ ____
 |    |__| |__| |\ | | __ |___ |    |  | | __ 
 |___ |  | |  | | \| |__] |___ |___ |__| |__] 
 
+V3.0.3:
+Bunch of updates mostly.
+- Two new icons, Dropbox and Fullscreen.
+- Updates to all icons containing an exclamation mark.
+- Updates to Image and Quote.
+- Nicer "Share" icon.
+- Bigger default Linkedin icon.
+
 V3.0.2: 
 A slew of new stuff and updates.
 - Social icons: Skype, Digg, Reddit, Stumbleupon, Pocket.

_inc/genericons/example.html

@@ -165,6 +165,7 @@ <h1>Genericons Usage</h1>
 		<div alt="f222" class="genericon genericon-reddit"></div>
 		<div alt="f223" class="genericon genericon-stumbleupon"></div>
 		<div alt="f224" class="genericon genericon-pocket"></div>
+		<div alt="f225" class="genericon genericon-dropbox"></div>
 
 		<!-- meta icons -->
 		<div alt="f300" class="genericon genericon-comment"></div>
@@ -252,6 +253,7 @@ <h1>Genericons Usage</h1>
 		<div alt="f471" class="genericon genericon-bold"></div>
 		<div alt="f472" class="genericon genericon-italic"></div>
 		<div alt="f473" class="genericon genericon-picture"></div>
+		<div alt="f474" class="genericon genericon-fullscreen"></div>
 
 		<!-- generic shapes -->
 		<div alt="f500" class="genericon genericon-uparrow"></div>