Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-29 03:22:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
33287 commits 3 branches 64 tags 241 MiB
Commit graph

33287 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
4f2d659d42 Merge remote-tracking branch 'upstream/develop' into develop 2022-03-27 19:43:08 +00:00
Hypolite Petovan
e09e1b2336
Merge pull request #11378 from nupplaphil/feat/accept 
Add Default Accept for HTTP Calls
 2022-03-27 13:09:20 -04:00
Philipp
80a533ddab
Add Default Accept for HTTP Calls 2022-03-26 22:15:44 +01:00
Michael Vogel
c396e3099e
Merge pull request #11377 from tobiasd/20220325-pl 
PL translation update THX strebski
 2022-03-25 08:17:49 +01:00
Tobias Diekershoff
7bea941f3c
PL translation update THX strebski 2022-03-25 07:01:20 +01:00
Michael
0e6dcaebcc Merge branch 'develop' of github.com:annando/friendica into develop 2022-03-24 12:38:07 +00:00
Tobias Diekershoff
c1fd163b97
Merge pull request #11376 from annando/no-group 
Don't display Peertube groups as forums
 2022-03-24 13:19:34 +01:00
Michael
8c34c3b8ae Don't display Peertube groups as forums 2022-03-24 11:30:32 +00:00
Michael
7aec520b32 Don't display Peertube groups as forums 2022-03-24 11:29:50 +00:00
Tobias Diekershoff
1f0d828cd9
Merge pull request #11375 from annando/lemmy 
Improve the compatibility with Lemmy
 2022-03-24 12:13:13 +01:00
Michael
212eba327b Improve the compatibility with Lemmy 2022-03-24 10:57:55 +00:00
Michael Vogel
aa1ef0516d
Merge pull request #11374 from MrPetovan/bug/11371-settings-autocomplete 
Prevent unwarranted password manager auto-completion in settings form fields
 2022-03-24 05:39:49 +01:00
Hypolite Petovan
719f47932d Prevent unwarranted password manager auto-completion in settings form fields 2022-03-23 19:43:25 -04:00
Hypolite Petovan
ad1d11487e
Merge pull request #11373 from tobiasd/20220323-pl 
PL translation update THX strebski
 2022-03-23 15:15:54 -04:00
Tobias Diekershoff
ab60cf0572
PL translation update THX strebski 2022-03-23 20:12:47 +01:00
Hypolite Petovan
4b2cc546f1
Merge pull request #11372 from annando/issue-11368 
Issue 11368: Prevent namespace prefix warning
 2022-03-22 18:16:24 -04:00
Michael
6f43821ebf Issue 11368: Prevent namespace prefix warning 2022-03-22 21:07:35 +00:00
Hypolite Petovan
709e9dcf9c
Merge pull request #11370 from tobiasd/20220322-pl 
PL translation update THX strebski
 2022-03-22 14:47:41 -04:00
Tobias Diekershoff
5cb83900ff
PL translation update THX strebski 2022-03-22 19:28:23 +01:00
Hypolite Petovan
2438eb78dd
Merge pull request #11369 from annando/empty-item 
Prevent further processing of incoming posts when thay are rejected
 2022-03-22 08:54:20 -04:00
Hypolite Petovan
56d0a33286
Merge pull request #11367 from annando/title-cq 
Prioritize the title over the summary (content warning)
 2022-03-22 08:53:48 -04:00
Michael
53ba68e222 Remove "blubb" 2022-03-22 12:31:14 +00:00
Michael
45199b498d Prevent further processing of incoming posts when thay are rejected 2022-03-22 12:28:47 +00:00
Michael
13addaf901 Always provide the title variable 2022-03-22 07:07:33 +00:00
Michael
bbb4ffb7a0 Merge remote-tracking branch 'upstream/develop' into title-cq 2022-03-22 07:05:03 +00:00
Michael
be016b0c45 Prioritize the title over the content warning 2022-03-22 07:00:44 +00:00
Hypolite Petovan
5a4018a05b
Merge pull request #11366 from annando/pinned 
Issue 11310: Show pinned posts when not logged in
 2022-03-21 19:14:42 -04:00
Michael
a2a5f05a19 Issue 11310: Show pinned posts when not logged in 2022-03-21 22:58:23 +00:00
Hypolite Petovan
7c282c597d
Merge pull request #11364 from friendica/notification-links 
Fix link to post in notification
 2022-03-20 19:59:41 -04:00
Michael
7959bc1e63 Updated messages.po 2022-03-20 20:21:35 +00:00
Michael
4dace46159 Fix link to post in notification 2022-03-20 19:59:35 +00:00
Tobias Diekershoff
09e55c15e4
Merge pull request #11363 from annando/api-route 
API: Adds missing route for "conversation/show/id"
 2022-03-20 13:37:14 +01:00
Michael
85fce09b1a API: Adds missing route for "conversation/show/id" 2022-03-20 12:06:39 +00:00
Philipp
75a7ff9b11
Merge pull request #11362 from tobiasd/20220320-de 
DE translation updates
 2022-03-20 08:32:22 +01:00
Tobias Diekershoff
f66020e767
DE translation updates 2022-03-20 07:53:31 +01:00
Hypolite Petovan
e738428876
Merge pull request #11360 from annando/announce-notification 
Don't create empty announce notifications
 2022-03-19 14:53:34 -04:00
Michael
e4a5094c90 Don't show double introductions 2022-03-19 18:38:59 +00:00
Michael
91905bea89 Don't create empty announce notifications 2022-03-19 17:53:41 +00:00
Hypolite Petovan
014c7b5943
Merge pull request #11359 from annando/notification 
Avoid empty notifications / fixed link to the content
 2022-03-19 11:31:46 -04:00
Michael Vogel
fcad961e57
Merge pull request #11358 from tobiasd/20220319-ru 
RU translations THX Alexander An
 2022-03-19 16:30:34 +01:00
Michael
fb6a435a6a Avoid empty notifications / fixed link to the content 2022-03-19 15:25:00 +00:00
Tobias Diekershoff
111d42ce8f
RU translations THX Alexander An 2022-03-19 16:07:50 +01:00
Hypolite Petovan
a4a24e06a5
Merge pull request #11357 from annando/fetch-usage 
Improve the description of the federation statistics
 2022-03-19 10:46:29 -04:00
Michael
f9369141a4 Updated messages.po 2022-03-19 11:26:49 +00:00
Michael
351e9a307c Fixed placeholder 2022-03-19 11:24:09 +00:00
Michael
3f15a20e4a Updated messages.po 2022-03-19 11:21:51 +00:00
Michael
4e45987f74 Merge remote-tracking branch 'upstream/develop' into fetch-usage 2022-03-19 11:21:38 +00:00
Hypolite Petovan
4329f5381b
Merge pull request #11355 from annando/notifications 
Fixes for the notifications
 2022-03-19 06:52:04 -04:00
Michael Vogel
677cbf8aea
Merge pull request #11354 from MrPetovan/bug/notices 
Check array key existence in ActivityPub\Transmitter::createPermissionBlockForItem
 2022-03-19 10:56:25 +01:00
Michael
aef9cb9992 Moved "ignore" check to a better location 2022-03-19 09:48:50 +00:00