Commit dcce9ae
committed
Merge trunk into add/reader branch
Resolved merge conflicts:
- includes/functions.php: Added Mention type handling from trunk
- includes/rest/class-inbox-controller.php: Updated get_local_recipients to use Following::get_follower_ids for public activities
- package.json: Merged dependency updates from trunk with Reader UI deps
- package-lock.json: Regenerated with npm installFile tree
100 files changed
+4451
-1174
lines changed- .claude/skills/activitypub-pr-workflow
- .github
- changelog
- workflows
- assets/css
- build
- follow-me
- remote-reply
- docs
- how-to
- images
- includes
- collection
- model
- rest
- transformer
- wp-admin
- import
- table
- integration
- src/follow-me
- __tests__
- tests/phpunit/tests
- includes
- collection
- handler
- rest
- transformer
- wp-admin
- import
- integration
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
100 files changed
+4451
-1174
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
| 38 | + | |
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
| 77 | + | |
| 78 | + | |
77 | 79 | | |
78 | 80 | | |
79 | 81 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
0 commit comments