tobias/friendica
1
0
Fork 0
Code Pull requests Activity
35266 commits 2 branches 61 tags 203 MiB
Commit graph

35266 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Hank Grabowski 733509561a Update Notify->iid to itemId for notification endpoint 2022-11-21 23:40:15 -05:00
Hypolite Petovan 6bf5c344f5
Merge pull request #12231 from HankG/fix-unfavourite-endpoint 
Fix unfavourite (and related) endpoints
 2022-11-21 16:51:43 -05:00
Hank Grabowski 548fd3201d The two endpoints for unfavoriting/liking (and related things) was failing because it wasn't using the correct uuid in item.php in processing the action. 2022-11-21 16:49:20 -05:00
Philipp d2ba254a5a
Merge pull request #12228 from MrPetovan/task/4090-move-mod-photos 
Create /profile/{nickname}/photos route
 2022-11-21 00:32:15 +01:00
Philipp 41be03a7c3
Merge pull request #12225 from MrPetovan/bug/10188-addon-config 
Remove config/addon-sample.config.php file in favor of per-addon configuration files
 2022-11-21 00:16:26 +01:00
Hypolite Petovan d4cbfeb54c
Update doc/Config.md from review suggestion 
Co-authored-by: Philipp <admin+Github@philipp.info>
 2022-11-20 18:14:37 -05:00
Hypolite Petovan 187a28abda Update main translation file after moving strings 2022-11-20 17:26:08 -05:00
Hypolite Petovan 77e87da441 Create /profile/{nickname}/photos route 
- Create new Profile\Photos\Index module class
- Update most references of the legacy /photos/{nickname} route
 2022-11-20 17:15:07 -05:00
Hypolite Petovan 6dcc964ed8 Fix string interpolation in Model\Photo::upload 2022-11-20 17:07:08 -05:00
Hypolite Petovan fa3db8737b Remove config/addon-sample.config.php file in favor of per-addon configuration files 
- Update documentation and .gitignore
 2022-11-20 14:34:32 -05:00
Tobias Diekershoff 9751cadfbf
Merge pull request #12226 from MrPetovan/bug/warnings 
Use guid from shared post in Protocol\Diaspora::getReshareDetails
 2022-11-20 19:42:11 +01:00
Hypolite Petovan d4bb5223a4 Use guid from shared post in Protocol\Diaspora::getReshareDetails 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1321194769
 2022-11-20 13:01:37 -05:00
Tobias Diekershoff eec48057dc
Merge pull request #12221 from MrPetovan/bug/warnings 
Fix various PHP 8 deprecations
 2022-11-20 08:21:06 +01:00
Tobias Diekershoff 70ea419fcc
Merge pull request #12218 from MrPetovan/bug/frion-search-items 
[frio] Improve search list display for web and mobile
 2022-11-20 08:14:42 +01:00
Tobias Diekershoff d1a85f1fa4
Merge pull request #12222 from MrPetovan/bug/12219-hovercard-stay-local 
Fix support for `/contact/123456/conversations` URLs in Module\Contact\Hovercard
 2022-11-20 08:10:42 +01:00
Tobias Diekershoff 99c6e65be4
Merge pull request #12223 from MrPetovan/task/12220-add-authorize_interaction-route 
Add support for Mastodon /authorize_interaction route
 2022-11-20 08:05:44 +01:00