 Michael
|
771fe881ef
|
Use 20 maximum feed items as default
|
2020-03-22 15:22:48 +00:00 |
|
|
Michael
|
04eef79be0
|
Merge remote-tracking branch 'upstream/2020.03-rc' into loops
|
2020-03-22 15:00:14 +00:00 |
|
Michael Vogel
|
3a2082b840
|
Merge pull request #8444 from MrPetovan/bug/7134-remove-item-activity-relation
Remove extraneous relation on item-activity.id
|
2020-03-22 15:31:49 +01:00 |
|
 Hypolite Petovan
|
f2638ca65b
|
Remove extraneous relation on item-content.id
|
2020-03-22 10:28:13 -04:00 |
|
|
Hypolite Petovan
|
bfa598bb77
|
Merge pull request #8445 from annando/issue-8371-again
Issue 8371: Use correct user id for photo upload
|
2020-03-22 10:24:51 -04:00 |
|
|
Michael
|
8bde222fca
|
Issue 8371: Use correct user id for photo upload
|
2020-03-22 14:07:34 +00:00 |
|
|
Hypolite Petovan
|
f50a39d19d
|
Remove extraneous relation on item-activity.id
|
2020-03-22 10:04:30 -04:00 |
|
|
Michael
|
b68a16e07a
|
"repair diaspora" fixed some problem long time ago. It is not needed anymore
|
2020-03-22 13:12:48 +00:00 |
|
|
Michael
|
bc069c8ebf
|
Prevent endless loops and long running feed processing
|
2020-03-22 13:05:35 +00:00 |
|
 Tobias Diekershoff
|
7bc4427c09
|
Merge pull request #8442 from annando/issue-8371-logging2
Issue 8371: More enhanced logging
|
2020-03-22 14:02:07 +01:00 |
|
|
Michael
|
fc7ac75ba4
|
Issue 8371: More enhanced logging
|
2020-03-22 12:51:37 +00:00 |
|
|
Tobias Diekershoff
|
9f8ca846eb
|
Merge pull request #8441 from annando/issue-8371-logging
Issue 8371: Enhanced logging for picture problem
|
2020-03-22 11:48:25 +01:00 |
|
|
Michael
|
505aa95c3d
|
Fixed wrong contact permisssion
|
2020-03-22 10:05:52 +00:00 |
|
|
Michael
|
f8d20b365f
|
We should use "self"
|
2020-03-22 09:59:06 +00:00 |
|
|
Michael
|
2c6c6579af
|
Issue 8371: Enhanced logging for picture problem
|
2020-03-22 09:57:46 +00:00 |
|
|
Michael Vogel
|
5d045ccbc4
|
Merge pull request #8439 from tobiasd/20200322-notifications
a l10n call too much
|
2020-03-22 10:12:12 +01:00 |
|
|
Tobias Diekershoff
|
a16dba2941
|
a l10n call too much
|
2020-03-22 08:43:06 +01:00 |
|
|
Hypolite Petovan
|
7d1e0a72c1
|
Merge pull request #8435 from annando/issue-8371-a
Issue 8371: Alternate Solution
|
2020-03-21 17:28:13 -04:00 |
|
|
Michael Vogel
|
70e125dde5
|
Merge pull request #8437 from tobiasd/20200321-pl
PL translation update THX waldis
|
2020-03-21 20:26:15 +01:00 |
|
|
Tobias Diekershoff
|
b191c437bb
|
PL translation update THX waldis
|
2020-03-21 20:08:22 +01:00 |
|
|
Michael
|
6de2b0f6d4
|
Reworked permission stuff
|
2020-03-21 18:30:40 +00:00 |
|
|
Michael
|
d04c9b4930
|
Merge remote-tracking branch 'upstream/2020.03-rc' into issue-8371-a
|
2020-03-21 18:08:33 +00:00 |
|
|
Michael
|
4f61af2f5f
|
Issue 8371: Alternate Solution
|
2020-03-21 16:36:40 +00:00 |
|
|
Hypolite Petovan
|
1833bee00d
|
Merge pull request #8434 from tobiasd/20200321-msg
regen messages.po
|
2020-03-21 11:38:10 -04:00 |
|
|
Tobias Diekershoff
|
ec6c338257
|
regen messages.po
|
2020-03-21 15:23:42 +01:00 |
|
|
Hypolite Petovan
|
efb90f5a9c
|
Merge pull request #8433 from annando/issue-8432-translations
Issue 8432: Make notifications translatable
|
2020-03-21 07:54:05 -04:00 |
|
|
Michael
|
83a9970891
|
Issue 8432: Make notifications translatable
|
2020-03-21 11:48:20 +00:00 |
|
|
Hypolite Petovan
|
3cc90f9503
|
Merge pull request #8428 from annando/issue-8371
Issue 8371 again: Fallback for item permissions
|
2020-03-20 10:18:58 -04:00 |
|
|
Michael
|
2234a095c6
|
Issue 8371 again: Fallback for item permissions
|
2020-03-20 04:52:04 +00:00 |
|
|
Hypolite Petovan
|
6b5e983d9a
|
Merge pull request #8427 from annando/issue-8371
Issue 8371: Ensure to always have permissions
|
2020-03-19 18:52:29 -04:00 |
|
|
Michael
|
29bd37cda2
|
Issue 8371: Ensure to always have permissions
|
2020-03-19 21:55:31 +00:00 |
|
|
Hypolite Petovan
|
ba33b453ea
|
Merge pull request #8424 from tobiasd/20200316-ru
RU translations THX Alexander An
|
2020-03-16 10:27:50 -04:00 |
|
|
Tobias Diekershoff
|
88d0a12a83
|
RU translations THX Alexander An
|
2020-03-16 10:21:40 +01:00 |
|
|
Hypolite Petovan
|
aab1320304
|
Merge pull request #8419 from tobiasd/20200314-de
DE translation update
|
2020-03-14 08:45:37 -04:00 |
|
|
Tobias Diekershoff
|
730be894c8
|
DE translation update
|
2020-03-14 13:07:35 +01:00 |
|
|
Hypolite Petovan
|
4a5f1735c7
|
Merge pull request #8418 from tobiasd/20200313-ru
Issue #8417 RU translation
|
2020-03-13 09:52:28 -04:00 |
|
|
Tobias Diekershoff
|
8e0b91b64d
|
Issue #8417 RU translation
|
2020-03-13 13:40:25 +01:00 |
|
|
Hypolite Petovan
|
d92b9a79e2
|
Merge pull request #8413 from annando/fix-warning
Avoid notice in gcontact.php
|
2020-03-12 17:16:59 -04:00 |
|
|
Michael
|
505cca942b
|
Fix wrong variable name
|
2020-03-12 18:58:48 +00:00 |
|
|
Michael
|
e1786b6747
|
Avoid warning in gcontact.php
|
2020-03-12 17:31:28 +00:00 |
|
|
Hypolite Petovan
|
96b5df1aed
|
Merge pull request #8410 from annando/acessible-pictures
Set the picture accesibility separate from the permissions
|
2020-03-12 10:45:27 -04:00 |
|
|
Michael
|
5479321550
|
Merge remote-tracking branch 'upstream/2020.03-rc' into acessible-pictures
|
2020-03-12 09:31:52 +00:00 |
|
|
Michael
|
7863406080
|
Prevent "null" permissions on photos
|
2020-03-12 06:20:49 +00:00 |
|
|
Hypolite Petovan
|
59e374d66a
|
Merge pull request #8409 from annando/fix-8401
Fix 8401: Don't let dbstructure think that it needs to update the table
|
2020-03-11 18:59:53 -04:00 |
|
|
Michael
|
88522fc832
|
Set the picture accesibility separate from the permissions
|
2020-03-11 21:36:29 +00:00 |
|
|
Michael
|
82589a29cd
|
Fix 8401: Don't let dbstructure think that it needs to update the table
|
2020-03-11 20:49:23 +00:00 |
|
|
Michael Vogel
|
7625eba86d
|
Merge pull request #8407 from MrPetovan/bug/8358-markdown-double-decode
Remove extraneous HTML decode in Markdown::toBBCode
|
2020-03-11 21:18:36 +01:00 |
|
|
Hypolite Petovan
|
bcf974f97e
|
Add test for extraneous HTML decode removed in Markdown::toBBCode
|
2020-03-11 09:02:26 -04:00 |
|
|
Hypolite Petovan
|
5c726493ae
|
Remove extraneous HTML decode in Markdown::toBBCode
|
2020-03-11 09:01:50 -04:00 |
|
|
Hypolite Petovan
|
b0dc3d6cf9
|
Improve Babel code
- Add Diaspora source text choice
- Simplify escaped display
|
2020-03-11 09:01:17 -04:00 |
|