Skip to content

Commit ffbce79

Browse files
committed
Merge branch 'trunk' into add/emoji-support
2 parents eca84b5 + 344f7a1 commit ffbce79

File tree

431 files changed

+42254
-10545
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

431 files changed

+42254
-10545
lines changed

.distignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
.git
77
.github
88
.gitignore
9+
.githooks
910
.php_cs
11+
.prettierignore
12+
.prettierrc.js
1013
.svnignore
1114
.travis.yml
1215
.wordpress-org
@@ -19,6 +22,7 @@ CODE_OF_CONDUCT.md
1922
CONTRIBUTING.md
2023
composer.json
2124
composer.lock
25+
development
2226
Dockerfile
2327
docs
2428
docker-compose-test.yml
@@ -28,6 +32,7 @@ Gruntfile.js
2832
gulpfile.js
2933
LICENSE.md
3034
LINGUAS
35+
local
3136
Makefile
3237
node_modules
3338
npm-debug.log

.editorconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# This file is for unifying the coding style for different editors and IDEs
22
# editorconfig.org
3-
3+
#
44
# WordPress Coding Standards
55
# https://make.wordpress.org/core/handbook/coding-standards/
6+
#
7+
# Be sure to keep this file in sync with the .prettierrc.js file.
68

79
root = true
810

.githooks/pre-commit

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/usr/bin/env sh
2+
3+
# Get all changed PHP files once.
4+
PHP_FILES=$(git diff --cached --name-only --diff-filter=ACMR | grep "\.php$" || true)
5+
6+
# Skip if no PHP files are changed.
7+
if [ -n "$PHP_FILES" ]; then
8+
# First sort PHP imports
9+
for file in $PHP_FILES; do
10+
node bin/precommit/sort-php-imports.js "$file"
11+
done
12+
13+
# Then check for unused imports.
14+
UNUSED_IMPORTS=0
15+
for file in $PHP_FILES; do
16+
if ! node bin/precommit/check-unused-imports.js "$file"; then
17+
UNUSED_IMPORTS=1
18+
fi
19+
done
20+
21+
# Exit if unused imports were found.
22+
if [ $UNUSED_IMPORTS -eq 1 ]; then
23+
exit 1
24+
fi
25+
26+
# Run PHP Code Sniffer on all changed PHP files at once.
27+
echo "$PHP_FILES" | xargs composer lint:fix > /dev/null 2>&1 || { echo "PHP formatting failed"; exit 1; }
28+
fi
29+
30+
# Run the WordPress formatter without showing all file output.
31+
npm run format > /dev/null 2>&1 || { echo "JavaScript formatting failed"; exit 1; }
32+
33+
# Make sure git is aware of all the changes made by the formatters.
34+
git update-index --again

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Bug Report
22
description: Helps us improve our product!
3-
labels: [ 'Needs triage', '[Type] Bug' ]
3+
labels: ['Needs triage', '[Type] Bug']
44
type: 'Bug'
55
body:
66
- type: markdown
@@ -20,7 +20,7 @@ body:
2020
- type: textarea
2121
id: summary
2222
attributes:
23-
label: Quick summary
23+
label: Quick summary
2424
- type: textarea
2525
id: steps
2626
attributes:
@@ -63,7 +63,8 @@ body:
6363
id: severity
6464
attributes:
6565
label: Severity
66-
description: What is the severity of this issue? Please take a look at the descriptions below for further context.<br>
66+
description:
67+
What is the severity of this issue? Please take a look at the descriptions below for further context.<br>
6768
<br> - **Critical:** Prevents core functionality or has severe impact on the website/platform.
6869
<br> - **Major:** Significantly impairs important features or has notable impact on the website/platform.
6970
<br> - **Moderate:** Affects non-critical features or has limited impact on the website/platform.

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Feature Request
22
description: Suggest an idea for the ActivityPub plugin!
3-
title: "Feature Request:"
4-
labels: ["[Type] Feature Request"]
3+
title: 'Feature Request:'
4+
labels: ['[Type] Feature Request']
55
type: 'Enhancement'
66
body:
77
- type: markdown

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,43 @@ Fixes #
2020
* Go to '..'
2121
*
2222

23+
### Changelog entry
24+
25+
<!-- You can optionally choose to enter a changelog entry by checking the box below and supplying data. -->
26+
<!-- It will trigger a GitHub workflow that will create and push the entry into the branch. -->
27+
28+
<!-- Due to org permissions, the job may fail for PRs crated from a fork under GitHub organizations. -->
29+
<!-- In this case, you can create entry manually with `composer changelog:add` and push it into the branch. -->
30+
31+
<!-- If no changelog entry is required for this PR, please add the "Skip Changelog" label. -->
32+
33+
- [ ] Automatically create a changelog entry from the details below.
34+
35+
<details>
36+
37+
<summary>Changelog Entry Details</summary>
38+
39+
#### Significance
40+
41+
<!-- Choose only one -->
42+
43+
- [ ] Patch
44+
- [ ] Minor
45+
- [ ] Major
46+
47+
#### Type
48+
49+
<!-- Choose only one -->
50+
51+
- [ ] Added - for new features
52+
- [ ] Changed - for changes in existing functionality
53+
- [ ] Deprecated - for soon-to-be removed features
54+
- [ ] Removed - for now removed features
55+
- [ ] Fixed - for any bug fixes
56+
- [ ] Security - in case of vulnerabilities
57+
58+
#### Message
59+
60+
<!-- Add a changelog message here -->
61+
62+
</details>

.github/changelog/.gitkeep

Whitespace-only changes.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: patch
2+
Type: changed
3+
4+
Use wp_interactivity_config() for static values instead of wp_interactivity_state() to improve performance and code clarity
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: minor
2+
Type: changed
3+
4+
Improved ActivityPub compatibility by aligning with Mastodon’s Application Actor.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: patch
2+
Type: changed
3+
4+
Hide site-wide checkbox in block confirmations when accessed from ActivityPub settings page

0 commit comments

Comments
 (0)