Commit graph

26790 commits

Author SHA1 Message Date
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
Michael Vogel
2b5ef80912
Merge pull request #8395 from AlfredSK/AlfredSK-remove-checkbox
Remove orphaned checkbox for compose page
2020-03-09 21:37:06 +01:00
Steffen K9
61f0fb9dcf
Remove orphaned checkbox for compose page 2020-03-09 21:22:10 +01:00
Michael Vogel
d19bc3116c
Merge pull request #8392 from MrPetovan/bug/fatal-errors
Ensure non-NULL values in $data array in Contact::updateAvatar
2020-03-09 20:44:18 +01:00
Hypolite Petovan
07dde8deb8 Remove unused return value of Contact::updateAvatar 2020-03-09 11:39:48 -04:00
Hypolite Petovan
89534b5be3 Ensure non-NULL values in $data array in Contact::updateAvatar
- Throw Exception instead of returning false if contact doesn't exist
- Address https://github.com/friendica/friendica/issues/7998#issuecomment-596271239
2020-03-09 11:13:09 -04:00
Hypolite Petovan
2702732308 Import FriendicaNetwork\HTTPException in Model\Contact 2020-03-09 11:11:06 -04:00
Hypolite Petovan
8d9d8512ce
Merge pull request #8385 from annando/issue-8383
Issue 8383: Fixes probing requests with doubled protocols
2020-03-09 10:11:19 -04:00
Michael Vogel
f68553c99c
Merge pull request #8391 from tobiasd/20200309-de
DE, FR, JA, ZH-CN translation updated
2020-03-09 12:42:13 +01:00
Tobias Diekershoff
c8328a8446 update to the zh-cn translation THX Tomacat 2020-03-09 11:14:31 +01:00
Tobias Diekershoff
4683cfee12 updated JA translation THX Ozero Dien 2020-03-09 11:13:58 +01:00
Tobias Diekershoff
53cd36885d update FR translations THX Pbutterflyoffire_temp 2020-03-09 11:13:18 +01:00
Tobias Diekershoff
ddb6335d22 DE translation update 2020-03-09 10:59:00 +01:00
Tobias Diekershoff
50c2cb6535
Merge pull request #8390 from annando/fix-fatal
Fix fatal error (TypeError)
2020-03-09 10:12:28 +01:00
Michael
c514da1738 Fix fatal error (TypeError) 2020-03-09 08:59:56 +00:00
Tobias Diekershoff
d6ed0068e6
Merge pull request #8388 from annando/fetch
Additional logging and additional path for fetching posts
2020-03-09 07:20:13 +01:00
Tobias Diekershoff
09a0be73bf
Merge pull request #8389 from annando/gitignore
Added VSCode to .gitignore
2020-03-09 07:16:37 +01:00
Michael
d1833ee13e Added VSCode to .gitignore 2020-03-09 06:15:29 +00:00
Michael Vogel
a0b00aee30 Additional logging and additional path for fetching posts 2020-03-09 06:50:01 +01:00
Tobias Diekershoff
1f4d371923 Merge branch '2020.03-rc' of https://github.com/friendica/friendica into 2020.03-rc 2020-03-09 06:44:12 +01:00
Tobias Diekershoff
416b0b814e 2020.03-rc 2020-03-09 06:43:37 +01:00