keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
35282 commits 4 branches 0 tags 179 MiB
Commit graph

35282 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marek Bachmann
907deed523 introduced getBytesFromShorthand function to covert from shorthand notation to int 2022-11-26 21:43:31 +01:00
Marek Bachmann
c4c1bd2908 changed var name 2022-11-25 23:36:28 +01:00
Marek Bachmann
74bab60989 message.po once more 2022-11-25 23:01:25 +01:00
Marek Bachmann
bb67f6e219 Added check if upload_max_filesize (php.ini) or friendica option 'maxfilesize' is dominant for the actual image upload limit and print out the lower (relevant) one. 2022-11-25 22:57:06 +01:00
MarekBenjamin
9dd1cf8316
Update mod/photos.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-25 21:53:32 +01:00
Marek Bachmann
c11e2b0795 updated messages.po 2022-11-25 19:55:43 +01:00
Marek Bachmann
d402fe364e Show image size limit in Frio as "usagemessage" for photo_upload 2022-11-25 19:44:09 +01: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
Michael Vogel
7c7cb8373c
Merge pull request #12254 from MrPetovan/bug/reorder-search 
Reorder search to try redirecting to post first
 2022-11-25 06:11:46 +01: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
Hypolite Petovan
849ce8f203
Merge pull request #12261 from MarekBenjamin/develop 
Correct multiple times coppied typos in the DocBlocks of DBA.php
 2022-11-24 19:18:28 -05:00
Marek Bachmann
18f0d3d31e removed double blank 2022-11-25 01:03:34 +01:00
Marek Bachmann
62ec2b5610 Merge remote-tracking branch 'origin/develop' into develop 2022-11-25 01:00:06 +01:00
Marek Bachmann
f4e2c7a11d corrected typos in DocBlocks 2022-11-25 00:59:24 +01:00
Philipp
3e5a820679
Merge pull request #12259 from MarekBenjamin/nginx_template_improvements 
Nginx template improvements
 2022-11-24 23:39:32 +01:00
Marek Bachmann
bd7582e841 Merge remote-tracking branch 'origin/nginx_template_improvements' into nginx_template_improvements 2022-11-24 23:08:07 +01:00
Marek Bachmann
7effc07fd6 typo 2022-11-24 23:07:55 +01:00
MarekBenjamin
32eb50506d
Update mods/sample-nginx-certbot.config 
Damn typos, I am too used to use autocorrect, need to learn again to proofread my own texts! Thank you very much! <3

Co-authored-by: Philipp <admin+Github@philipp.info>
 2022-11-24 23:07:27 +01:00
MarekBenjamin
960477cfaa
Merge branch 'friendica:develop' into nginx_template_improvements 2022-11-24 22:58:18 +01:00
Marek Bachmann
2f29031f2a content of sample-nginx-certbot.config 2022-11-24 22:57:09 +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
Michael
53b46855ef return "null" 2022-11-24 19:45:45 +00:00
Marek Bachmann
9f70c2a1d7 Added sample-nginx-cerbot.config to easly configure nginx to use ssl for friendica using certbot 2022-11-24 20:08:49 +01:00
Marek Bachmann
33088b3446 Replaced hostname in rewrite url for forwarding http to https by $server_name variable instead of hard coded example.com url 
Updated default PHP-FPM path from 7.0 to 7.4
 2022-11-24 19:21:18 +01:00
Hypolite Petovan
e1b259fc4c
Merge pull request #12256 from annando/issue-12189 
Issue 12189: Quote share a feed now shares the linked feed url
 2022-11-24 08:01:42 -05:00
Michael
c88125348f Issue 12189: Quote share a feed now shares the linked feed url 2022-11-24 06:36:08 +00:00
Michael
6a434588a9 Silently quit on unfollow of invalid contacts 2022-11-24 05:17:14 +00:00
Hypolite Petovan
32847f3398
Merge pull request #12251 from annando/remote-self 
"MIRROR_FORWARDED" is no more
 2022-11-23 17:18:20 -05:00
Michael
3ee594bb1f Updated database.sql 2022-11-23 22:05:36 +00:00
Michael
a6ff817f47 Update added 2022-11-23 21:47:47 +00:00
Michael
0bd0046b9f Merge remote-tracking branch 'upstream/develop' into remote-self 2022-11-23 21:11:09 +00:00
Michael
8bbf3f3699 "MIRROR_FORWARDED" is no more 2022-11-23 21:10:57 +00:00
Hypolite Petovan
0d1869be7d
Merge pull request #12248 from MarekBenjamin/ImageUploadSizeSettingInformation 
Added information that max image upload size on admin page does not a…
 2022-11-23 13:31:14 -05:00
Marek Bachmann
32aa8bd198 Added information that max image upload size on admin page does not affect server-side upload limits 2022-11-23 18:17:33 +01:00
Michael Vogel
1f08b2c1c0
Merge pull request #12244 from MrPetovan/bug/warnings 
Address various Warning messages
 2022-11-23 17:50:25 +01:00
Hypolite Petovan
14ebc4a821 Ensure $owner is set in ActivityPub\Transmitter::sendContactReject 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1289535020
 2022-11-23 11:05:36 -05:00
Hypolite Petovan
7c6d54c989 Ensure $attachment has a width and a height when it's an image in Mastodon\Attachment 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1323274513
 2022-11-23 11:00:15 -05:00
Hypolite Petovan
a5af1408d6 Ward against the possible case that $actor is empty in ActivityPub\Processor::createItem 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1323273452
 2022-11-23 10:47:51 -05:00
Hypolite Petovan
a8eabae12f Ensure $owner is set in ActivityPub\Transmitter::sendActivity 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1322704863
 2022-11-23 10:40:41 -05:00
Hypolite Petovan
8e67d28997 Return early if user contact doesn't exist in Mastodon\Notification::getType 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1321804594
 2022-11-23 10:35:49 -05:00
Hypolite Petovan
c356c962f1
Merge pull request #12243 from annando/remote-self 
No more automated posts via mod/item.php
 2022-11-23 10:00:06 -05:00
Michael
7b563fd307 Tempory fix removed 2022-11-23 14:17:39 +00:00
Michael
c4aaa08693 Updated messages.po 2022-11-23 14:16:13 +00:00
Michael
352b7a0ac3 "MIRROR_FORWARDED" is removed 2022-11-23 14:00:34 +00:00
Michael
25992b063a Merge remote-tracking branch 'upstream/develop' into no-api-post 2022-11-23 06:28:24 +00:00
Michael
f600f68907 No more automated posts via mod/item.php 2022-11-23 06:27:40 +00:00
Hypolite Petovan
5501f703ae
Merge pull request #12240 from MarekBenjamin/patch-2 
Update sample-nginx.config
 2022-11-22 18:19:13 -05:00
MarekBenjamin
3d7e4cb9f4
Update sample-nginx.config 
Removed  `ssl on`  in line 54 directive since it is deprecated and already activated with the `listen 443 ssl;`  directive in line 51
 2022-11-22 22:56:29 +01:00
Hypolite Petovan
9fb447fefd
Merge pull request #12234 from HankG/fix-friendica-notification-seen-endpoint 
Update Notify->iid to itemId for notification endpoint
 2022-11-22 00:32:44 -05:00