-
Notifications
You must be signed in to change notification settings - Fork 101
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release' into PROD-7339
* 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
Showing
79 changed files
with
767 additions
and
386 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,5 +41,5 @@ | |
}, | ||
"license": "GPL-2.0-or-later", | ||
"version": "3.1.0", | ||
"BBVersion": "2.6.10" | ||
"BBVersion": "2.6.11" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.