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

24996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philipp 23da053cf8
Merge pull request #7512 from annando/cid-forum 
Use the contact id whenever we are following the contact
 2019-08-13 18:50:10 +02:00
Philipp bf0e9e7d03
Merge pull request #7511 from vinzv/patch-2 
Fixed typo
 2019-08-13 18:07:39 +02:00
Michael aab6b739d8 Use the contact id whenever we are following the contact 2019-08-13 15:54:47 +00:00
vinzv 8444787b04
Fixed typo 2019-08-13 17:54:32 +02:00
Philipp Holzer b1ae58cdc5
fix tests & remove superfluous parameter 2019-08-13 16:29:16 +02:00
Philipp Holzer 4089e17f85
re-add App::isBackend() 2019-08-13 16:29:12 +02:00
Philipp Holzer 0af9747c6c
Add Arguments & Modules class 2019-08-13 16:29:11 +02:00
Hypolite Petovan f068d00645
Merge pull request #7510 from nupplaphil/bug/Fix_Redis_test 
Fix Redis test
 2019-08-13 06:41:07 -04:00
Hypolite Petovan 8b00f48c47
Merge pull request #7509 from annando/admin-queue 
Improved calculation of deferred tasks
 2019-08-13 06:40:21 -04:00
Philipp Holzer b28e11fee8
- Remove deprecated Redis::delete() function 2019-08-13 08:54:26 +02:00
Philipp Holzer 31cfac1cfa
Fix Redis test 
- Check if $redis_port is null
 2019-08-13 08:32:08 +02:00
Michael Vogel afac4b7698 Improved calculation of deferred tasks 2019-08-13 06:43:08 +02:00
Hypolite Petovan 2f752b18e1
Merge pull request #7505 from annando/admin-queue 
Queue numbers corrected, only display 999 queue items
 2019-08-12 19:30:57 -04:00
Michael Vogel 3b0767764b Queue numbers corrected, only display 999 queue items 2019-08-12 07:30:33 +02:00
Hypolite Petovan ad5dc91e23
Merge pull request #7504 from friendica/revert-7500-task/arguments_module_class 
Revert "Introduce Arguments / Module class"
 2019-08-11 18:01:38 -04:00
Hypolite Petovan fcb1a78352
Revert "Introduce Arguments / Module class" 2019-08-11 18:01:11 -04:00
Philipp e9fc2af1c3
Merge pull request #7499 from annando/new_defer 
Worker: The retrial value can now skip retrial levels
 2019-08-11 23:27:54 +02:00
Philipp 541cdcd515
Merge pull request #7503 from MrPetovan/bug/fix-private-permissions 
Use contact.network field instead of contact.protocol in Group::expand
 2019-08-11 23:26:34 +02:00
Michael Vogel e07a17daf6 Added config value 2019-08-11 23:07:06 +02:00
Hypolite Petovan feb2d94972
Merge pull request #7500 from nupplaphil/task/arguments_module_class 
Introduce Arguments / Module class
 2019-08-11 16:45:31 -04:00
Hypolite Petovan 5feeffbe79 Use network field instead of protocol in Group::expand 
- contact.protocol field isn't systematically populated
 2019-08-11 16:41:00 -04:00
Philipp Holzer df5ffea15b
line break call 2019-08-11 17:46:19 +02:00
Philipp Holzer 11752d7059
move backend constant 2019-08-11 14:33:25 +02:00
Philipp Holzer 2c5ba7fc15
Introduce Arguments / Module class 
- move from App
- add tests for Arguments/Module class
 2019-08-11 14:24:05 +02:00
Michael Vogel 5c72aeb8d7 Worker: The retrial value can now skip retrial levels 2019-08-11 10:28:52 +02:00
Philipp 828a81d325
Merge pull request #7493 from annando/dont-fork-foreground 
Don't fork worker on frontend by default
 2019-08-09 00:00:31 +02:00
Michael Vogel 35a487ae30 Don't fork worker on frontend by default 2019-08-08 22:42:12 +02:00
Hypolite Petovan 3480891277
Merge pull request #7492 from tobiasd/20190808-lng2 
DE,FR,NL translation update
 2019-08-08 10:57:34 -04:00
Tobias Diekershoff 600f960a5c DE translation update THX Copis 2019-08-08 15:56:45 +02:00
Tobias Diekershoff 867b8e6d59 update FR translations THX Phigger 2019-08-08 15:56:34 +02:00
Tobias Diekershoff 9232510961 NL translation update THX Jeroen 2019-08-08 15:56:23 +02:00
Hypolite Petovan 5320568848
Merge pull request #7490 from tobiasd/20190807-de 
DE translation update
 2019-08-07 02:48:30 -04:00
Tobias Diekershoff a987e6ff6c DE translation update 2019-08-07 08:27:09 +02:00
Tobias Diekershoff 48b1e172b9
Merge pull request #7487 from MrPetovan/task/7473-trending-tags 
Fix trending tags variable name mistakes in Model\Term
 2019-08-07 06:44:37 +02:00
Tobias Diekershoff 69a1d546ca
Merge pull request #7489 from MrPetovan/bug/7488-html-img-tag 
Ensure trimmed HTML nodes are text nodes in HTML::toBBCode
 2019-08-07 06:43:32 +02:00
Hypolite Petovan 66d4e5ce5f Remove wrap length in Babel HTML::toPlaintext display 2019-08-06 21:23:09 -04:00
Hypolite Petovan d32de58e34 Add test case to avoid trimming empty image tags 2019-08-06 21:22:46 -04:00
Hypolite Petovan 246894f233 Ensure trimmed HTML nodes are text nodes in HTML::toBBCode 2019-08-06 21:22:19 -04:00
Hypolite Petovan 0a9ed707b5 Add hashtag mark to trending tags display 2019-08-06 20:55:40 -04:00
Hypolite Petovan 19adb9a1a0 Fix trending tags variable name mistakes in Model\Term 2019-08-06 20:52:54 -04:00
Hypolite Petovan e3ce18ebcf
Merge pull request #7484 from tobiasd/20190806-messagespo 
regen messages.po
 2019-08-06 10:59:26 -04:00
Tobias Diekershoff 71d1703556 regen messages.po 2019-08-06 16:54:18 +02:00
Tobias Diekershoff dc85451b78
Merge pull request #7483 from MrPetovan/task/7474-html-to-bbcode 
Fix bug removing spaces between hashtag links in HTML::toPlaintext
 2019-08-06 16:50:00 +02:00
Hypolite Petovan 79374dbf7a Fix DOMNodeList length compatibility with PHP <7.2 in Content\Text\HTML 2019-08-06 09:00:32 -04:00
Philipp c6845a1fe4
Merge pull request #7481 from MrPetovan/task/7473-trending-tags 
Add trending tags widget to community page
 2019-08-06 14:54:42 +02:00
Hypolite Petovan d1db9bc8e6 Add test case for hashtag link list space removal 2019-08-06 08:21:26 -04:00
Hypolite Petovan 5dbf319e06 Fix bug removing spaces between hashtag links in HTML::toPlaintext 2019-08-06 08:20:48 -04:00
Hypolite Petovan 3e2f0e9ffa Feedback changes 
- Import namespaces in mod/community
- Fix alignment in Content\Feature
- Add phpDoc to Widget\TrendingTags
 2019-08-06 07:37:48 -04:00
Hypolite Petovan 9e8ae520b8 Move trending tags queries to Model\Term 2019-08-06 07:36:51 -04:00
Hypolite Petovan 4c45cb864a Update master translation strings file 
- Fix gettext warning for empty string in Module\Item\Compose
 2019-08-06 07:09:05 -04:00