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

37629 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan
fc1a857045
Merge pull request #13253 from toddy15/develop 
Fix comment
 2023-07-05 11:41:18 -04:00
Dr. 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
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
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
Michael
75f8b3374e Improved basepath detection for Magic Auth 2023-06-18 17:18:40 +00:00
Michael
3951a77318 Set the owner for group posts 2023-06-18 16:52:49 +00:00
Michael
4f6c1ec556 Ensure to transmit the audience if the parent does so 2023-06-18 16:50:45 +00:00
Michael
4c3f2441f7 Display the contact alias if the URL is no HTTP link 2023-06-18 16:49:38 +00:00
Hypolite Petovan
721ffcfe06
Merge pull request #13223 from git-marijus/develop 
fix issue #13174
 2023-06-17 17:34:32 -04:00
git-marijus
0af73775be fix issue #13174 2023-06-17 22:31:25 +02:00
Michael
6d911a8f39 Better support for "audience" / simplified Lemmy processing 2023-06-15 22:04:28 +00:00
Hypolite Petovan
353be860b7
Merge pull request #13218 from anubis2814/develop 
[frio] Added content warning button
 2023-06-15 14:15:18 -04:00
anubis2814
db3604b479
Update Post.php 
made code neater
 2023-06-15 14:04:34 -04:00
anubis2814
ad225e4cff
Update Conversation.php 
made code neater.
 2023-06-15 14:02:54 -04:00
Anubis2814
1f06089e5e Added content warning button 2023-06-15 12:55:54 -04:00
Tobias Diekershoff
2468089d70
Merge pull request #13212 from jlamothe/cheshire 
fixed spelling of Cheshire
 2023-06-13 07:46:02 +02:00
Jonathan Lamothe
32755444ed fixed spelling of Cheshire 2023-06-12 23:45:46 -04:00
Hypolite Petovan
d0b8d78cad
Merge pull request #13208 from Quix0r/fixes/type-hints-indenting 
Added type-hints, reformatted arrays
 2023-06-09 16:33:44 -04:00