Hypolite Petovan
7402bc9f50
Merge pull request #12299 from annando/auto-reshare-fix
...
Check that an auto reshare is only done on the expected contact
2022-11-30 08:34:10 -05:00
Michael Vogel
4a94078091
Merge pull request #12300 from matthiasmoritz/bug-noLocalPosts
...
Fix #12262 - shared friendica posts are filtered on status page
2022-11-30 13:37:40 +01:00
Matthias Moritz
2035a7a178
Merge branch 'bug-noLocalPosts' of https://github.com/matthiasmoritz/friendica into bug-noLocalPosts
2022-11-30 13:20:50 +01:00
Matthias Moritz
71f4dd0d20
Update Status.php
...
Instead of removing AP, added Protocol::DFRN to the list of networks.
2022-11-30 13:19:31 +01:00
Matthias Moritz
7676aa7908
Merge branch 'friendica:develop' into bug-noLocalPosts
2022-11-30 12:18:48 +01:00
Matthias Moritz
da93373e8d
Fix #12262 - shared friendica posts are filtered on status page
...
Native shares from the same Instance (or maybe all Friendica instances) were filtered out from the users home. With this commit they now appear on the users Profile/Status
2022-11-30 12:15:58 +01:00
Michael
a01cdccb05
Check that an auto reshare is only done on the expected contact
2022-11-30 09:28:27 +00:00
Michael Vogel
cd3e842f76
Merge pull request #12296 from MrPetovan/bug/deprecated
...
Address some PHP 8.1 deprecation notices
2022-11-30 07:19:46 +01:00
Hypolite Petovan
150c0e0750
Address some PHP 8.1 deprecation notices
...
- Replace a strstr call by strpos in Model\APContact
- Simplify conditions in Protocol\DFRN
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1331012289
2022-11-29 21:37:41 -05:00
Hypolite Petovan
6c2f42ed03
Merge pull request #12294 from annando/tag-warnings
...
Fix warning 'Undefined array key "name"'
2022-11-29 19:36:51 -05:00
Michael
8eda9dfe7c
Fix warning 'Undefined array key "name"'
2022-11-29 23:21:27 +00:00
Hypolite Petovan
24e4dfa541
Merge pull request #12293 from annando/report-status
...
Added status to the report
2022-11-29 15:01:57 -05:00
Michael
8eca961aeb
Added status to the report
2022-11-29 19:50:12 +00:00
Michael Vogel
dddf17b5c5
Merge pull request #12290 from MrPetovan/bug/frio-contact-follow
...
[frio] Add page wrapper to contact follow page
2022-11-29 19:59:10 +01:00
Hypolite Petovan
ebe512edfd
Merge pull request #12292 from annando/api-speed
...
API: Speed improvements
2022-11-29 13:55:33 -05:00
Michael
8b41d62a88
API: Speed improvements
2022-11-29 18:45:30 +00:00
Hypolite Petovan
c0c414ab95
[frio] Add page wrapper to contact follow page
2022-11-29 06:37:41 -05:00
Hypolite Petovan
624231c665
Merge pull request #12289 from annando/fatal
...
Fix fatal errors because of unknown function/variable names
2022-11-28 16:46:19 -05:00
Michael
3288efb323
Fix fatal errors because of unknown function/variable names
2022-11-28 21:22:21 +00:00
Hypolite Petovan
0ba111d99c
Merge pull request #12288 from annando/api-tags
...
API: Added trending links
2022-11-28 16:13:37 -05:00
Michael Vogel
7898f9cccb
Update src/Module/Api/Mastodon/Trends/Links.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-11-28 21:42:34 +01:00
Michael
437419bbd9
Updated database.sql
2022-11-28 20:22:08 +00:00
Michael
de76e860ad
API: Added trending links
2022-11-28 20:19:57 +00:00
Hypolite Petovan
d6a7303991
Merge pull request #12283 from annando/api-tags
...
Issue 12191: API tag handling
2022-11-28 14:52:29 -05:00
Hypolite Petovan
1ec4c14501
Merge pull request #12287 from nupplaphil/bug/fix_router
...
Fix Legacy Router class routing
2022-11-28 14:52:01 -05:00
Michael
e391328cbf
Added changelog entry
2022-11-28 19:31:04 +00:00
Philipp
de25d3a7ee
Fix Legacy Router class routing
2022-11-28 20:14:37 +01:00
Michael
bded1c3989
Only use items that had originally been posted in the last week
2022-11-28 14:51:37 +00:00
Michael
0e160040d4
Code standards
2022-11-28 10:54:26 +00:00
Michael
c00004f6ea
API: Tredning statuses added
2022-11-28 09:30:41 +00:00
Philipp
5e7e2b65b2
Merge pull request #12284 from tobiasd/20221128-de
...
DE translation update THX MarekBenjamin
2022-11-28 08:12:53 +01:00
Michael
6b36bd893b
API: Trending tags are added
2022-11-28 07:08:01 +00:00
Michael
73ba7d8005
Coding styles
2022-11-28 06:52:55 +00:00
Michael
a7639a2341
Updated documentation
2022-11-28 06:46:18 +00:00
Tobias Diekershoff
3092975523
DE translation update THX MarekBenjamin
2022-11-28 07:00:11 +01:00
Michael
f7167acc74
Standards
2022-11-28 04:07:25 +00:00
Michael
56c4727fe1
Merge branch 'api-tags' of github.com:annando/friendica into api-tags
2022-11-28 04:04:35 +00:00
Michael
934766c364
Trim the tag
2022-11-28 04:04:27 +00:00
Michael Vogel
4e6b6fd76b
Update src/Module/Api/Mastodon/FollowedTags.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-11-28 05:00:08 +01:00
Michael
85f57e69fa
Issue 12191: We can now follow and unfollow tags via API
2022-11-28 03:29:43 +00:00
Michael
a6d060b0e4
Merge remote-tracking branch 'upstream/develop' into api-tags
2022-11-28 02:13:20 +00:00
Philipp
a60467ed78
Merge pull request #12281 from annando/issue-12149
...
Issue 12149: Show that a post was reshared
2022-11-27 22:11:17 +01:00
Michael
6d74d74a26
Issue 12149: Show that a post was reshared
2022-11-27 20:47:08 +00:00
Michael
0e2c2cd0e0
API: Support new tag endpoints
2022-11-27 19:22:41 +00:00
Philipp
4c64c6ed98
Merge pull request #12279 from MrPetovan/bug/12273-api-search-exact-results
...
Return only one result in case of exact match in Api\Mastodon\Search
2022-11-27 15:15:59 +01:00
Hypolite Petovan
db987999b5
Return only one result in case of exact match in Api\Mastodon\Search
2022-11-27 08:28:52 -05:00
Hypolite Petovan
9fbdcb5459
Merge pull request #12277 from nupplaphil/mod/fbrowser
...
Move mod/fbrowser to src\Modules\Attachment|Photos\Browser
2022-11-27 07:55:55 -05:00
Philipp
b56e6f4b5b
Merge pull request #12280 from MrPetovan/bug/11804-delete-notifications-item
...
Remove related notifications when marking an item for deletion
2022-11-27 09:01:28 +01:00
Hypolite Petovan
25e1412174
Remove related notifications when marking an item for deletion
2022-11-26 21:48:26 -05:00
Philipp
3ac3b3d2af
Perfection!
2022-11-27 01:52:49 +01:00
