1
0
Fork 0
Commit graph

35299 commits

Author SHA1 Message Date
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 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
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
Philipp 51b21b6709
Merge pull request #12278 from MrPetovan/bug/warnings
Address a couple of warnings
2022-11-27 00:31:01 +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
Hypolite Petovan 34418d790d Check for existence of $contact.photo_menu.edit in frio:contact/entry.tpl
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1327030221
2022-11-26 15:38:21 -05: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
Hypolite Petovan a95e93c725
Merge pull request #12272 from annando/issue-12133
Issue 12133: Account data can now be updated via API
2022-11-26 08:50:18 -05:00
Michael 08b9d11d46 Updated documentation 2022-11-26 09:00:35 +00:00
Michael acfc11c436 Issue 12133: Account data can now be updated via API 2022-11-26 08:56:24 +00:00
Hypolite Petovan 1cecc51796
Merge pull request #12271 from annando/api-suggestion
Issue 12266: APISuggestions should now work
2022-11-25 21:39:40 -05: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
Hypolite Petovan fe402c3850
Merge pull request #12270 from nupplaphil/bug/woodpecker_ci
Remove addon-sample.config.php from build pipeline
2022-11-25 18:58:20 -05:00
Philipp Holzer efc35ddb00
Remove addon-sample.config.php from build pipeline 2022-11-25 23:46:17 +01: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
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