bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
35484 commits 4 branches 62 tags 178 MiB
Commit graph

35484 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
1d00947bcd Don't fetch sugestions for the system user / catch error on contact timeline 2022-12-01 07:07:59 +00:00
Michael
146f874c2e Avoid 'Undefined array key "last-activity"' 2022-12-01 06:12:13 +00:00
Michael
8e0196fec3 Update the last activity in OAuth 2022-12-01 06:02:51 +00:00
Michael
431eb34a1c Deactivate setting last activity 2022-12-01 05:57:29 +00:00
Michael
5201d87b3f Reenable last acttivity update 2022-12-01 05:54:42 +00:00
Michael
910a76812a Reenable worker call 2022-12-01 05:53:18 +00:00
Michael
c56e4222dc Debug the failing test 2022-12-01 05:50:34 +00:00
Michael Vogel
13cc638062
Merge pull request #12305 from MrPetovan/bug/notices 
Check post existence before accessing its properties in Model\Post\UserNotification
 2022-12-01 06:45:50 +01:00
Michael
226e857387 API: The "reports" endpoint is partially supported 2022-12-01 05:40:32 +00:00
Hypolite Petovan
8012968506 Check post existence before accessing its properties in Model\Post\UserNotification 2022-11-30 19:30:36 -05:00
Michael
ed1a879b7b Use "utcNow" 2022-11-30 22:36:58 +00:00
Michael
f905220923 New field to show the day of the last activity 2022-11-30 22:34:50 +00:00
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
Hypolite Petovan
6b2a936f16
Merge pull request #12303 from HankG/fix-mastodon-api-dismiss-endpoint 
Fix broken dismiss endpoint on Mastodon notifications API
 2022-11-30 14:31:40 -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
Hypolite Petovan
35ca4961d2
Merge pull request #12267 from MarekBenjamin/show_image_upload_limit 
Show image size limit in Frio as "usagemessage" for photo_upload
 2022-11-30 12:24:51 -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
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
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
00808326c2 message.po 2022-11-30 04:39:00 +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
037e181f82 use the existing function for format byte values to KiB, MiB, GiB 2022-11-30 04:34:40 +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
Marek Bachmann
2794100cbc Fixed meaning of "maximagesize" = 0 --> infinity 2022-11-30 02:16:04 +01:00
Marek Bachmann
49db646922 Merge remote-tracking branch 'origin/show_image_upload_limit' into show_image_upload_limit 2022-11-30 01:58:32 +01:00
Marek Bachmann
0ea219f728 Use previously already available field.5 for short hand pattern ad admin page for maximagesize 2022-11-30 01:58:22 +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