Skip to content

Commit

Permalink
Merge branch '1.6.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
@boonebgorges
boonebgorges committed Aug 8, 2024
2 parents a83b03d + 68bf87b commit 0d89e7e
Show file tree
Hide file tree
Showing 9 changed files with 102 additions and 74 deletions.
11 changes: 4 additions & 7 deletions admin/templates/classic/changelog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,25 @@
</a>
</h2>

<?php /*
<div class="changelog">
<h3><?php _e( 'Under the Hood', 'commons-in-a-box' ); ?></h3>

<div class="feature-section col two-col">

<div class="last-feature">
<li><?php esc_html_e( 'Fixed bug in Docs pagination inside groups.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Improved compatibility with BuddyPress 12.0+.', 'commons-in-a-box' ); ?></li>
</div>
</div>
</div>
*/ ?>

<div class="changelog">
<h3><?php esc_html_e( 'Plugin Updates', 'commons-in-a-box' ); ?></h3>

<div class="feature-section">
<ul>
<li>BuddyPress 11.4.0</li>
<li>BuddyPress Docs 2.2.1</li>
<li>BuddyPress Group Email Subscription 4.2.1</li>
<li>Invite Anyone 1.4.7</li>
<li>BuddyPress 12.4.0</li>
<li>BuddyPress Group Email Subscription 4.2.3</li>
<li>Invite Anyone 1.4.8</li>
</ul>
</div>
</div>
Expand Down
35 changes: 23 additions & 12 deletions admin/templates/openlab/changelog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@

<div class="feature-section col two-col">
<ul>
<li><?php esc_html_e( 'Template Chooser improvements, including better fallbacks for group templates when template sites are unpublshed or unassociated.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Improved compatibility with the Hamilton theme.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Improved behavior of mobile menus.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Fixed bug that caused broken menus on new sites in certain cases.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Improved compatibility with BuddyPress 12.0+.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'New feature: Users can hide their membership in specific groups from non-group-members.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'New feature: Users can control visibility of specific posts on secondary sites using the "More visibility options" settings"', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'New feature: Network admins can limit site templates to users of spceific member types and/or groups associated with specific academic units.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'New feature: Network admins can control the order of site templates as they appear on the front end.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Fixed bug causing "Group Home" menu item to be incorrectly generated on new group sites.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Fixed bug preventing groups from being completely cloned when the File Library was empty.', 'commons-in-a-box' ); ?></li>
</ul>
</div>
</div>
Expand All @@ -35,13 +38,12 @@

<div class="feature-section">
<ul>
<li>BP Group Documents 1.24</li>
<li>BuddyPress 11.4.0</li>
<li>BuddyPress Docs 2.2.1</li>
<li>BuddyPress Group Email Subscription 4.2.1</li>
<li>Event Organiser 3.12.4</li>
<li>Invite Anyone 1.4.7</li>
<li>Openlab Attributions 2.1.4</li>
<li>BP Classic 1.4.0</li>
<li>BuddyPress 12.4.0</li>
<li>BuddyPress Group Email Subscription 4.2.3</li>
<li>Event Organiser 3.12.6</li>
<li>Invite Anyone 1.4.8</li>
<li>PressForward 5.6.0</li>
</ul>
</div>
</div>
Expand All @@ -51,7 +53,16 @@

<div class="feature-section">
<ul>
<li><?php esc_html_e( 'Fixed potential fatal error when viewing group membership template on later versions of PHP.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'New feature: Privacy settings for user avatars.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Miscellaneous improvements related to the privacy of user profile and portfolio data.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Include "Accessibility" page on installation.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Improvements to pagination on group member lists.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Internal improvements to allow for better overriding of group submenus in child themes.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'More consistent styling for subnav items when editing group settings.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Improvements to keyboard navigation in toolbar and on homepage.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Fixed bug causing an extra set of Creators fields to be shown when editing a group.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Fixed bug causing "Add new file" button to erroneously appear for non-group-members.', 'commons-in-a-box' ); ?></li>
<li><?php esc_html_e( 'Fixed bug that prevented certain new-site options from appearing when editing a cloned group.', 'commons-in-a-box' ); ?></li>
</ul>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions includes/classic/classic.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ protected static function config() {
protected static function theme() {
return array(
'name' => 'Commons In A Box',
'version' => '1.5.1',
'version' => '1.6.0',
'directory_name' => 'cbox-theme',
'download_url' => 'http://github.com/cuny-academic-commons/cbox-theme/archive/1.5.1.zip',
'download_url' => 'http://github.com/cuny-academic-commons/cbox-theme/archive/1.6.0.zip',
'admin_settings' => 'themes.php?page=infinity-theme',
'screenshot_url' => cbox()->plugin_url( 'admin/images/screenshot_cbox_theme.png' ),
);
Expand Down
21 changes: 15 additions & 6 deletions includes/classic/plugins.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ protected static function register_required_plugins( $instance ) {
'network_settings' => 'settings.php?page=bp-components'
) );

// BP Classic
call_user_func( $instance, array(
'plugin_name' => 'BP Classic',
'cbox_name' => __( 'BP Classic', 'commons-in-a-box' ),
'cbox_description' => __( 'BP Classic provides compatibility with legacy plugins when running version 12.0+ of BuddyPress.', 'commons-in-a-box' ),
'version' => '1.4.0',
'download_url' => 'http://downloads.wordpress.org/plugin/bp-classic.1.4.0.zip',
'network' => true,
) );

/**
* Register CBOX's dependency plugins internally.
*
Expand Down Expand Up @@ -110,8 +120,8 @@ protected static function register_recommended_plugins( $instance ) {
'cbox_name' => __( 'Group Email Subscription', 'commons-in-a-box' ),
'cbox_description' => __( 'Allows your community members to receive email notifications of activity within their groups.', 'commons-in-a-box' ),
'depends' => 'BuddyPress (>=1.5)',
'version' => '4.2.1',
'download_url' => 'http://downloads.wordpress.org/plugin/buddypress-group-email-subscription.4.2.1.zip',
'version' => '4.2.3',
'download_url' => 'http://downloads.wordpress.org/plugin/buddypress-group-email-subscription.4.2.3.zip',
'documentation_url' => 'http://commonsinabox.org/documentation/plugins/buddypress-group-email-subscription',
'admin_settings' => 'options-general.php?page=ass_admin_options', // this doesn't work for BP_ENABLE_MULTIBLOG
'network_settings' => 'settings.php?page=ass_admin_options'
Expand All @@ -123,9 +133,9 @@ protected static function register_recommended_plugins( $instance ) {
'type' => 'recommended',
'cbox_name' => __( 'Invite Anyone', 'commons-in-a-box' ),
'cbox_description' => __( 'An enhanced interface for inviting existing community members to groups, as well as a powerful tool for sending invitations, via email, to potential members.', 'commons-in-a-box' ),
'version' => '1.4.7',
'version' => '1.4.8',
'depends' => 'BuddyPress (>=1.5)',
'download_url' => 'http://downloads.wordpress.org/plugin/invite-anyone.1.4.7.zip',
'download_url' => 'http://downloads.wordpress.org/plugin/invite-anyone.1.4.8.zip',
'documentation_url' => 'http://commonsinabox.org/documentation/plugins/invite-anyone',
'admin_settings' => 'admin.php?page=invite-anyone',
'network_settings' => 'admin.php?page=invite-anyone',
Expand Down Expand Up @@ -218,8 +228,7 @@ protected static function register_recommended_plugins( $instance ) {
'depends' => 'BuddyPress (>=1.6)',
'version' => '1.9.3',
// Temporary - Waiting for wordpress.org to reactivate plugin.
//'download_url' => 'http://downloads.wordpress.org/plugin/bp-groupblog.1.9.2.zip',
'download_url' => 'http://github.com/boonebgorges/bp-groupblog/archive/1.9.3.zip',
'download_url' => 'http://downloads.wordpress.org/plugin/bp-groupblog.1.9.3.zip',
'documentation_url' => 'http://commonsinabox.org/documentation/plugins/buddypress-groupblog',
'network_settings' => 'settings.php?page=bp_groupblog_management_page'
) );
Expand Down
15 changes: 2 additions & 13 deletions includes/frontend.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,8 @@
* @since 1.0-beta2
*/
class CBox_Frontend {
/**
* Holds our admin settings.
*
* @var array
*/
private $settings = array();

/**
* Holds our autoload classes.
*
* @var array
*/
private $autoload = array();
public $settings = array();
public $autoload = array();

/**
* Constructor.
Expand Down
4 changes: 2 additions & 2 deletions includes/openlab/openlab.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ protected static function strings() {
protected static function theme() {
return array(
'name' => 'CBOX OpenLab',
'version' => '1.5.1',
'version' => '1.6.0',
'directory_name' => 'openlab-theme',
'download_url' => 'http://github.com/cuny-academic-commons/openlab-theme/archive/1.5.1.zip',
'download_url' => 'http://github.com/cuny-academic-commons/openlab-theme/archive/1.6.0.zip',
'screenshot_url' => cbox()->plugin_url( 'admin/images/screenshot_openlab_theme.png' ),
'force_install' => true
);
Expand Down
34 changes: 22 additions & 12 deletions includes/openlab/plugins.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,29 @@ protected static function register_required_plugins( $instance ) {
'plugin_name' => 'BuddyPress',
'cbox_name' => __( 'BuddyPress', 'commons-in-a-box' ),
'cbox_description' => __( 'BuddyPress provides the core functionality of Commons In A Box, including groups and user profiles.', 'commons-in-a-box' ),
'version' => '11.4.0',
'version' => '12.4.0',
'documentation_url' => 'http://commonsinabox.org/documentation/plugins/buddypress-plugin',
'admin_settings' => 'options-general.php?page=bp-components',
'network_settings' => 'settings.php?page=bp-components'
) );

// BP Classic
call_user_func( $instance, array(
'plugin_name' => 'BP Classic',
'cbox_name' => __( 'BP Classic', 'commons-in-a-box' ),
'cbox_description' => __( 'BP Classic provides compatibility with legacy plugins when running version 12.0+ of BuddyPress.', 'commons-in-a-box' ),
'version' => '1.4.0',
'download_url' => 'http://downloads.wordpress.org/plugin/bp-classic.1.4.0.zip',
'network' => true,
) );

// CBOX-OpenLab Core
call_user_func( $instance, array(
'plugin_name' => 'CBOX-OpenLab Core',
'cbox_name' => __( 'OpenLab Core', 'commons-in-a-box' ),
'cbox_description' => __( 'Core functionality for CBOX-OpenLab.', 'commons-in-a-box' ),
'version' => '1.5.1',
'download_url' => 'https://github.com/cuny-academic-commons/cbox-openlab-core/archive/1.5.1.zip',
'version' => '1.6.0',
'download_url' => 'https://github.com/cuny-academic-commons/cbox-openlab-core/archive/1.6.0.zip',
//'documentation_url' => 'http://commonsinabox.org/documentation/plugins/buddypress-plugin',
) );

Expand Down Expand Up @@ -119,8 +129,8 @@ protected static function register_required_plugins( $instance ) {
'cbox_name' => __( 'Group Email Subscription', 'commons-in-a-box' ),
'cbox_description' => __( 'Allows your community members to receive email notifications of activity within their groups.', 'commons-in-a-box' ),
'depends' => 'BuddyPress (>=1.5)',
'version' => '4.2.1',
'download_url' => 'http://downloads.wordpress.org/plugin/buddypress-group-email-subscription.4.2.1.zip',
'version' => '4.2.3',
'download_url' => 'http://downloads.wordpress.org/plugin/buddypress-group-email-subscription.4.2.3.zip',
'documentation_url' => 'http://commonsinabox.org/documentation/plugins/buddypress-group-email-subscription',
'admin_settings' => 'admin.php?page=ass_admin_options', // this doesn't work for BP_ENABLE_MULTIBLOG
'network_settings' => 'root-blog-only'
Expand All @@ -146,9 +156,9 @@ protected static function register_required_plugins( $instance ) {
'plugin_name' => 'Invite Anyone',
'cbox_name' => __( 'Invite Anyone', 'commons-in-a-box' ),
'cbox_description' => __( 'An enhanced interface for inviting existing community members to groups, as well as a powerful tool for sending invitations, via email, to potential members.', 'commons-in-a-box' ),
'version' => '1.4.7',
'version' => '1.4.8',
'depends' => 'BuddyPress (>=1.5)',
'download_url' => 'http://downloads.wordpress.org/plugin/invite-anyone.1.4.7.zip',
'download_url' => 'http://downloads.wordpress.org/plugin/invite-anyone.1.4.8.zip',
'documentation_url' => 'http://commonsinabox.org/documentation/plugins/invite-anyone',
'admin_settings' => 'admin.php?page=invite-anyone',
'network_settings' => 'admin.php?page=invite-anyone',
Expand Down Expand Up @@ -224,15 +234,15 @@ protected static function register_dependency_plugins( $instance ) {
call_user_func( $instance, array(
'plugin_name' => 'BuddyPress',
'type' => 'dependency',
'download_url' => 'http://downloads.wordpress.org/plugin/buddypress.11.4.0.zip'
'download_url' => 'http://downloads.wordpress.org/plugin/buddypress.12.4.0.zip'
) );

// Event Organiser
call_user_func( $instance, array(
'plugin_name' => 'Event Organiser',
'type' => 'dependency',
'version' => '3.12.4',
'download_url' => 'http://downloads.wordpress.org/plugin/event-organiser.3.12.4.zip',
'version' => '3.12.6',
'download_url' => 'http://downloads.wordpress.org/plugin/event-organiser.3.12.6.zip',
'network' => false,
'hide' => cbox_is_main_site()
) );
Expand Down Expand Up @@ -337,8 +347,8 @@ protected static function register_installonly_plugins( $instance ) {
'type' => 'install-only',
'cbox_name' => __( 'PressForward', 'commons-in-a-box' ),
'cbox_description' => __( 'A plugin providing an editorial workflow for content aggregation and curation within the WordPress dashboard. Designed for bloggers and editorial teams wishing to collect, discuss, and share content from a variety of sources on the open web.', 'commons-in-a-box' ),
'version' => '5.5.0',
'download_url' => 'http://downloads.wordpress.org/plugin/pressforward.5.5.0.zip',
'version' => '5.6.2',
'download_url' => 'http://downloads.wordpress.org/plugin/pressforward.5.6.2.zip',
'documentation_url' => 'https://wordpress.org/plugins/pressforward',
) );

Expand Down
20 changes: 10 additions & 10 deletions loader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Plugin Name: Commons In A Box
Plugin URI: http://commonsinabox.org
Description: A suite of community and collaboration tools for WordPress, designed especially for academic communities
Version: 1.5.1
Version: 1.6.0
Author: CUNY Academic Commons
Author URI: http://commons.gc.cuny.edu
Licence: GPLv3
Expand Down Expand Up @@ -75,6 +75,13 @@ class Commons_In_A_Box {
*/
public $plugins;

/**
* Frontend class.
*
* @var CBox_Frontend
*/
public $frontend;

/**
* Whether to show the main CBOX notice.
*
Expand All @@ -96,13 +103,6 @@ class Commons_In_A_Box {
*/
public $theme_to_update;

/**
* Frontend integration.
*
* @var CBox_Frontend
*/
public $frontend;

/**
* Package plugins.
*
Expand Down Expand Up @@ -163,10 +163,10 @@ private function setup_globals() {
/** VERSION ***********************************************************/

// CBOX version
$this->version = '1.5.1';
$this->version = '1.6.0';

// UTC date of CBOX version release
$this->revision_date = '2024-01-10 18:00 UTC';
$this->revision_date = '2024-08-08 15:00 UTC';

/** FILESYSTEM ********************************************************/

Expand Down
32 changes: 22 additions & 10 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Contributors: cuny-academic-commons, boonebgorges, r-a-y
Tags: commons, cuny, community, education, academic, buddypress
Requires at least: 4.9.8
Tested up to: 6.4
Stable tag: 1.5.1
Tested up to: 6.6
Stable tag: 1.6.0
License: GPLv3
License URI: http://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -59,14 +59,26 @@ It is possible to install Commons In A Box on an existing WordPress site, and it

== Changelog ==

= 1.5.1 =
* Updated plugins (OpenLab): BP Group Documents 1.24, BuddyPress 11.4.0, BuddyPress Docs 2.2.1, BuddyPress Group Email Subscription 4.2.1, Event Organiser 3.12.4, Invite Anyone 1.4.7, OpenLab Attributions 2.1.4
* Updated plugins (Classic): BuddyPress 11.4.0, BuddyPress Docs 2.2.1, BuddyPress Group Email Subscription 4.2.1, Invite Anyone 1.4.7
* OpenLab: Template Chooser improvements, including better fallbacks for group templates when template sites are unpublshed or unassociated.
* OpenLab: Improved compatibility with the Hamilton theme.
* OpenLab: Improved behavior of mobile menus.
* OpenLab: Fixed bug that caused broken menus on new sites in certain cases.
* OpenLab: Fixed potential fatal error when viewing group membership template on later versions of PHP.
= 1.6.0 =
* Updated plugins (OpenLab): BP Classic 1.4.0, BuddyPress 12.4.0, BuddyPress Group Email Subscription 4.2.3, Event Organiser 3.12.6, Invite Anyone 1.4.8, PressForward 5.6.2
* Updated plugins (Classic): BuddyPress 12.4.0, BuddyPress Group Email Subscription 4.2.3, Invite Anyone 1.4.8
* Compatibility with BuddyPress 12.0+.
* OpenLab: New feature allows users to hide their membership in specific groups from non-group-members.
* OpenLab: New 'More visibility options' when creating posts on secondary sites.
* OpenLab: New feature allows network admins to limit site templates to users of specific member types and/or groups associated with specific academic units.
* OpenLab: New feature allows network admins to determine the order of site templates when appearing on the front end.
* OpenLab: Introduce privacy settings for user avatars.
* OpenLab: Privacy improvements to user profiles and portfolios.
* OpenLab: Include 'Accessibility' page on installation.
* OpenLab: Improvements to pagination on group membership lists.
* OpenLab: Internal improvements to allow for better overriding of group submenus in child themes.
* OpenLab: Fixed bug causing 'Group Home' menu item to be incorrectly generated on new group sites.
* OpenLab: Fixed bug preventing groups from being completely cloned when the File Library was empty.
* OpenLab: More consistent styling for subnav items when editing group settings.
* OpenLab: Improvements to keyboard navigation in toolbar and on homepage.
* OpenLab: Fixed bug causing an extra set of Creators fields to be shown when editing a group.
* OpenLab: Ensure that 'Add new file' button does not erroneously appear for non-group-members.
* OpenLab: Fixed bug that prevented certain new-site options from appearing when editing a cloned group.

= 1.5.0 =
* Updated plugins (OpenLab): BuddyPress 11.2.0, BuddyPress Group Email Subscription 4.1.0, BP Group Documents 1.22, Event Organiser 3.12.3, Invite Anyone 1.4.4, OpenLab Attributions 2.1.2, OpenLab Portfolio 1.1.2, PressForward 5.5.0, WP Grade Comments 1.5.0
Expand Down

0 comments on commit 0d89e7e

Please sign in to comment.