Merge branch 'stable' into develop

CHANGELOG.md

@@ -17,6 +17,20 @@ Changelog formatting (http://semver.org/):
 ### Security (in case of vulnerabilities.)
 -->
 
+## 3.3.0 (2022-11-10)
+
+### Changed
+
+- Switch from block template to variations with a placeholder for Sidebar block. (2da11fe)
+- Add vertical alignment and stacked-on-mobile attributes for Sibebar block. (2da11fe)
+- Switch from block style to attribute for sidebar orientation on Sidebar block. (2da11fe)
+- Update sidebar icons. (2da11fe)
+
+### Fixed
+
+- Remove inner-block locking to fix missing render appender on Sidebar block and set allowed blocks to empty to prevent inserting new columns. (2da11fe)
+- Only show awards when a database table is selected on the Award Viewer block. (158f2ce)
+
 ## 3.2.0 (2022-10-20)
 
 ### Added

README.md

@@ -1,6 +1,6 @@
 # HRSWP Blocks
 
-[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Build Status](https://github.com/washingtonstateuniversity/hrswp-plugin-blocks/actions/workflows/coding-standards.yml/badge.svg)](https://github.com/washingtonstateuniversity/hrswp-plugin-blocks/actions) [![Release Version](https://img.shields.io/github/v/release/washingtonstateuniversity/hrswp-plugin-blocks)](https://github.com/washingtonstateuniversity/hrswp-plugin-blocks/releases/latest) ![WordPress tested up to version 6.0.3](https://img.shields.io/badge/WordPress-v6.0.3%20tested-success.svg) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier) [![GPLv3 License](https://img.shields.io/github/license/washingtonstateuniversity/hrswp-plugin-blocks)](https://github.com/washingtonstateuniversity/hrswp-plugin-blocks/blob/develop/LICENSE.md)
+[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Build Status](https://github.com/washingtonstateuniversity/hrswp-plugin-blocks/actions/workflows/coding-standards.yml/badge.svg)](https://github.com/washingtonstateuniversity/hrswp-plugin-blocks/actions) [![Release Version](https://img.shields.io/github/v/release/washingtonstateuniversity/hrswp-plugin-blocks)](https://github.com/washingtonstateuniversity/hrswp-plugin-blocks/releases/latest) ![WordPress tested up to version 6.1.1](https://img.shields.io/badge/WordPress-v6.1.1%20tested-success.svg) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier) [![GPLv3 License](https://img.shields.io/github/license/washingtonstateuniversity/hrswp-plugin-blocks)](https://github.com/washingtonstateuniversity/hrswp-plugin-blocks/blob/develop/LICENSE.md)
 
 ## Overview
 

hrswp-blocks.php

@@ -1,15 +1,15 @@
 <?php
 /**
  * Plugin Name: HRSWP Blocks
- * Version: 3.2.0
+ * Version: 3.3.0
  * Description: A WSU HRS WordPress plugin to provide custom blocks and WP block editor adjustments.
  * Author: Adam Turner, washingtonstateuniversity
  * Author URI: https://hrs.wsu.edu/
  * Plugin URI: https://github.com/washingtonstateuniversity/hrswp-plugin-blocks
  * Update URI: https://api.github.com/repos/washingtonstateuniversity/hrswp-plugin-blocks/releases/latest
  * Text Domain: hrswp-blocks
  * Requires at least: 5.9
- * Tested up to: 6.0.3
+ * Tested up to: 6.1.1
  * Requires PHP: 7.4
  *
  * @package HRSWP_Blocks

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@washingtonstateuniversity/hrswp-plugin-blocks",
-	"version": "3.2.0",
+	"version": "3.3.0",
 	"description": "A WSU HRS WordPress plugin to provide custom blocks and WP block editor adjustments.",
 	"author": "Adam Turner",
 	"contributors": [