Commit graph

26710 commits

Author SHA1 Message Date
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
Tobias Diekershoff
6168c8be1d and another one 2020-03-20 09:22:25 +01:00
Tobias Diekershoff
b1eb1c9e91 removed a duplicate 2020-03-20 09:21:12 +01:00
Tobias Diekershoff
7d38a45ba3 updated the credits for 2020.03 2020-03-20 09:19:19 +01: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
Michael Vogel
6d199965ba
Merge pull request #8406 from MrPetovan/bug/8404-vcard-normalization
Normalize vcard across themes display after profile fields reorganization
2020-03-11 13:55:03 +01:00
Hypolite Petovan
49b71546ec Normalize vcard across themes display after profile fields reorganization 2020-03-11 08:19:28 -04:00
Michael Vogel
e24e24688f
Merge pull request #8403 from MrPetovan/bug/8393-acl-deny-allow
Use correct variable name for deny input value concatenation
2020-03-11 07:48:00 +01:00
Hypolite Petovan
bbb397db20 Use correct variable name for deny input value concatenation 2020-03-11 00:42:37 -04:00
Hypolite Petovan
737b04d7e2
Merge pull request #8401 from annando/gfollower-epilogue
Reduce the load of "gfollower"
2020-03-10 18:52:31 -04:00
Michael
59f58f999d Small fixes 2020-03-10 22:51:05 +00:00
Michael
c261457b03 Store the interaction date as well. 2020-03-10 22:04:03 +00:00
Michael
07a487cfdc Fixed indentation 2020-03-10 21:21:48 +00:00
Michael
f27900ad78 Reduce the load of "gfollower" 2020-03-10 21:10:59 +00:00
Hypolite Petovan
89121b869c
Merge pull request #8397 from annando/addon-concurrent
Fix uninstall of installed addons
2020-03-10 16:13:14 -04:00
Michael
a0f0558fec Use the uninstall function 2020-03-10 20:00:44 +00:00
Hypolite Petovan
280c508599
Merge pull request #8398 from annando/issue-8383-2
Issue 8383 (again): Finally fixes the double scheme problem
2020-03-10 10:17:04 -04:00
Michael
d4480ae4be Simplified code 2020-03-10 13:13:43 +00:00
Tobias Diekershoff
5659420a34
Merge pull request #8399 from annando/poll-mail
Polling Mails is now done with a higher priority
2020-03-10 12:01:16 +01:00
Michael
b10e334c53 Polling Mails is now done with a higher priority 2020-03-10 09:44:26 +00:00
Michael
6e26ece3de Issue 8383 (again): Finally fixes the double scheme problem 2020-03-10 06:22:30 +00:00
Michael
8e421f0893 Fix uninstall of installed addons 2020-03-09 23:28:37 +00:00