Merge pull request #565 from publishpress/feature/release-2.9.1

Feature/release 2.9.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,49 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+Your issue may already be reported!
+Please search on the [issue track](../) before creating one.
+
+## Expected Behavior
+
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Possible Solution
+
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Context
+
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Your Environment
+
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+
+* Version used:
+* Browser Name and version:
+* Operating System and version (desktop or mobile):
+* Link to your project:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'enhancement'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/release-free-plugin.md

@@ -0,0 +1,37 @@
+---
+name: Release the Free version (team only)
+about: Describes default checklist for the plugin's release process.
+title: Release v[VERSION]
+labels: release
+assignees: ''
+
+---
+
+To release the Free plugin please make sure to check all the checkboxes below.
+
+### Pre-release Checklist
+
+- [ ] Create the release branch as `release-<version>` based on the development branch
+- [ ] Make sure to directly merge or use Pull Requests to merge hotfixes or features branches into the release branch
+- [ ] Run `composer update` and check if there is any relevant update. Check if you need to lock the current version for any dependency. The `--no-dev` argument is optional here, since the build script will make sure to run the build with that argument.
+- [ ] Update the changelog - make sure all the changes are there with a user-friendly description and that the release date is correct
+- [ ] Update the version number to the next stable version. Use `$ vendor/bin/robo version <version-number>`
+- [ ] Commit the changes to the release branch
+- [ ] Build the zip package using `$ vendor/bin/robo build`. It should create a package in the `./dist` dir.
+- [ ] Send to the team for testing
+
+### Release Checklist
+
+- [ ] Create a Pull Request and merge the release branch it into the `master` branch
+- [ ] Merge the `master` branch into the `development` branch
+- [ ] Create the Github release (make sure it is based on the `master` branch and correct tag)
+
+#### SVN Repo
+- [ ] Cleanup the `trunk` directory.
+- [ ] Unzip the built package and move files to the `trunk`
+- [ ] Remove any eventual file that shouldn't be released in the package (if you find anything, make sure to create an issue to fix the build script)
+- [ ] Look for new files `$ svn status | grep \?` and add them using `$ svn add <each_file_path>`
+- [ ] Look for removed files `$ svn status | grep !` and remove them `$ svn rm <each_file_path>`
+- [ ] Create the new tag `$ svn cp trunk tags/<version>`
+- [ ] Commit the changes `$ svn ci 'Releasing <version>'`
+- [ ] Wait until WordPress updates the version number and make the final test updating the plugin in a staging site

.github/ISSUE_TEMPLATE/release-pro-plugin.md

@@ -0,0 +1,30 @@
+---
+name: Release the Pro version (team only)
+about: Describes default checklist for releasing the Pro plugin;
+title: Release Pro v[VERSION]
+labels: release
+assignees: ''
+
+---
+
+To release the Pro plugin please make sure to check all the checkboxes below.
+
+### Pre-release Checklist
+
+- [ ] Create the release branch as `release-<version>` based on the development branch
+- [ ] Make sure to directly merge or use Pull Requests to merge hotfixes or features branches into the release branch
+- [ ] Clone free version shared file to pro version
+- [ ] Run `composer update` and check if there is any relevant update. Check if you need to lock the current version for any dependency. The `--no-dev` argument is optional here, since the build script will make sure to run the build with that argument.
+- [ ] Update the changelog - make sure all the changes are there with a user-friendly description and that the release date is correct
+- [ ] Update the version number to the next stable version. Use `$ vendor/bin/robo version <version-number>`
+- [ ] Commit the changes to the release branch
+- [ ] Build the zip package using `$ vendor/bin/robo build`. It should create a package in the `./dist` dir.
+- [ ] Send to the team for testing
+
+### Release Checklist
+
+- [ ] Create a Pull Request and merge the release branch it into the `master` branch
+- [ ] Merge the `master` branch into the `development` branch
+- [ ] Create the Github release (make sure it is based on the `master` branch and correct tag)
+- [ ] Update EDD registry and upload the new package
+- [ ] Make the final test updating the plugin in a staging site

addons/publisher/css/series_im_sort_articles.css

@@ -14,10 +14,14 @@
     max-width: 910px;
 }
 
-.pp-series-publisher-wrap table.series-parts tbody tr {
+.pp-series-publisher-wrap.series-order table.series-parts tbody tr {
     cursor: move;
 }
 
+#timestampdiv select {
+    max-width: 90px !important;
+}
+
 @media screen and (max-width: 782px){
 
     .pp-series-publisher-wrap .has-right-sidebar #post-body-content,

addons/publisher/js/series_im_sort_articles.js

@@ -1,10 +1,10 @@
 jQuery(document).ready( function($) {
   /*im_update_post_order();*/
-  $(".im_article_list").sortable({
+  /*$(".im_article_list").sortable({
     axis: "y",
-  });
+  });*/
 
-  $(".pp-series-publisher-wrap table.series-parts tbody").sortable({
+  $(".pp-series-publisher-wrap.series-order table.series-parts tbody").sortable({
     axis: "y",
   });
 

addons/publisher/series-part-post-table.php

@@ -59,13 +59,13 @@ public function single_row($item)
     public function get_columns()
     {
         $columns = [
-            'cb'        => '<input type="checkbox"/>', //Render a checkbox instead of text
-            'title'     => esc_html__('Title', 'organize-series'),
-            'author'    => esc_html__('Author', 'organize-series'),
-            'categories' => esc_html__('Categories', 'organize-series'),
-            'tags'      => esc_html__('Tags', 'organize-series'),
-            'date'      => esc_html__('Date', 'organize-series'),
-            'part'      => esc_html__('Current Part', 'organize-series'),
+            'cb'          => '<input type="checkbox"/>', //Render a checkbox instead of text
+            'title'       => esc_html__('Title', 'organize-series'),
+            'author'      => esc_html__('Author', 'organize-series'),
+            'categories'  => esc_html__('Categories', 'organize-series'),
+            'tags'        => esc_html__('Tags', 'organize-series'),
+            'post_status' => esc_html__('Status', 'organize-series'),
+            'part'        => esc_html__('Current Part', 'organize-series'),
         ];
 
         return $columns;
@@ -264,74 +264,13 @@ protected function column_tags($item)
 	}
 
 	/**
-	 * Handles the post date column output.
+	 * Handles the post post_status column output.
      * 
 	 */
-	public function column_date( $post ) {
-		global $mode;
-
-		if ( '0000-00-00 00:00:00' === $post->post_date ) {
-			$t_time    = __( 'Unpublished' );
-			$time_diff = 0;
-		} else {
-			$t_time = sprintf(
-				/* translators: 1: Post date, 2: Post time. */
-				__( '%1$s at %2$s' ),
-				/* translators: Post date format. See https://www.php.net/manual/datetime.format.php */
-				get_the_time( __( 'Y/m/d' ), $post ),
-				/* translators: Post time format. See https://www.php.net/manual/datetime.format.php */
-				get_the_time( __( 'g:i a' ), $post )
-			);
-
-			$time      = get_post_timestamp( $post );
-			$time_diff = time() - $time;
-		}
-
-		if ( 'publish' === $post->post_status ) {
-			$status = __( 'Published' );
-		} elseif ( 'future' === $post->post_status ) {
-			if ( $time_diff > 0 ) {
-				$status = '<strong class="error-message">' . __( 'Missed schedule' ) . '</strong>';
-			} else {
-				$status = __( 'Scheduled' );
-			}
-		} else {
-			$status = __( 'Last Modified' );
-		}
-
-		/**
-		 * Filters the status text of the post.
-		 *
-		 * @since 4.8.0
-		 *
-		 * @param string  $status      The status text.
-		 * @param WP_Post $post        Post object.
-		 * @param string  $column_name The column name.
-		 * @param string  $mode        The list display mode ('excerpt' or 'list').
-		 */
-		$status = apply_filters( 'post_date_column_status', $status, $post, 'date', $mode );
-
-        $date_html = '';
-		if ( $status ) {
-            $date_html .= $status . '<br />';
-		}
-
-		/**
-		 * Filters the published time of the post.
-		 *
-		 * @since 2.5.1
-		 * @since 5.5.0 Removed the difference between 'excerpt' and 'list' modes.
-		 *              The published time and date are both displayed now,
-		 *              which is equivalent to the previous 'excerpt' mode.
-		 *
-		 * @param string  $t_time      The published time.
-		 * @param WP_Post $post        Post object.
-		 * @param string  $column_name The column name.
-		 * @param string  $mode        The list display mode ('excerpt' or 'list').
-		 */
-		$date_html .= apply_filters( 'post_date_column_time', $t_time, $post, 'date', $mode );
-
-        return $date_html;
+	public function column_post_status( $post ) {
+        $post_status = get_post_status_object($post->post_status);
+
+        return $post_status->label;
 	}
 
     /**

addons/publisher/series-publish-post-table.php

@@ -59,12 +59,12 @@ public function single_row($item)
     public function get_columns()
     {
         $columns = [
-            'cb'        => '<input type="checkbox"/>', //Render a checkbox instead of text
-            'title'     => esc_html__('Title', 'organize-series'),
-            'author'    => esc_html__('Author', 'organize-series'),
-            'categories' => esc_html__('Categories', 'organize-series'),
-            'tags'      => esc_html__('Tags', 'organize-series'),
-            'date'      => esc_html__('Date', 'organize-series'),
+            'cb'             => '<input type="checkbox"/>', //Render a checkbox instead of text
+            'title'          => esc_html__('Title', 'organize-series'),
+            'author'         => esc_html__('Author', 'organize-series'),
+            'categories'     => esc_html__('Categories', 'organize-series'),
+            'tags'           => esc_html__('Tags', 'organize-series'),
+            'post_status'    => esc_html__('Status', 'organize-series'),
             'series_preview' => esc_html__('Preview', 'organize-series'),
         ];
 
@@ -250,74 +250,13 @@ protected function column_tags($item)
 	}
 
 	/**
-	 * Handles the post date column output.
+	 * Handles the post post_status column output.
      * 
 	 */
-	public function column_date( $post ) {
-		global $mode;
-
-		if ( '0000-00-00 00:00:00' === $post->post_date ) {
-			$t_time    = __( 'Unpublished' );
-			$time_diff = 0;
-		} else {
-			$t_time = sprintf(
-				/* translators: 1: Post date, 2: Post time. */
-				__( '%1$s at %2$s' ),
-				/* translators: Post date format. See https://www.php.net/manual/datetime.format.php */
-				get_the_time( __( 'Y/m/d' ), $post ),
-				/* translators: Post time format. See https://www.php.net/manual/datetime.format.php */
-				get_the_time( __( 'g:i a' ), $post )
-			);
-
-			$time      = get_post_timestamp( $post );
-			$time_diff = time() - $time;
-		}
-
-		if ( 'publish' === $post->post_status ) {
-			$status = __( 'Published' );
-		} elseif ( 'future' === $post->post_status ) {
-			if ( $time_diff > 0 ) {
-				$status = '<strong class="error-message">' . __( 'Missed schedule' ) . '</strong>';
-			} else {
-				$status = __( 'Scheduled' );
-			}
-		} else {
-			$status = __( 'Last Modified' );
-		}
-
-		/**
-		 * Filters the status text of the post.
-		 *
-		 * @since 4.8.0
-		 *
-		 * @param string  $status      The status text.
-		 * @param WP_Post $post        Post object.
-		 * @param string  $column_name The column name.
-		 * @param string  $mode        The list display mode ('excerpt' or 'list').
-		 */
-		$status = apply_filters( 'post_date_column_status', $status, $post, 'date', $mode );
-
-        $date_html = '';
-		if ( $status ) {
-            $date_html .= $status . '<br />';
-		}
-
-		/**
-		 * Filters the published time of the post.
-		 *
-		 * @since 2.5.1
-		 * @since 5.5.0 Removed the difference between 'excerpt' and 'list' modes.
-		 *              The published time and date are both displayed now,
-		 *              which is equivalent to the previous 'excerpt' mode.
-		 *
-		 * @param string  $t_time      The published time.
-		 * @param WP_Post $post        Post object.
-		 * @param string  $column_name The column name.
-		 * @param string  $mode        The list display mode ('excerpt' or 'list').
-		 */
-		$date_html .= apply_filters( 'post_date_column_time', $t_time, $post, 'date', $mode );
-
-        return $date_html;
+	public function column_post_status( $post ) {
+        $post_status = get_post_status_object($post->post_status);
+
+        return $post_status->label;
 	}
 
     /**
@@ -332,7 +271,7 @@ protected function column_series_preview($item)
         return sprintf(
             '<a href="%1$s">%2$s</a>', 
             esc_url(home_url('?p='.$item->ID.'&preview=true')), 
-            esc_html__('Preview', 'organize-series'), 
+            esc_html__('Preview', 'organize-series')
         );
     }