Skip to content

Commit

Permalink
Merge branch 'release' into PROD-7339
Browse files Browse the repository at this point in the history
* release: (60 commits)
PROD-7256 - fix the validation issue
[PROD-7226] Keep aspect ratio for giphy images in gif dropdown picker for messages, forums, search results
PROD-7208 - Grunt
[PROD-7208] Prevent emoji picker from closing when searching for emoji in activity modal
Update: Grunt
Update: Grunt string-replace
Update: Version name update
grunt
Added change log
pulled api changes
PROD-7433 - Typo fixed
PROD-6756 - Update doc block comment and fixed js code beautifier
PROD-7433 - Grunt
PROD-7433 - Update schedule allowed value null to disabled. Fixed - When setting disable, In feed - select group and add content and keep data as draft. Once you open draft feed again the scheduled icon still was there.
PROD-7433 - Only validate for schedule post
PROD-7433 - Allow read more for schedule post
PROD-7433 - 	Fixed - Check for non admin member to delete scheduled post which they scheduled when they have permission to moderate.
PROD-7433 - Remove error log
PROD-7433 - Fixed - delete scheduled activity issue for group
PROD-7433 - Code refactor and run grunt
...

# Conflicts:
#	src/bp-templates/bp-nouveau/css/buddypress-rtl.min.css
#	src/bp-templates/bp-nouveau/css/buddypress.min.css
#	src/bp-templates/bp-nouveau/js/buddypress-activity.min.js
#	src/bp-templates/bp-nouveau/js/buddypress-media.min.js
  • Loading branch information
KartikSuthar committed May 30, 2024
2 parents 0274e29 + de6d0af commit 3f43ea3
Show file tree
Hide file tree
Showing 79 changed files with 767 additions and 386 deletions.
2 changes: 1 addition & 1 deletion bp-loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Description: The BuddyBoss Platform adds community features to WordPress. Member Profiles, Activity Feeds, Direct Messaging, Notifications, and more!
* Author: BuddyBoss
* Author URI: https://buddyboss.com/
* Version: 2.6.10
* Version: 2.6.11
* Text Domain: buddyboss
* Domain Path: /bp-languages/
* License: GPLv2 or later (license.txt)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@
},
"license": "GPL-2.0-or-later",
"version": "3.1.0",
"BBVersion": "2.6.10"
"BBVersion": "2.6.11"
}
1 change: 1 addition & 0 deletions src/bp-activity/bp-activity-filters.php
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
add_filter( 'bp_get_activity_content', 'bb_mention_add_user_dynamic_link', 20, 1 );
add_filter( 'bp_get_activity_content_body', 'bb_mention_add_user_dynamic_link', 20, 1 );
add_filter( 'bp_activity_comment_content', 'bb_mention_add_user_dynamic_link', 20, 1 );
add_filter( 'the_content', 'bb_mention_add_user_dynamic_link', 20, 1 );

// Modal template for activity.
add_action( 'bp_after_directory_activity_list', 'bb_activity_add_modal_template' );
Expand Down
10 changes: 10 additions & 0 deletions src/bp-activity/classes/class-bp-rest-activity-endpoint.php
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,16 @@ public function get_items( $request ) {
$args['pin_type'] = bb_activity_pin_type( $args );
}

if ( bb_get_activity_scheduled_status() === $args['status'] ) {
if ( ! isset( $request['user_id'] ) ) {
$args['filter']['user_id'] = bp_loggedin_user_id();
}
if ( ! empty( $args['group_id'] ) ) {
$args['filter']['object'] = 'groups';
} else {
$args['filter']['object'] = 'activity';
}
}
/**
* Filter the query arguments for the request.
*
Expand Down
2 changes: 1 addition & 1 deletion src/bp-core/admin/bp-core-admin-functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -3426,7 +3426,7 @@ function_exists( 'bb_platform_pro' ) &&
esc_html__( 'BuddyBoss Platform Pro', 'buddyboss' ),
esc_html__( 'to unlock', 'buddyboss' )
);
} elseif( ! function_exists( 'bb_platform_pro' ) ) {
} elseif( ! function_exists( 'bb_platform_pro' ) || ! bbp_pro_is_license_valid() ) {
$bb_pro_notice = sprintf(
'<br/><span class="bb-head-notice"> %1$s <a target="_blank" href="https://www.buddyboss.com/platform/">%2$s</a> %3$s</span>',
esc_html__( 'Install', 'buddyboss' ),
Expand Down
2 changes: 1 addition & 1 deletion src/bp-core/admin/css/common-rtl.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/bp-core/admin/css/common.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/bp-core/admin/js/fitvids.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/bp-core/admin/js/hello.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3f43ea3

Please sign in to comment.