Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-10-20 23:33:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
35496 commits 3 branches 64 tags 240 MiB
Commit graph

10227 commits

Author SHA1 Message Date
Hypolite Petovan
1b0f7e5add
Merge pull request #12304 from HankG/add-dismissed-field-to-mastodon-notifications 
Add dismissed field to mastodon notifications
 2022-11-30 14:55:09 -05:00
Hank G
f61dbf76a7
Update src/Module/Api/Mastodon/Notifications.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 14:39:00 -05:00
Hank G
b51b537711
Update src/Factory/Api/Mastodon/Notification.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 14:38:53 -05:00
Hank Grabowski
a2559d6241 Add 'include_all' parameter on Mastodon API endpoint 
Maintains old functionality of only returning non-dismissed notifications while adding ability to get list of dismissed and non-dismissed notifications
 2022-11-30 14:24:46 -05:00
Hank Grabowski
a27ffda59f Add dismissed field to Mastodon API Notification types 2022-11-30 14:23:20 -05:00
Hank Grabowski
5b5c38f9ab Fix broken dismiss endpoint on Mastodon notifications API 2022-11-30 14:11:39 -05:00
MarekBenjamin
8f5d6fdf72
Merge branch 'friendica:develop' into show_image_upload_limit 2022-11-30 18:19:18 +01:00
MarekBenjamin
e4fd9d425f
Update src/Module/Media/Photo/Upload.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 18:16:55 +01:00
MarekBenjamin
f9c0d5a14b
Update src/Module/Media/Photo/Upload.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 18:16:42 +01:00
Michael
fbcc56d42d Changes after code review 2022-11-30 14:33:55 +00:00
Michael
1ced4673fe Indention 2022-11-30 13:35:57 +00:00
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
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
f31e617f5d Contact suggestions are now cached 2022-11-30 05:59:27 +00:00
Marek Bachmann
79235b6db1 Removed redundant maximagesize = INF statements 2022-11-30 05:17:48 +01:00
Marek Bachmann
a3d8a59b00 Correctly output binary prefix values since base 2 is used for conversion 2022-11-30 04:37:08 +01:00
Marek Bachmann
75b01f669a Check for inf values before try to converts bytes to binary prefix strings 2022-11-30 04:35:18 +01:00
Marek Bachmann
bb9afc520b Added getBytesFromShorthand at the remaining places. 2022-11-30 04:13:10 +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
Marek Bachmann
97a3587e58 Added handling as infinity if maxfilesize is set to 0 2022-11-30 02:44:48 +01:00
Marek Bachmann
ca7af7a64b Merge branch 'develop' into show_image_upload_limit 2022-11-30 02:28:15 +01:00
Marek Bachmann
bbd1c34292 Wrapped all occurrences of DI::config()->get('system', 'maximagesize') with Strings::getBytesFromShorthand() 2022-11-30 02:26:56 +01:00
Marek Bachmann
99e1c64b1a Added info that shorthands can be used for maxfilesize Admin Site 2022-11-30 02:16:48 +01:00
MarekBenjamin
72b3bbb23c
Update src/Module/Admin/Site.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 01:49:53 +01:00
Marek Bachmann
7d86cb1a1e Removed Trends.php which for what ever reason found its way in my branch under src/Module/Api/Mastodon but is not present in friendica:develop 2022-11-30 01:40:21 +01:00
Marek Bachmann
c03784eaa9 wanted to use a constant for the shorthand regex to be used in the form input templates and to check maximagesize post value. But Input field seems to require the regex without enclosing "/.../", so remove const for now 2022-11-30 01:26:08 +01:00
Marek Bachmann
d44968cd10 split-off! Trends.php allow shorthands in the system.maximagesize 2022-11-30 01:26:08 +01:00
Marek Bachmann
9c383e2004 allow shorthands in the system.maximagesize 2022-11-30 01:26:08 +01:00
Michael
8eda9dfe7c Fix warning 'Undefined array key "name"' 2022-11-29 23:21:27 +00:00
MarekBenjamin
3cf0b9b9fd
Merge branch 'friendica:develop' into show_image_upload_limit 2022-11-29 21:58:46 +01:00
Michael
8b41d62a88 API: Speed improvements 2022-11-29 18:45:30 +00:00
Marek Bachmann
77c68d10e8 Merge branch 'develop' into show_image_upload_limit 2022-11-29 00:28:05 +01: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
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
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
Michael
73ba7d8005 Coding styles 2022-11-28 06:52:55 +00: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
Marek Bachmann
d43e393921 and now the missing ')' at the correct position 2022-11-28 01:16:54 +01:00
Marek Bachmann
5b2ac7b944 Added missing ')' 2022-11-28 01:11:02 +01:00
MarekBenjamin
6877f8a473
Update src/Module/Admin/Site.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-28 01:06:40 +01:00
Marek Bachmann
a01872a117 Merge branch 'develop' into show_image_upload_limit 
# Conflicts:
#	src/Util/Strings.php
#	view/lang/C/messages.po
 2022-11-27 23:52:58 +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
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
Philipp
272911527c
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-27 01:52:14 +01:00
Philipp
4e53ba0c20
Cache the Module class 2022-11-27 01:48:52 +01:00
Philipp
29190fae73
Update messages.po 2022-11-27 01:36:31 +01:00
Philipp
012f486eb6
Adhere feedback 2022-11-27 01:34:59 +01:00
Philipp
e6933a28da
Be more kindly :-) 2022-11-27 01:34:59 +01:00
Philipp
50316bbb80
Move Browser & Upload to own namespace 2022-11-27 01:34:59 +01:00
Philipp
051253a745
Move FileBrowser to own namespace & Bugfix album usage 2022-11-27 01:34:58 +01:00
Philipp
3607aa32ca
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-27 01:34:58 +01:00
Philipp
e60dfef0d0
Update src/App/Arguments.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-27 01:34:58 +01:00
Philipp
7c058153b5
Make PHP-CS happy 2022-11-27 01:34:58 +01:00
Philipp
801ee5c17f
Merge pull request #12276 from MrPetovan/bug/fatal-errors 
Address a couple of fatal errors
 2022-11-27 00:31:14 +01:00
Marek Bachmann
719c294fb5 Added info about upload_max_filesize to admin page 2022-11-26 23:45:58 +01:00
Hypolite Petovan
a5f601718f Add a default value for $data['version'] in Model\GServer 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1327320541
 2022-11-26 17:28:55 -05:00
Hypolite Petovan
b6d62003a6 Have a default value for $item['contact-id'] in Model\Post\Delayed 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1327030873
 2022-11-26 17:27:36 -05:00
MarekBenjamin
765b50bde8
Update src/Util/Strings.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-26 23:14:21 +01:00
MarekBenjamin
ce56cabd9f
Update src/Util/Strings.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-26 23:12:46 +01:00
Philipp
3ef7ae2f74
License :) 2022-11-26 22:33:45 +01:00
Philipp
d0b16b2fc1
Move mod/fbrowser to src\Modules\Attachment|Photos\Browser 2022-11-26 22:26:30 +01:00
Marek Bachmann
6c73077bbc whitespaces 2022-11-26 21:53:12 +01:00
Marek Bachmann
907deed523 introduced getBytesFromShorthand function to covert from shorthand notation to int 2022-11-26 21:43:31 +01:00
Hypolite Petovan
ed7b175491 Catch worker argument type errors 
- This marks the invalid worker queue item as completed instead of endlessly retrying it
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1327029331
 2022-11-26 15:21:46 -05:00
Michael
acfc11c436 Issue 12133: Account data can now be updated via API 2022-11-26 08:56:24 +00:00
Michael
8879d93aad Issue 12266: APISuggestions should now work 2022-11-26 02:08:34 +00:00
Hypolite Petovan
29ee2473d7
Merge pull request #12269 from annando/api-edit 
Issue 12192: API: Enable edit
 2022-11-25 19:22:27 -05:00
Philipp
c2c563be26
Merge pull request #12249 from MrPetovan/bug/deprecated 
Address several PHP 8.1 deprecation notices
 2022-11-25 23:32:32 +01:00
Philipp
4291e0def5
Merge pull request #12246 from MrPetovan/bug/notices 
Ensure the existence of various keys in decoded data in Diaspora::decodeRaw
 2022-11-25 23:30:56 +01:00
Michael
92807d86a3 API: Enable edit 2022-11-25 19:35:40 +00:00
Hypolite Petovan
55640eec87 [Composer] Upgrade to phpseclib version 3 
- Create custom Key file format for Salmon Magic key
- Remove obsolete pemToME and MEtoPem Crypto methods
- Remove unused newECKeypair Crypto method
- Switch to constant-time Base64 encode/decode in Base64Url Strings methods
 2022-11-25 08:13:05 -05:00
Hypolite Petovan
a3fb499735 Replace call to parse_url() with Uri instanciation in Util\Proxy 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1321796513
 2022-11-25 08:13:05 -05:00
Hypolite Petovan
0ec7238da4 Fix null value passed to string functions deprecation notices 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1321796513
 2022-11-25 08:13:05 -05:00
Hypolite Petovan
6b555f64da Add \ReturnTypeWillChange attribute to methods inherited from native interfaces 
- Part of https://github.com/friendica/friendica/issues/12011#issuecomment-1321796513
 2022-11-25 08:13:05 -05:00
Hypolite Petovan
01558d6dda
Merge pull request #12264 from annando/error 
Fix "Argument #1 ($parts) must be of type array, bool given"
 2022-11-25 08:05:10 -05:00
Michael
fa5e7585a3 Fix "Argument #1 ($parts) must be of type array, bool given" 2022-11-25 06:08:56 +00:00
Hypolite Petovan
9de6350154 Reorder search to try redirecting to post first 
- Pleroma's post page includes the author's feed which wrongly gets picked up as a contact
- Address https://libranet.de/display/0b6b25a8-1563-7ec0-7408-70b986546395
 2022-11-24 22:21:51 -05:00
Marek Bachmann
18f0d3d31e removed double blank 2022-11-25 01:03:34 +01:00
Marek Bachmann
f4e2c7a11d corrected typos in DocBlocks 2022-11-25 00:59:24 +01:00
Hypolite Petovan
313f3d8515
Merge pull request #12255 from annando/invalid-unfollow 
Silently quit on unfollow of invalid contacts
 2022-11-24 14:46:59 -05:00