mexon/friendica
1
0
Fork 0
Code Pull requests Activity
37693 commits 5 branches 60 tags 188 MiB
Commit graph

37693 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan 9678618dd4
Merge pull request #13227 from BirdboyBolu/develop 
Update Circles-and-Privacy.md
 2023-07-08 22:20:57 -04:00
Hypolite Petovan 6ac734d39d
Apply suggestions from code review 
- Remove superfluous plural
- Remove condescending language
 2023-07-08 22:20:47 -04:00
Hypolite Petovan 706444bdb2 Decouple conversation creation from rendering 
- This allows to separately obtain a list of threads for rendering without having to deal with an already-formed HTML output
 2023-07-08 16:57:52 -04:00
Hypolite Petovan 31fbe70ec7
Merge pull request #13261 from annando/id-uri-id-chaos 
Fix id/uri-id chaos in API calls
 2023-07-08 09:15:23 -04:00
Michael ef309cbcd3 Fix id/uri-id chaos in API calls 2023-07-08 07:55:18 +00:00
Hypolite Petovan 755bbac496
Merge pull request #13254 from nupplaphil/bug/fix_tests 
Fix php unit test with PHP 8.2
 2023-07-05 19:10:55 -04:00
Philipp Holzer f68dd99518
Some more deprecation fixups 2023-07-05 23:16:01 +02:00
Philipp Holzer 00cd346255
Fix XML deprecation 2023-07-05 23:15:36 +02:00
Philipp Holzer f693032109
Fix dynamic properties in API\Twitter\User object 2023-07-05 23:15:23 +02:00
Philipp Holzer 5fbdcd4a26
Fix PHPUnit 10 deprecations 2023-07-05 23:15:23 +02:00
Philipp Holzer 037dac988e
Update json-ld dependency 2023-07-05 21:29:12 +02:00
Hypolite Petovan 508d1923f1
Merge pull request #13252 from toddy15/woodpecker 
Update PHP versions and add PHP 8.2 for testing
 2023-07-05 15:06:18 -04:00
Hypolite Petovan fc1a857045
Merge pull request #13253 from toddy15/develop 
Fix comment
 2023-07-05 11:41:18 -04:00
Tobias Quathamer d2efdbd7ab Fix comment 2023-07-05 16:48:03 +02:00
Hypolite Petovan 1407a2883c
Merge pull request #13249 from annando/incoming-groups 
Incoming posts from Lemmy to groups are now working
 2023-07-05 10:24:51 -04:00
Hypolite Petovan 3e1c280a3c
Merge pull request #13250 from Raroun/develop 
fixes registration link in invitations
 2023-07-05 10:08:42 -04:00
Tobias Quathamer a35f281123 Update PHP versions and add PHP 8.2 for testing 2023-07-05 14:06:28 +02:00
Raroun 58573fe329 fixes registration link in invitations 2023-07-05 10:12:10 +02:00
Michael dc28a65e21 Incoming posts from Lemmy to groups are now working 2023-07-04 21:23:03 +00:00
Hypolite Petovan 394a351784
Merge pull request #13248 from Quix0r/features/config-api-mastodon-banner 
Configuration key api_mastodon_banner added
 2023-07-03 16:30:58 -04:00
Roland Häder 9f1c93eb91
Changes: 
- renamed 'api_mastodon_banner' to 'mastodon_banner' and moved it to 'api'
  configuration group
 2023-07-03 19:55:47 +02:00
Roland Häder c5a52271df
Added: 
- config key 'config', 'api_mastodon_banner', see discussion at https://b65.me.in/display/67fef576-1564-a27a-405e-c17705255720
- the administrator can now customize it for Mastodon contacts
- credits goes to @betamax65@b65.me.in
 2023-07-03 14:59:26 +02:00
Hypolite Petovan 1f63fe96c5
Merge pull request #13244 from annando/kbin 
"kbin" now has got an own section in the federation statistics
 2023-06-29 09:26:04 -04:00
Michael 283a33715f "kbin" hos now got an own section in the federation statistics 2023-06-29 08:28:02 +00:00
Tobias Diekershoff 23992c31c6
Merge pull request #13237 from annando/group-circle 
Added group detection for via exclusive mentions
 2023-06-27 06:19:21 +02:00
Tobias Diekershoff 302619a5de
Merge pull request #13238 from annando/issue-13221 
Issue 13221: Diaspora posts are now stored correctly
 2023-06-27 06:17:44 +02:00
Michael cab469621d Issue 13221: Diaspora posts are now stored correctly 2023-06-26 19:44:14 +00:00
Michael f6b9f8d476 Added group detection for via exclusive mentions 2023-06-26 19:37:20 +00:00
Hypolite Petovan 582e05fcff
Merge pull request #13235 from annando/group-circle 
Dedicated circle name for groups
 2023-06-26 07:49:20 -04:00
Michael d2b02d07b4 Invert condition 2023-06-26 05:32:33 +00:00
Michael 8d5876d5f2 Set the group as owner for "group only" postings 2023-06-25 22:14:35 +00:00
Hypolite Petovan 7edaeb215d
Merge pull request #13233 from GidiKroon/feature/add-vary-header 
Add Vary header in case of content negotiation
 2023-06-25 17:56:19 -04:00
Michael 8c0a19755c Fix spacing 2023-06-25 21:02:14 +00:00
Michael e562dbd59c Dedicated circle name for groups 2023-06-25 20:37:11 +00:00
Gidi Kroon 40783db161 Make requested changes 2023-06-25 20:54:04 +02:00
Hypolite Petovan 9f9898d47a
Merge pull request #13234 from annando/unseen 
Fix: Unseen marker wasn't set / Don't mark activities as unseen
 2023-06-25 09:50:35 -04:00
Michael 420bd9bcf9 Fix: Unseen marker wasn't set / Don't mark activities as unseen 2023-06-25 13:33:01 +00:00
Gidi Kroon 6a5266c6b8 Add Vary header in case of content negotiation 
Sometimes we return different content depending on whether JSON, XML or
HTML was requested in the Accept request header. The Vary response
header should list that header in these cases, to allow caching
frameworks to determine what to cache.
 2023-06-25 03:22:41 +02:00
Philipp ff1409e626
Merge pull request #13231 from AlfredSK/AlfredSK-fix-typo-alias 
Fiy typo in author-alias
 2023-06-24 15:45:17 +02:00
Steffen K9 30ce6f1ed3
Fiy typo in author-alias 
Added a missing `a` .
 2023-06-24 12:38:14 +02:00
Hypolite Petovan f9f85e3865
Merge pull request #13230 from annando/warnings 
Fix warnings because of missing field
 2023-06-23 17:54:22 -04:00
Michael 201d5ac364 Fix warning "Undefined array key "alias"" 2023-06-23 21:50:35 +00:00
Michael 0da2391c49 Fix warnings because of missing field 2023-06-23 21:27:34 +00:00
Hypolite Petovan b731f8a0ad
Merge pull request #13226 from annando/lemmy 
Better support for "audience" / simplified Lemmy processing
 2023-06-23 17:12:38 -04:00
Michael 968c935bf7 Changes variable names / fetch the alias / improved group handling 2023-06-23 21:05:45 +00:00
Hypolite Petovan 2bdb492834
Merge pull request #13229 from HankG/fix-mastodon-status-context-returning-deleted-statuses 
Fix Mastodon API Status->Context endpoint so doesn't return deleted statuses
 2023-06-22 23:40:43 -04:00
Hank Grabowski 031ef6a05a Fix Mastodon API Status->Context endpoint so doesn't return deleted statuses 2023-06-22 21:56:38 -04:00
Boluwatife Victor 05a324fba4
Update Circles-and-Privacy.md 
I corrected several typo errors in the doc to improve readability
 2023-06-22 12:35:02 +01:00
Michael 8a50101eea Merge remote-tracking branch 'upstream/develop' into lemmy 2023-06-18 17:38:39 +00:00
Michael 8a6ff014d6 Updated database.sql / messages.po 2023-06-18 17:34:19 +00:00