Merge pull request #301 from publishpress/feature/release-2.7.0

Feature/release 2.7.0

assets/js/admin.js

@@ -90,6 +90,28 @@
     });
 
 
+
+    // -------------------------------------------------------------
+    //   Series migration
+    // -------------------------------------------------------------
+    /*$(document).on('click', '.ppseries-migrate-series', function (e) {
+      e.preventDefault();
+      var button = $(this);
+      $(".ppseries-spinner").addClass("is-active");
+      button.attr('disabled', true);
+      $('.ppseries-migrate-series-response').remove();
+      var data = {
+          'action': 'ppseries_pro_migrate_series_by_ajax'
+      };
+      $.post(ajaxurl, data, function (response) {
+        $(".ppseries-spinner").removeClass("is-active");
+        button.attr('disabled', false);
+        $('.ppseries-migrate-series').after('<div class="ppseries-migrate-series-response" style="margin-top:10px;">'+response.content+'</div>');
+      });
+
+  });*/
+
+
   })
 
 })(jQuery)

composer.json

@@ -19,9 +19,10 @@
       "psr/container": "1.0.0",
       "composer/installers": "v1.0.6",
       "publishpress/wordpress-version-notices": "^1.1",
-      "alledia/wordpress-edd-license-integration": "^2.3"
+      "alledia/wordpress-edd-license-integration": "^2.3",
+        "publishpress/wordpress-reviews": "^1.1"
     },
     "autoload": {
         "psr-4": {"OrganizeSeries\\": "src/"}
     }
-}
+}

inc/orgSeries_updates.php

@@ -269,11 +269,11 @@ function display_json_error() {
 		//only display messages if there is a new version of the plugin.
 		if ( version_compare($pluginInfo->version, $this->getInstalledVersion(), '>') ) {
 			if ( $pluginInfo->no_api ){
-				$msg = sprintf(__('<p>There is an automatic update for %s available but your api-key has not been set.  Please go to the <a href="options-general.php?page=orgseries_options_page">Publishpress Series Options page</a> to set your api_key for this addon.</p>', $this->lang_domain), $pluginName);
+				$msg = sprintf(__('<p>There is an automatic update for %s available but your api-key has not been set.  Please go to the <a href="admin.php?page=orgseries_options_page">Publishpress Series Options page</a> to set your api_key for this addon.</p>', $this->lang_domain), $pluginName);
 			}
 
 			if ( $pluginInfo->api_invalid ) {
-				$msg = sprintf(__('<p>There is an automatic update for %s available but your api-key is invalid.  Either you have entered the wrong key on the <a href="options-general.php?page=orgseries_options_page">Publishpress Series Options</a> page OR you no longer have access to the updates for this plugin.  Automatic upgrades for single website install\'s are gained via the <a href="https://publishpress.com/pricing">Basic Support package</a>.  Automatic upgrades for multiple website install\'s are available via the <a href="https://publishpress.com/pricing">All Addons package or the Lifetime Membership package.</a></p>', $this->lang_domain), $pluginName);
+				$msg = sprintf(__('<p>There is an automatic update for %s available but your api-key is invalid.  Either you have entered the wrong key on the <a href="admin.php?page=orgseries_options_page">Publishpress Series Options</a> page OR you no longer have access to the updates for this plugin.  Automatic upgrades for single website install\'s are gained via the <a href="https://publishpress.com/pricing">Basic Support package</a>.  Automatic upgrades for multiple website install\'s are available via the <a href="https://publishpress.com/pricing">All Addons package or the Lifetime Membership package.</a></p>', $this->lang_domain), $pluginName);
 			}
 			//Dismiss code below is obtained from the Gravity Forms Plugin by rocketgenius.com
 			?>