Merge branch 'master' into backup-engines and bump to beta1

Author: willmot

assets/hmbkp.css

@@ -32,6 +32,7 @@ h2 + div[id^="hmbkp"] input { max-width: 100%; }
 .hmbkp-schedule-sentence .submit { padding: 0; }
 .hmbkp-schedule-sentence .hmbkp-schedule-actions { visibility: visible; font-size: 12px; font-weight: normal; margin: 0 0 0 26px; }
 .hmbkp-schedule-actions a { white-space: nowrap; }
+.hmbkp-schedule-sentence .row-actions { position: static; }
 
 .hmbkp-schedule-settings { border-top: 1px solid #e5e5e5; margin: 20px -20px -20px; background-color: #f5f5f5; padding: 0 20px 20px; }
 
@@ -93,4 +94,4 @@ pre { background-color: #eee; padding: 10px; white-space: pre; max-height: 320px
     table.widefat tbody tr:nth-child(even) { background-color: #fff }
     table.widefat tbody tr:nth-child(odd) { background-color: #f9f9f9 }
 
-}
+}

assets/hmbkp.min.css

@@ -3,7 +3,7 @@
 Plugin Name: BackUpWordPress
 Plugin URI: http://bwp.hmn.md/
 Description: Simple automated backups of your WordPress powered website. Once activated you'll find me under <strong>Tools &rarr; Backups</strong>. On multisite, you'll find me under the Network Settings menu.
-Version: 3.4 alpha
+Version: 3.4-beta1
 Author: Human Made Limited
 Author URI: http://hmn.md/
 License: GPL-2+

assets/hmbkp.min.js

@@ -6,8 +6,7 @@
  * Class Plugin
  */
 final class Plugin {
-
-	const PLUGIN_VERSION = '3.4 alpha';
+	const PLUGIN_VERSION = '3.4-beta1';
 
 	/**
 	 * @var Plugin The singleton instance.

backupwordpress.php

@@ -7,12 +7,12 @@ build-dev:
   - compress:dev
 
 build:
-  - makepot
   - autoprefixer
   - cssmin
   - uglify
   - bumpup # defaults to patch, change to :minor or :major if necessary
   - replace # Update version numbers, build faq.txt
+  - makepot
 
 # before running release, make sure to add the changelog to readme-footer.txt Also, update the "tested up to" version if necessary
 release:

classes/class-plugin.php

@@ -2,9 +2,9 @@
 # This file is distributed under the GPL-2+.
 msgid ""
 msgstr ""
-"Project-Id-Version: BackUpWordPress 3.4 alpha\n"
+"Project-Id-Version: BackUpWordPress 3.4-beta1\n"
 "Report-Msgid-Bugs-To: backupwordpress@hmn.md\n"
-"POT-Creation-Date: 2015-11-30 00:11:58+00:00\n"
+"POT-Creation-Date: 2015-12-14 19:27:03+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -799,38 +799,38 @@ msgstr ""
 msgid "Unfortunately, the backup file was too large to attach to this email."
 msgstr ""
 
-#: classes/class-path.php:330
+#: classes/class-path.php:332
 msgid "This %s file ensures that other people cannot download your backup files."
 msgstr ""
 
-#: classes/class-plugin.php:229
+#: classes/class-plugin.php:228
 msgid "Update"
 msgstr ""
 
-#: classes/class-plugin.php:230
+#: classes/class-plugin.php:229
 msgid "Cancel"
 msgstr ""
 
-#: classes/class-plugin.php:231
+#: classes/class-plugin.php:230
 msgid ""
 "Are you sure you want to delete this schedule? All of its backups will also "
 "be deleted."
 msgstr ""
 
-#: classes/class-plugin.php:231 classes/class-plugin.php:232
-#: classes/class-plugin.php:233 classes/class-plugin.php:234
+#: classes/class-plugin.php:230 classes/class-plugin.php:231
+#: classes/class-plugin.php:232 classes/class-plugin.php:233
 msgid "'Cancel' to go back, 'OK' to delete."
 msgstr ""
 
-#: classes/class-plugin.php:232
+#: classes/class-plugin.php:231
 msgid "Are you sure you want to delete this backup?"
 msgstr ""
 
-#: classes/class-plugin.php:233
+#: classes/class-plugin.php:232
 msgid "Are you sure you want to remove this exclude rule?"
 msgstr ""
 
-#: classes/class-plugin.php:234
+#: classes/class-plugin.php:233
 msgid ""
 "Reducing the number of backups that are stored on this server will cause "
 "some of your existing backups to be deleted. Are you sure that's what you "

grunt/aliases.yml

@@ -1,6 +1,6 @@
 {
   "name": "BackUpWordPress",
-  "version": "3.3.3",
+  "version": "3.3.4",
   "description": "Simple automated backups of your WordPress powered website.",
   "main": "backupwordpress.php",
   "directories": {