Deploying version 0.3.1

README.md

@@ -3,8 +3,8 @@
 **Donate link:** https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5VPMGLLK94XJC  
 **Tags:** amazon, amazon web services  
 **Requires at least:** 3.5  
-**Tested up to:** 4.2.2  
-**Stable tag:** 0.3  
+**Tested up to:** 4.3  
+**Stable tag:** trunk  
 **License:** GPLv3  
 
 Houses the Amazon Web Services (AWS) PHP libraries and manages access keys. Required by other AWS plugins.
@@ -34,9 +34,12 @@ This plugin is required by other plugins, which uses its libraries and its setti
 
 ## Changelog ##
 
+### 0.3.1 - 2015-07-29 ###
+* Bug fix: Style inconsistencies on the _Addons_ screen
+
 ### 0.3 - 2015-07-08 ###
 * New: Support for [IAM Roles on Amazon EC2](https://deliciousbrains.com/wp-offload-s3/doc/iam-roles/) using the `AWS_USE_EC2_IAM_ROLE` constant
-* New: Resigned _Access Keys_ and _Addons_ screens
+* New: Redesigned _Access Keys_ and _Addons_ screens
 * Improvement: _Settings_ menu item renamed to _Access Keys_
 * Improvement: _Access Keys_ link added to plugin row on _Plugins_ screen
 * Improvement: Activate addons directly from within _Addons_ screen
@@ -63,4 +66,4 @@ This plugin is required by other plugins, which uses its libraries and its setti
 * Improvement: Code formatting to WordPress standards
 
 ### 0.1 - 2013-09-20 ###
-* First release
+* First release

amazon-web-services.php

@@ -4,7 +4,7 @@
 Plugin URI: http://wordpress.org/extend/plugins/amazon-web-services/
 Description: Includes the Amazon Web Services PHP libraries, stores access keys, and allows other plugins to hook into it.
 Author: Brad Touesnard
-Version: 0.3
+Version: 0.3.1
 Author URI: http://bradt.ca/
 Network: True
 Text Domain: amazon-web-services
@@ -22,7 +22,7 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // **********************************************************************
 
-$GLOBALS['aws_meta']['amazon-web-services']['version'] = '0.3';
+$GLOBALS['aws_meta']['amazon-web-services']['version'] = '0.3.1';
 
 $GLOBALS['aws_meta']['amazon-web-services']['supported_addon_versions'] = array(
 	'amazon-s3-and-cloudfront' => '0.9',

assets/sass/styles.scss

@@ -118,21 +118,21 @@ body.toplevel_page_amazon-web-services .wrap {
 				}
 			}
 
-			h1 {
-				margin: 0;
+			h1, h2 {
+				padding: 0;
 				color: #fff;
-				font-size: 26px;
 				line-height: 1;
 				font-weight: 600;
 			}
 
+			h1 {
+				margin: 0;
+				font-size: 26px;
+			}
+
 			h2 {
 				margin: 4px 0 0;
-				padding: 0;
 				font-size: 18px;
-				line-height: 1;
-				font-weight: 600;
-				color: #fff;
 			}
 
 			.label {

classes/wp-aws-compatibility-check.php

@@ -254,6 +254,19 @@ function is_parent_plugin_enabled() {
 			return true;
 		}
 
+		/**
+		 * Check the parent plugin is at a specific version
+		 *
+		 * @param string $version
+		 *
+		 * @return bool
+		 */
+		function is_parent_plugin_at_version( $version ) {
+			$current_parent_plugin_version = isset( $GLOBALS['aws_meta'][ $this->parent_plugin_slug ]['version'] ) ? $GLOBALS['aws_meta'][ $this->parent_plugin_slug ]['version'] : 0;
+
+			return version_compare( $current_parent_plugin_version, $version, '>=' );
+		}
+
 		/**
 		 * Get the compatibility error message
 		 *
@@ -386,6 +399,13 @@ function hook_admin_notices() {
 				return;
 			}
 
+			global $pagenow;
+
+			if ( 'update.php' === $pagenow && isset( $_GET['action'] ) && 'install-plugin' === $_GET['action'] ) {
+				// Don't show notice when installing plugins
+				return;
+			}
+
 			$this->get_admin_notice();
 		}
 

languages/amazon-web-services-en.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amazon-web-services\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2015-07-08 13:07-0300\n"
+"POT-Creation-Date: 2015-07-29 09:49-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -109,78 +109,78 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:276
+#: classes/wp-aws-compatibility-check.php:289
 msgid "deactivate"
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:277
+#: classes/wp-aws-compatibility-check.php:290
 #, php-format
 msgid "You can %s the %s plugin to get rid of this notice."
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:280
+#: classes/wp-aws-compatibility-check.php:293
 #, php-format
 msgid "%s has been disabled as it requires the %s plugin."
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:284
+#: classes/wp-aws-compatibility-check.php:297
 msgid "which is currently disabled."
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:286
+#: classes/wp-aws-compatibility-check.php:299
 msgid "It appears to be installed already."
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:288
+#: classes/wp-aws-compatibility-check.php:301
 msgctxt "Activate plugin"
 msgid "Activate it now."
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:295
+#: classes/wp-aws-compatibility-check.php:308
 #, php-format
 msgid "<a href=\"%s\">Install</a> and activate it."
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:306
+#: classes/wp-aws-compatibility-check.php:319
 #, php-format
 msgid ""
 "%s has been disabled as it requires version %s or later of the %s plugin."
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:309
+#: classes/wp-aws-compatibility-check.php:322
 #, php-format
 msgid "You currently have version %s installed."
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:316
+#: classes/wp-aws-compatibility-check.php:329
 #, php-format
 msgid "A valid license for %s is required to update."
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:324
+#: classes/wp-aws-compatibility-check.php:337
 msgid "Update to the latest version"
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:336
+#: classes/wp-aws-compatibility-check.php:349
 #, php-format
 msgid ""
 "%1$s has been disabled because it is not a supported addon of the %2$s "
 "plugin."
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:345
+#: classes/wp-aws-compatibility-check.php:358
 #, php-format
 msgid ""
 "%1$s has been disabled because it will not work with the version of the %2$s "
 "plugin installed. %1$s %3$s or later is required."
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:348
+#: classes/wp-aws-compatibility-check.php:361
 #, php-format
 msgid "Update %s to the latest version"
 msgstr ""
 
-#: classes/wp-aws-compatibility-check.php:403
+#: classes/wp-aws-compatibility-check.php:423
 #, php-format
 msgid "The %s plugin has been deactivated."
 msgstr ""

readme.txt

@@ -3,8 +3,8 @@ Contributors: bradt
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5VPMGLLK94XJC
 Tags: amazon, amazon web services
 Requires at least: 3.5
-Tested up to: 4.2.2
-Stable tag: 0.3
+Tested up to: 4.3
+Stable tag: trunk
 License: GPLv3
 
 Houses the Amazon Web Services (AWS) PHP libraries and manages access keys. Required by other AWS plugins.
@@ -32,9 +32,12 @@ This plugin is required by other plugins, which uses its libraries and its setti
 
 == Changelog ==
 
+= 0.3.1 - 2015-07-29 =
+* Bug fix: Style inconsistencies on the _Addons_ screen
+
 = 0.3 - 2015-07-08 =
 * New: Support for [IAM Roles on Amazon EC2](https://deliciousbrains.com/wp-offload-s3/doc/iam-roles/) using the `AWS_USE_EC2_IAM_ROLE` constant
-* New: Resigned _Access Keys_ and _Addons_ screens
+* New: Redesigned _Access Keys_ and _Addons_ screens
 * Improvement: _Settings_ menu item renamed to _Access Keys_
 * Improvement: _Access Keys_ link added to plugin row on _Plugins_ screen
 * Improvement: Activate addons directly from within _Addons_ screen
@@ -61,4 +64,4 @@ This plugin is required by other plugins, which uses its libraries and its setti
 * Improvement: Code formatting to WordPress standards
 
 = 0.1 - 2013-09-20 =
-* First release
+* First release