Merge pull request #44 from Automattic/alpha

Release Apr 08
Automattic · Apr 8, 2024 · 03d13b5 · 03d13b5
2 parents e67375d + 6f10caf
commit 03d13b5
Show file tree

Hide file tree

Showing 31 changed files with 1,133 additions and 1,111 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -18,7 +18,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - trunk
       - newspack/release:
           requires:
             - newspack/build
@@ -28,6 +28,7 @@ workflows:
                 - release
                 - alpha
                 - /^hotfix\/.*/
+                - /^epic\/.*/
       - newspack/post-release:
           requires:
             - newspack/release

diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ notifications:
 
 branches:
   only:
-    - master
+    - trunk
 
 cache:
   directories:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [1.3.0-alpha.1](https://github.com/Automattic/newspack-multibranded-site/compare/v1.2.0...v1.3.0-alpha.1) (2024-02-08)
+
+
+### Features
+
+* **ci:** add epic/* release workflow and rename `master` to `trunk` ([#41](https://github.com/Automattic/newspack-multibranded-site/issues/41)) ([290e390](https://github.com/Automattic/newspack-multibranded-site/commit/290e390af56a8af20a90d952c2d6596714a5045c))
+
 # [1.2.0](https://github.com/Automattic/newspack-multibranded-site/compare/v1.1.0...v1.2.0) (2023-12-11)
 
 

diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
-# Newspack Multi-branded Site plugin
+# Newspack Multibranded Site plugin
 
-A plugin to allow your site to host multiple brands
+Brand different content and sections of your site with unique colors and navigation.
diff --git a/includes/admin/class-cat-primary-brand.php b/includes/admin/class-cat-primary-brand.php
@@ -52,7 +52,7 @@ public static function edit_term( $term ) {
 					<?php endforeach; ?>
 				</select>
 				<p class="description" id="<?php echo esc_attr( Taxonomy::PRIMARY_META_KEY ); ?>-description">
-					<?php echo esc_html__( 'The primary brand defines what brand will be applied to the term\'s archive. (added by Newspack Multi-branded site)', 'newspack-multibranded-site' ); ?>
+					<?php echo esc_html__( 'The primary brand defines what brand will be applied to the term\'s archive. (added by Newspack Multibranded site)', 'newspack-multibranded-site' ); ?>
 				</p>
 			</td>
 		</tr>

diff --git a/includes/admin/class-show-page-on-front.php b/includes/admin/class-show-page-on-front.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/admin/class-user-primary-brand.php b/includes/admin/class-user-primary-brand.php
@@ -59,7 +59,7 @@ public static function edit_user_profile( $user ) {
 		?>
 		<div class="newspack-multibranded-site-options">
 		<?php \wp_nonce_field( 'newspack_multibranded_site', 'newspack_multibranded_site_nonce' ); ?>
-			<h2><?php echo esc_html__( 'Multi-branded site Options', 'newspack-multibranded-site' ); ?></h2>
+			<h2><?php echo esc_html__( 'Multibranded site Options', 'newspack-multibranded-site' ); ?></h2>
 			<?php echo esc_html__( 'The user primary brand defines what brand will be applied to the user\'s archive.', 'newspack-multibranded-site' ); ?>
 			<table class="form-table" role="presentation">
 				<tr class="user-<?php echo esc_attr( Meta::get_key() ); ?>-wrap">

diff --git a/includes/class-admin.php b/includes/class-admin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site plugin administration screen handling.
+ * Newspack Multibranded site plugin administration screen handling.
  *
  * @package Newspack
  */
@@ -36,17 +36,17 @@ public static function add_admin_menu() {
 		if ( class_exists( 'Newspack\Newspack' ) ) {
 			$page_suffix = add_submenu_page(
 				'newspack',
-				__( 'Multi-branded site', 'newspack-multibranded-site' ),
-				__( 'Multi-branded site', 'newspack-multibranded-site' ),
+				__( 'Multibranded site', 'newspack-multibranded-site' ),
+				__( 'Multibranded site', 'newspack-multibranded-site' ),
 				'manage_options',
 				self::MULTI_BRANDED_PAGE_SLUG,
 				array( __CLASS__, 'render_page' )
 			);
 		} else {
 			$icon        = 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjE4cHgiIGhlaWdodD0iNjE4cHgiIHZpZXdCb3g9IjAgMCA2MTggNjE4IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPGcgaWQ9IlBhZ2UtMSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPHBhdGggZD0iTTMwOSwwIEM0NzkuNjU2NDk1LDAgNjE4LDEzOC4zNDQyOTMgNjE4LDMwOS4wMDE3NTkgQzYxOCw0NzkuNjU5MjI2IDQ3OS42NTY0OTUsNjE4IDMwOSw2MTggQzEzOC4zNDM1MDUsNjE4IDAsNDc5LjY1OTIyNiAwLDMwOS4wMDE3NTkgQzAsMTM4LjM0NDI5MyAxMzguMzQzNTA1LDAgMzA5LDAgWiBNMTc0LDE3MSBMMTc0LDI2Mi42NzEzNTYgTDE3NS4zMDUsMjY0IEwxNzQsMjY0IEwxNzQsNDQ2IEwyNDEsNDQ2IEwyNDEsMzMwLjkxMyBMMzUzLjk5Mjk2Miw0NDYgTDQ0NCw0NDYgTDE3NCwxNzEgWiBNNDQ0LDI5OSBMMzg5LDI5OSBMNDEwLjQ3NzYxLDMyMSBMNDQ0LDMyMSBMNDQ0LDI5OSBaIE00NDQsMjM1IEwzMjcsMjM1IEwzNDguMjQ1OTE5LDI1NyBMNDQ0LDI1NyBMNDQ0LDIzNSBaIE00NDQsMTcxIEwyNjQsMTcxIEwyODUuMjkwNTEyLDE5MyBMNDQ0LDE5MyBMNDQ0LDE3MSBaIiBpZD0iQ29tYmluZWQtU2hhcGUiIGZpbGw9IiMyQTdERTEiPjwvcGF0aD4KICAgIDwvZz4KPC9zdmc+';
 			$page_suffix = add_menu_page(
-				__( 'Multi-branded site', 'newspack-multibranded-site' ),
-				__( 'Multi-branded site', 'newspack-multibranded-site' ),
+				__( 'Multibranded site', 'newspack-multibranded-site' ),
+				__( 'Multibranded site', 'newspack-multibranded-site' ),
 				'manage_options',
 				self::MULTI_BRANDED_PAGE_SLUG,
 				array( __CLASS__, 'render_page' ),

diff --git a/includes/class-initializer.php b/includes/class-initializer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site plugin initialization.
+ * Newspack Multibranded site plugin initialization.
  *
  * @package Newspack
  */

diff --git a/includes/class-meta.php b/includes/class-meta.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Newspack Multi-branded site term meta parent class.
+ * Newspack Multibranded site term meta parent class.
  *
  * @package Newspack
  */
 
 namespace Newspack_Multibranded_Site;
 
 /**
- * Newspack Multi-branded site meta parent class
+ * Newspack Multibranded site meta parent class
  */
 abstract class Meta {
 

diff --git a/includes/class-taxonomy.php b/includes/class-taxonomy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/customizations/class-blogname.php b/includes/customizations/class-blogname.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/customizations/class-body-class.php b/includes/customizations/class-body-class.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/customizations/class-logo.php b/includes/customizations/class-logo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/customizations/class-menus.php b/includes/customizations/class-menus.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/customizations/class-popups-should-display-prompt.php b/includes/customizations/class-popups-should-display-prompt.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/customizations/class-show-page-on-front.php b/includes/customizations/class-show-page-on-front.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/customizations/class-theme-colors.php b/includes/customizations/class-theme-colors.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/customizations/class-url.php b/includes/customizations/class-url.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/meta/class-category-primary-brand.php b/includes/meta/class-category-primary-brand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/meta/class-logo.php b/includes/meta/class-logo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/meta/class-menus.php b/includes/meta/class-menus.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/meta/class-post-primary-brand.php b/includes/meta/class-post-primary-brand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/meta/class-show-page-on-front.php b/includes/meta/class-show-page-on-front.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/meta/class-tag-primary-brand.php b/includes/meta/class-tag-primary-brand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/meta/class-theme-colors.php b/includes/meta/class-theme-colors.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/meta/class-url.php b/includes/meta/class-url.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/includes/meta/class-user-primary-brand.php b/includes/meta/class-user-primary-brand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Newspack Multi-branded site taxonomy.
+ * Newspack Multibranded site taxonomy.
  *
  * @package Newspack
  */

diff --git a/newspack-multibranded-site.php b/newspack-multibranded-site.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Plugin Name: Newspack Multi-branded site
- * Description: A plugin to allow your site to host multiple brands
- * Version: 1.2.0
+ * Plugin Name: Newspack Multibranded Site
+ * Description: Brand different content and sections of your site with unique colors and navigation.
+ * Version: 1.3.0-alpha.1
  * Author: Automattic
  * Author URI: https://newspack.com/
  * License: GPL3