Commit graph

36962 commits

Author SHA1 Message Date
Tobias Diekershoff
63e6387a79
Merge pull request #12872 from xundeenergie/develop
fix typo (btn-defaul -> btn-default)
2023-03-08 15:36:54 +01:00
www-data
51083e9fcf fix typo (btn-defaul -> btn-default) 2023-03-08 05:48:34 +01:00
Hypolite Petovan
d402e66644
Merge pull request #12869 from damianwajer/calendar-reactions-fix
[frio] Fix calendar attendance icons
2023-03-07 12:01:01 -05:00
Damian Wajer
cf3dc9a94f Fix calendar attendance icons 2023-03-07 17:57:54 +01:00
Hypolite Petovan
a80fc2db54
Merge pull request #12867 from annando/revert-attach
Fix plaintext function by partly reverting function removal
2023-03-07 07:39:05 -05:00
Michael
e0fe3bf77d Fix plaintext function by partly reverting function removal 2023-03-06 18:00:58 +00:00
Hypolite Petovan
009c2a122e
Merge pull request #12866 from annando/no-attached-data
The function "getAttachedData" has been removed
2023-03-06 10:06:07 -05:00
Michael
c1686c486c Fix warning 2023-03-06 06:43:04 +00:00
Michael
699be97ea1 Reformatted code 2023-03-06 06:15:30 +00:00
Michael
aea3ed4548 Code is reformatted 2023-03-05 21:46:45 +00:00
Michael
eafe54f2dd The function "getAttachedData" has been removed 2023-03-05 21:22:22 +00:00
Hypolite Petovan
27cc346f8a
Merge pull request #12865 from annando/fix-links
Fix missing attached links in posts
2023-03-04 17:57:38 -05:00
Michael
d41ec728e4 We only need a link here 2023-03-04 21:36:19 +00:00
Michael
60ddef1720 Unneeded field removed 2023-03-04 19:28:31 +00:00
Michael
b761760d65 Fix missing attached links in posts 2023-03-04 19:04:37 +00:00
Michael
9e4753f440 Merge remote-tracking branch 'upstream/develop' into api-edit 2023-03-03 03:56:19 +00:00
Philipp
11527761d7
Merge pull request #12861 from annando/fix-status
API: Fix dateformat on status
2023-03-03 00:22:39 +01:00
Michael
ea3a56ccfa API: Fix dateformat on status 2023-03-02 21:07:33 +00:00
Hypolite Petovan
180b81c6e7
Merge pull request #12836 from damianwajer/post-interactions
[frio] Use all available space for post interaction buttons (mobile)
2023-03-01 12:41:18 -05:00
Damian Wajer
45571fe6a7 [frio] Move "Share via" to the share dropdown 2023-03-01 18:09:18 +01:00
Michael
fc8421b57b Merge remote-tracking branch 'upstream/develop' into api-edit 2023-03-01 05:17:13 +00:00
Michael Vogel
e8492954a2
Merge pull request #12855 from HankG/fix-use-mastodon-edited-at-field
Use Mastodon standard edited_at field for tracking edit time
2023-02-28 22:31:18 +01:00
Hank Grabowski
63a65b6d02 Fix passing in correct change fields to Mastodon Status FriendicaExtension 2023-02-28 16:10:13 -05:00
Hank Grabowski
7ccc978bc5 Add title/spoiler text handling and capturing invalid update to Mastodon edit 2023-02-28 15:35:37 -05:00
Hank Grabowski
1e48978664 Use Mastodon standard edited_at field for tracking edit time 2023-02-28 15:02:02 -05:00
Hypolite Petovan
8ce90d7b41
Merge pull request #12853 from HankG/mastodon-timeline-temporal-paging
Mastodon timeline temporal paging
2023-02-28 13:51:21 -05:00
Hank G
c7457c7a72
Update src/Module/BaseApi.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-02-28 13:49:23 -05:00
Hank Grabowski
80896936b2 Remove extra lines from TimelineOrderByTypes.php to get rid of server side only formatting error 2023-02-28 13:12:11 -05:00
Hank Grabowski
13672bccf4 Only allow explicitly known order types through 2023-02-28 13:10:45 -05:00
Hank Grabowski
f0b3864c7a Add default getLinkHeader asDate to be false (the previous ID-only way) 2023-02-28 12:48:25 -05:00
Hank Grabowski
fae67b6d88 Remove extra line between copyright and namespace 2023-02-28 11:44:49 -05:00
Hank Grabowski
260f4e46ab Correct format/style errors 2023-02-28 11:43:12 -05:00
Hank Grabowski
32bb097604 Correct format/style errors 2023-02-28 11:41:53 -05:00
Hank Grabowski
c33c624f83 Add new temporal paging to Mastodon Timeline Public and List endpoints 2023-02-28 11:36:24 -05:00
Hank Grabowski
4f86cd0923 Add comment to friendica_order query parameter in Mastodon Timeline Home 2023-02-28 11:35:54 -05:00
Hank Grabowski
099ef11183 Fix tag filtering on block/mute list 2023-02-28 11:35:21 -05:00
Hank Grabowski
1f6578229e Add additional Mastodon timeline sorting date types and data to output 2023-02-28 10:36:11 -05:00
Hank Grabowski
1adb23d8fd Change timestamp to be DateTime object not integers in Mastodon Timeline API 2023-02-28 08:20:08 -05:00
Michael
3a0b0ffce5 Editing of media descriptions is now possible as well 2023-02-28 08:06:49 +00:00
Michael
98aed4dde3 Adding and removing of pictures via API is now possible 2023-02-28 06:19:19 +00:00
Hank Grabowski
6ffd3a3f8c Merge branch 'develop' into mastodon-timeline-temporal-paging 2023-02-27 20:20:40 -05:00
Philipp
a56d2f2eb8
Merge pull request #12852 from annando/instance-fix
Fix v1 endpoint
2023-02-27 22:40:04 +01:00
Michael
a5b774d2ef Without "->__toString()" 2023-02-27 21:15:11 +00:00
Michael
cbb9cb6c24 Fix v1 endpoint 2023-02-27 21:02:59 +00:00
Hypolite Petovan
7eb26fa6bd
Merge pull request #12851 from annando/issue-12415
Issue 12415: Handle attachment updates via AP
2023-02-27 15:12:19 -05:00
Hypolite Petovan
1d6f5c33a1
Merge pull request #12850 from nupplaphil/feat/phpstorm_editorconfig
Adapt .editorconfig for PHPStorm
2023-02-27 15:05:00 -05:00
Michael
2849a96628 Issue 12415: Handle attachment updates via AP 2023-02-27 20:02:05 +00:00
Philipp
ea550f6b02
ident_size 2 is better for XML readability :) 2023-02-27 20:57:19 +01:00
Philipp
089850e8f6
Add a PHPStorm code style XML 2023-02-27 20:53:19 +01:00
Philipp
ae5fe47c03
Adapt .editorconfig
- Add .json rule
- Add .xml rule
2023-02-27 20:34:46 +01:00