marcusxs/friendica
1
0
Fork 0
forked from friendica/friendica
Code Pull requests Activity
36,988 commits 3 branches 67 tags 205 MiB
Commit graph

7,386 commits

Author SHA1 Message Date
Hypolite Petovan
28ce00c102
 		Merge pull request #11606 from annando/issue-11566 
Issue 11566: More detailled notification configuration
 2022-06-05 08:13:34 -04:00
Michael Vogel
913f5ada27
 		Merge pull request #11603 from tobiasd/20220605-lng 
DE, HU translation updates
 2022-06-05 13:46:33 +02:00
Michael
57b8708425 Issue 11566: More detailled notification configuration 2022-06-05 11:41:08 +00:00
Tobias Diekershoff
b6d2d71cbd
 		added HU translation THX Balázs Úr 2022-06-05 10:08:01 +02:00
Tobias Diekershoff
c3024e5b92
 		DE translation updats 2022-06-05 10:07:44 +02:00
Hypolite Petovan
b1afcb5ebf
 		Merge pull request #11588 from annando/mergecontact 
New command to merge duplicated contacts
 2022-06-04 15:34:37 -04:00
Tobias Diekershoff
ec07a31fb3
 		update FR translations THX kalon33 2022-06-02 07:00:37 +02:00
Tobias Diekershoff
5d4aec176e
 		RU translations THX Alexander An 2022-06-02 07:00:22 +02:00
Michael
e46354a522 New command to merge duplicated contacts 2022-06-01 22:11:03 +00:00
Tobias Diekershoff
078334ce53
 		HU translation updated THX Balázs Úr 2022-06-01 18:43:36 +02:00
Tobias Diekershoff
8c4ec6adde
 		DE translation updates 2022-06-01 05:46:32 +02:00
Michael
7b219718c4 Fix: Use correct follow notification texts 2022-05-31 14:02:43 +00:00
Tobias Diekershoff
d7eb78e65e
 		DE translation updates 2022-05-30 16:04:07 +02:00
Tobias Diekershoff
6ec812208f
 		update FR translations THX kalon33 2022-05-30 16:04:00 +02:00
Tobias Diekershoff
406b3f14dd
 		HU translation updated THX Balázs Úr 2022-05-30 16:03:45 +02:00
Hypolite Petovan
121d26999c Updated main translation file after moving strings 2022-05-29 13:58:33 -04:00
Hypolite Petovan
1301a53f20 Remove relocation form from Admin Site settings 2022-05-29 13:15:23 -04:00
Tobias Diekershoff
efa15ab0b8
 		HU translation updated THX Balázs Úr 2022-05-28 07:09:07 +02:00
Tobias Diekershoff
cf91734f4f
 		DE translation updates 2022-05-27 07:08:48 +02:00
Hypolite Petovan
d4631176b2
 		Merge pull request #11563 from annando/avatar-error 
Issue-11560: Fix error when creating avatar cache file
 2022-05-26 18:58:49 -04:00
Michael
4475b3ff39 Updated messages.po 2022-05-26 20:01:07 +00:00
Hypolite Petovan
1d29025091
 		Merge pull request #11559 from tobiasd/20220526-lng 
DE, RU, ZH CN translation updates
 2022-05-26 10:24:54 -04:00
Tobias Diekershoff
cb5b6f345e
 		update to the zh-cn translation THX shykana 2022-05-26 16:18:11 +02:00
Tobias Diekershoff
314431507d
 		RU translations THX Alexander An 2022-05-26 16:17:58 +02:00
Tobias Diekershoff
620352d1a2
 		DE translation updates 2022-05-26 16:17:29 +02:00
Hypolite Petovan
ae3acba231
 		Merge pull request #11549 from annando/move-to-avatar-cache 
Console command to move avatars to the avatar cache
 2022-05-25 09:03:12 -04:00
Michael
e8864653d8 Merge remote-tracking branch 'upstream/2022.05-rc' into move-to-avatar-cache 2022-05-25 05:38:50 +00:00
Tobias Diekershoff
737d9e7a58
 		HU translation updated THX Balázs Úr 2022-05-25 07:23:59 +02:00
Tobias Diekershoff
2a0ab3f0f1
 		update FR translations THX kalon33 2022-05-25 07:21:04 +02:00
Michael
2fbfc0633a Fixed placeholder 2022-05-24 20:12:39 +00:00
Michael
d3709d8497 Delete on invalid 2022-05-24 20:02:54 +00:00
Michael
fb0e31791f updated messages.po 2022-05-24 19:09:36 +00:00
Michael
f764ab7429 Improved messages 2022-05-24 17:33:10 +00:00
Tobias Diekershoff
9b860f4051
 		update FR translations THX kalon33 2022-05-24 07:51:23 +02:00
Michael
d6242aacf6 Console command to move avatars to the avatar cache 2022-05-23 12:15:30 +00:00
Tobias Diekershoff
d858aa86e5
 		PL translation update THX strebski 2022-05-20 13:59:55 +02:00
Tobias Diekershoff
e151e5958f
 		DE translation updates 2022-05-19 12:49:27 +02:00
Tobias Diekershoff
b18880221a
 		Merge pull request #11531 from annando/display-polls 
Improved poll texts for different conditions
 2022-05-18 08:16:41 +02:00
Tobias Diekershoff
f07422634a
 		DE translation updates 2022-05-16 18:36:24 +02:00
Michael
62a1cf257e Improved poll texts for different conditions 2022-05-16 06:04:46 +00:00
Michael
2dc9b4eda2 Vote text changed 2022-05-16 05:31:53 +00:00
Michael
1555c82196 Translation updated 2022-05-16 05:07:28 +00:00
Michael
a63caefe3d Polls are now displayed 2022-05-16 04:55:15 +00:00
Tobias Diekershoff
dfeb2e9a62
 		update to the zh-cn translation THX gudzpoz 2022-05-12 14:29:05 +02:00
Tobias Diekershoff
ce7bf8524d
 		update to the zh-cn translation THX gudzpoz 2022-05-12 14:27:03 +02:00
Tobias Diekershoff
d816f02ab8
 		[frio] import contacts form was missing the enctype 
fixes #11492 hopefully

For uploading files, the enctype for the form has to be set to `multipart/form-data`. Frio was missing this specification, other themes inherit it from the default template.
 2022-05-11 17:28:57 +02:00
Tobias Diekershoff
a7237ac036
 		DE translation updates 2022-05-03 15:25:09 +02:00
Tobias Diekershoff
8bf806c550
 		pump version to 2022.05-rc 2022-05-03 07:24:19 +02:00
Hypolite Petovan
196a381a52
 		Merge pull request #11463 from tobiasd/20220501-lng 
DA DK translation added, HU PL and RU translations updated
 2022-05-01 08:06:17 -04:00
Tobias Diekershoff
815b76db8b
 		DA DK translation added THX atjn 2022-05-01 10:33:47 +02:00