clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
29,964 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

29964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vogel ddbe8730ed
Merge pull request #10046 from MrPetovan/bug/10019-oembed-iframes-part-1 
Use system.allowed_oembed config to allow iframe source
 2021-03-14 20:04:00 +01:00
Hypolite Petovan dc98c4dee5 Add expected mocked calls to BBCodeTest 2021-03-14 14:34:52 -04:00
Hypolite Petovan ef58effb53 Update main translation after translation string change 2021-03-14 14:19:35 -04:00
Hypolite Petovan 393de1a283 Use system.allowed_oembed config to allow iframe source 2021-03-14 14:19:35 -04:00
Hypolite Petovan 93823ecef5 Move HTML purification to own method in Content\Text\HTML 2021-03-14 14:19:33 -04:00
Hypolite Petovan 5b8f7361ea
Merge pull request #10045 from annando/fix-notification 
Fix notifications for public posts
 2021-03-14 12:31:15 -04:00
Michael c1caedfa50 Fix notification for global posts 2021-03-14 15:40:14 +00:00
Michael Vogel 751bf7ae30
Merge pull request #10042 from MrPetovan/bug/10041-video-regex-backtrack 
Increase video tag regular expression specificity to decrease backtrack in BBCode::convert
 2021-03-13 17:54:15 +01:00
Hypolite Petovan e1f8e10fe7 Increase video tag regular expression specificity to decrease backtrack in BBCode::convert 2021-03-13 09:06:52 -05:00
Hypolite Petovan 7b41866410
Merge pull request #10038 from annando/issue-10019 
Issue 10019: Fix embedding of media objects
 2021-03-13 08:26:56 -05:00
Michael 7adbd73eca More general content type detection 2021-03-13 13:17:42 +00:00
Michael acffafe6b9 Merge remote-tracking branch 'upstream/2021.03-rc' into issue-10019 2021-03-13 12:30:41 +00:00
Hypolite Petovan e8929efbea
Merge pull request #10040 from annando/file-permissions 
Only set file permissions when configured
 2021-03-13 07:19:30 -05:00
Hypolite Petovan af874c6a1b
Improve description of system.proxy_file_chmod setting 2021-03-13 07:19:17 -05:00
Michael 0bc1ebe5bf Only set file permissions when configured 2021-03-13 11:37:11 +00:00
Michael ffb92e3355 Integrate fetching of the content type into "getSiteinfo" 2021-03-13 07:03:26 +00:00
Michael 262ee2b0b1 Issue 10019: Fix embedding of media objects 2021-03-12 23:04:51 +00:00
Hypolite Petovan f8e3c687d7
Merge pull request #10036 from fabrixxm/fix-installer-themes 
Installer: install themes as last action
 2021-03-12 14:43:58 -05:00
Michael Vogel 4ddc38545b
Merge pull request #10037 from fabrixxm/fix-storage 
Storage: small fixes to 'storage move'
 2021-03-12 18:52:42 +01:00
fabrixxm a861eb65af Storage: small fixes to 'storage move' 
- stop command if current storage backend is still "legacy"
- write destination backend name in log
 2021-03-12 18:24:45 +01:00
fabrixxm 225a37af9a Installer: install themes as last action 
this will register theme hooks
 2021-03-12 18:21:50 +01:00
Hypolite Petovan a41c657790
Merge pull request #10035 from utzer/patch-1 
Part of bugfix for storage move problem
 2021-03-12 08:34:07 -05:00
utzer e20e62ffd6
Part of bugfix for storage move problem 
@fabrixxm is this already good to change?
 2021-03-12 09:55:55 +01:00
Hypolite Petovan 60a74fd5dc
Merge pull request #10034 from annando/better-tag-sorting 
Trending tags are now sort by different users
 2021-03-11 17:31:59 -05:00
Michael 5666866812 Trending tags are now sort by different users 2021-03-11 19:59:42 +00:00
Michael Vogel 7b874ed215
Merge pull request #10033 from friendica/bug/10032-event-query 
Update value interpolation syntax in Model\Event::getListById
 2021-03-11 20:44:31 +01:00
Hypolite Petovan a1c15f43df
Update value interpolation syntax in Model\Event::getListById 2021-03-11 14:03:53 -05:00
Hypolite Petovan b98405443e
Merge pull request #10022 from Quix0r/fixes/chmod-proxy 
Add setting for proxy file chmod value
 2021-03-11 07:35:52 -05:00
Roland Häder 5de0008b48
Removed default values. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2021-03-11 12:45:59 +01:00
Roland Häder 15fd6822e4 Ops, missing ";" 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2021-03-11 12:41:33 +01:00
Roland Häder 736045c67d Code changes for #10020: 
Added ability to set chmod (default: 0640) for "proxified" files (downloaded to
/proxy/ directory). This allows customization, e.g. if people want 0600 instead
without changing the code.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2021-03-11 12:41:33 +01:00
Hypolite Petovan bcfe0933da
Merge pull request #10029 from annando/set-protocol 
We now set the protocol in "gserver" on receiving as well
 2021-03-11 06:16:13 -05:00
Michael 9e87dcb25b We now set the protocol in "gserver" on receiving as well 2021-03-10 22:31:33 +00:00
Michael Vogel 5e98a38ac9
Merge pull request #10027 from MrPetovan/task/9950-improve-maintenance-page 
Improve maintenance page
 2021-03-10 20:19:55 +01:00
Hypolite Petovan 0bba4f12ca
Remove now unused /maintenance route 2021-03-10 13:14:52 -05:00
Hypolite Petovan 4489d14b06
Remove admin condition to display the maintenance reason 2021-03-10 12:20:02 -05:00
Michael Vogel 2605cc1a8a
Merge pull request #10028 from MrPetovan/task/security.txt 
Add security.txt file
 2021-03-10 17:14:23 +01:00
Hypolite Petovan 2d91db9e76 Add /.well-known/security.txt route and module 2021-03-10 09:58:48 -05:00
Hypolite Petovan b2f30df7fd Add security.txt file 
See https://securitytxt.org
 2021-03-10 09:58:08 -05:00
Hypolite Petovan 4cc919cd30
Merge pull request #10026 from annando/notice-type 
Fixes notice: "Undefined index: type"
 2021-03-10 09:56:23 -05:00
Hypolite Petovan d30055070e Updated source translation files after adding translation strings 2021-03-10 09:50:20 -05:00
Hypolite Petovan 2922be68bf Replace module output instead of redirecting to maintenance page 2021-03-10 09:50:20 -05:00
Hypolite Petovan 064ff693fd Add custom message to the maintenance module display 2021-03-10 09:50:20 -05:00
Michael 8211e6d887 Fixes notice: "Undefined index: type" 2021-03-10 14:40:57 +00:00
Hypolite Petovan 0c08e0fb79
Merge pull request #10025 from annando/performance 
Index improvements / Improvements fetching "pinned"
 2021-03-10 09:23:36 -05:00
Michael d30ec1eb58 More indexes / performance for "pinned" improved 2021-03-10 13:25:37 +00:00
Michael Vogel f753542a6f
Merge pull request #10018 from MrPetovan/task/10017-remove-friendica-wiki-de 
Remove dead friendica-wiki.de from German help page
 2021-03-10 12:20:49 +01:00
Hypolite Petovan df547ba73f
Merge pull request #10024 from annando/block-tags 
Block tags from the trending tags
 2021-03-09 18:14:41 -05:00
Hypolite Petovan c1047d6997
Merge pull request #10023 from annando/issue-9906-again 
Issue 9906: Hopefully fixes the speed issues
 2021-03-09 18:13:19 -05:00
Michael 639a781125 Block tags from the trending tags 2021-03-09 22:34:41 +00:00