33780 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tobias Diekershoff	17877d9fd7	update FR translations THX kalon33	2022-06-07 06:32:01 +02:00
Tobias Diekershoff	e3183cb4b4	DE translation updats	2022-06-07 06:31:52 +02:00
Tobias Diekershoff	579a23ba6e	RU translations THX Alexander An	2022-06-07 06:31:35 +02:00
Tobias Diekershoff	64fac441a6	HU translation update THX Balázs Úr	2022-06-07 06:31:13 +02:00
Hypolite Petovan	21d4726619	Merge pull request #11615 from annando/api-markers ... API: Support for markers added	2022-06-06 18:00:00 -04:00
Michael	56e88d2c4c	Fix the spelling	2022-06-06 21:52:47 +00:00
Michael	19772f29f3	API: Support for markers added	2022-06-06 21:38:59 +00:00
Hypolite Petovan	90eeacde3c	Merge pull request #11613 from annando/updated ... Only update when new content arrives	2022-06-06 09:15:58 -04:00
Michael	d435203f72	Merge remote-tracking branch 'upstream/2022.05-rc' into updated	2022-06-06 11:58:40 +00:00
Hypolite Petovan	9c7568cffc	Merge pull request #11612 from annando/rearrange ... Rearrange the notification settings	2022-06-06 07:33:23 -04:00
Michael	069c1d0b35	Only update when new content arrives	2022-06-06 10:41:07 +00:00
Michael	9bb371850a	Different approach for empty values	2022-06-06 07:35:28 +00:00
Michael	a07e47f50c	Improved handling with empty user configuration	2022-06-06 05:43:24 +00:00
Michael	62701b49e1	Use constants	2022-06-06 04:44:29 +00:00
Hypolite Petovan	3f711b5301	Merge pull request #11611 from annando/writable ... Hopefully make threads writable	2022-06-05 21:31:49 -04:00
Michael	da33517a2d	Rearrange the notification settings	2022-06-05 21:19:21 +00:00
Michael	557b1125e2	Hopefully make threads writable	2022-06-05 20:38:05 +00:00
Tobias Diekershoff	e5802b7c30	Merge pull request #11610 from annando/issue-11602 ... Issue 11602: Fix error during contact merhe	2022-06-05 20:27:47 +02:00
Michael	1196df4895	Remove test	2022-06-05 18:16:50 +00:00
Michael	001aac9952	Issue 11602: Fix error during contact merhe	2022-06-05 18:15:10 +00:00
Tobias Diekershoff	9e37435ae6	Merge pull request #11609 from annando/fix-uid ... Fix notifications	2022-06-05 18:56:16 +02:00
Michael	9daeb552dd	Suppress dislikes	2022-06-05 16:54:29 +00:00
Michael	24559b711b	Notify about shared posts again	2022-06-05 16:26:20 +00:00
Michael	d242332aa4	Add the notify type to the notification query	2022-06-05 15:02:03 +00:00
Hypolite Petovan	7c3dcc6f1d	Merge pull request #11608 from annando/fix-uid ... Use the user id instead of "local_user()"	2022-06-05 10:38:23 -04:00
Michael	13e216032f	Use the user id instead of "local_user()"	2022-06-05 14:22:16 +00:00
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	fd48a8c9ab	Merge pull request #11601 from annando/issue-11594 ... Issue 11594: Ensure to create notifications in the user language	2022-06-04 16:52:26 +02:00
Tobias Diekershoff	327b29d794	Merge pull request #11600 from annando/no-visible-photo ... Don't make photo item visible	2022-06-04 16:51:21 +02:00
Michael	f1913b28e0	Issue 11594: Ensure to create notifications in the user language	2022-06-04 14:08:11 +00:00
Michael	db4ad7883f	Revert some of the last changes	2022-06-04 12:11:41 +00:00
Michael	3b2c2e5d33	Don't make photo item visible	2022-06-04 12:02:59 +00:00
Tobias Diekershoff	7684cd4f07	Merge pull request #11599 from annando/avatar ... Fix avatar for messages and feeds	2022-06-04 10:08:17 +02:00
Michael	50a0034744	Fix avatar for messages and feeds	2022-06-04 07:57:11 +00:00
Tobias Diekershoff	4a5d230aad	Merge pull request #11597 from annando/pinned-private ... Fix: Only public posts can be pinned	2022-06-04 08:33:38 +02:00
Michael	4108704ee3	Fix: Only public posts can be pinned	2022-06-04 06:11:32 +00:00
Michael	194f0f7058	No dropping	2022-06-03 20:14:38 +00:00
Hypolite Petovan	6e3b5d251e	Merge pull request #11596 from annando/visible-activities ... Fix: Like/Dislike/Reshare actions should now be visible	2022-06-03 15:54:49 -04:00
Michael	0aee9a054a	Fix: Like/Dislike/Reshare actions should now be visible	2022-06-03 17:40:06 +00:00
Tobias Diekershoff	69c8bd3b5e	Merge pull request #11593 from annando/avatar-basepath ... Ensure that the avatar base path exists	2022-06-03 15:04:21 +02:00
Michael	5442d09cc1	Ensure that the avatar base path exists	2022-06-03 05:28:10 +00:00
Philipp	e4c13bb1c7	Merge pull request #11590 from tobiasd/20220602-lng ... FR, RU translation updates	2022-06-02 08:37:07 +02: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	b794c599a9	Standards fixed	2022-06-01 22:18:18 +00:00