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

32286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philipp 5d0b7fd87b
Merge pull request #10882 from MrPetovan/task/10865-contact-purge 
Add new purge contact content option to admin contact blocklist
 2021-10-17 23:44:28 +02:00
Hypolite Petovan 1274fe6f9b
Merge pull request #10885 from annando/fcontact-suggest 
Remove "fcontact" from suggestions
 2021-10-17 16:35:25 -04:00
Michael f1d3f60499 Remove "fcontact" from suggestions 2021-10-17 20:19:02 +00:00
Michael Vogel b0bb95bb0d
Merge pull request #10880 from MrPetovan/bug/10876-profile-edit 
Account for the PUBLIC value for id parameter in Depository\PermissionSet::selectOneById
 2021-10-17 08:36:18 +02:00
Michael Vogel dec87d89c0
Merge pull request #10881 from MrPetovan/bug/10872-acl-mail-contacts 
Switch available contact selection to private-supporting networks in ACL
 2021-10-17 08:32:19 +02:00
Hypolite Petovan 2e78e0353d Updated main translation file after adding a string 2021-10-16 19:32:16 -04:00
Hypolite Petovan aea07a7c15 Add new purge contact content option to admin contact blocklist 2021-10-16 19:29:38 -04:00
Hypolite Petovan fc2175260f Move Worker task RemoveContact to Contact\Remove 2021-10-16 19:22:24 -04:00
Hypolite Petovan efe0e45170 Create new Worker task to remove a contact's content from the database 2021-10-16 19:19:56 -04:00
Hypolite Petovan f80478f262 Improve argument handling in Core\Worker::add 
- The argument name made it unclear the first argument is supposed to be a priority number
 2021-10-16 19:19:56 -04:00
Hypolite Petovan 29be333cec Add test for public value of Depository\PermissionSet->selectOneById 2021-10-16 16:55:53 -04:00
Hypolite Petovan 45fc6759b8 Remove unused method in Model\\Contact 2021-10-16 16:05:09 -04:00
Hypolite Petovan 66c0431144 Switch available contact selection to private-supporting networks in ACL 2021-10-16 16:00:41 -04:00
Hypolite Petovan ca2c73a2cd Account for the PUBLIC value for id parameter in Depository\PermissionSet::selectOneById 2021-10-16 15:42:21 -04:00
Tobias Diekershoff 907f45b0f4
Merge pull request #10878 from MrPetovan/bug/10877-html-to-bbcode 
Bug/10877 html to bbcode
 2021-10-15 17:55:11 +02:00
Hypolite Petovan 5feb80397f Added test for code blocks containing HTML entities in HTMLTest::toBBCode 2021-10-15 11:37:21 -04:00
Hypolite Petovan f9165fbaf0 Decode HTML entities in code blocks in HTML::toBBCode 
- Replace PHP_EOL uses with the more common \n
 2021-10-15 11:36:40 -04:00
Hypolite Petovan ca1801a164
Merge pull request #10874 from annando/profile-photo 
Use a constant for the profile photo album
 2021-10-14 02:27:18 -04:00
Michael c6021a45b1 Updated messages.po, keep a translatable string 2021-10-14 06:22:47 +00:00
Michael a33185f835 Use a constant for the profile photo album 2021-10-14 04:12:00 +00:00
Hypolite Petovan f05fecaec1
Merge pull request #10867 from annando/replace-p 
replace "p" with higher level database functions
 2021-10-13 19:33:59 -04:00
Michael 8d7846142d Hide blocked contacts when searching public contacts 2021-10-13 21:04:46 +00:00
Hypolite Petovan a60fe907fb
Merge pull request #10873 from martincodes-de/count-user-correctly 
add condition to count accounts that arent removed
 2021-10-13 14:15:04 -04:00
martincodes aa433f9d87 add condition to count accounts that arent removed 2021-10-13 18:54:22 +02:00
Michael Vogel 09771e1a76
Merge pull request #10870 from MrPetovan/bug/fatal-errors 
Use entity property in DB condition in Module\Profile\Status
 2021-10-13 07:19:26 +02:00
Michael 2904f4ca0e Olq query removed, checking for deleted as well 2021-10-13 05:11:36 +00:00
Michael Vogel e2400067a5
Merge pull request #10869 from MrPetovan/bug/10868-mastodon-api-notifications 
Ignore max_id when it's 0 or less in BaseDepository->_selectByBoundaries
 2021-10-13 06:57:25 +02:00
Hypolite Petovan f622a541c3 Use entity property in DB condition in Module\Profile\Status 
- Address https://github.com/friendica/friendica/issues/10756#issuecomment-939538157
 2021-10-13 00:09:14 -04:00
Hypolite Petovan 2324dac4b2 Ignore max_id when it's 0 or less in BaseDepository->_selectByBoundaries 
- It can cause a conflict when both min_id and max_id = 0 as default values
 2021-10-12 21:18:32 -04:00
Hypolite Petovan b3c576b9ce Fix request parameter mapping to selectByBoundaries() in Api\Mastodon\Notifications 2021-10-12 21:17:19 -04:00
Michael 27b9da3df5 replace "p" with higher level database functions 2021-10-12 05:53:29 +00:00
Hypolite Petovan 9b68364b86
Merge pull request #10863 from annando/photo-type 
New photo field "photo-type" as preparation for banners
 2021-10-11 13:52:28 -04:00
Michael 948450c24b Changed field description 2021-10-11 17:21:29 +00:00
Michael 13827edd2c New photo field "photo-type" as preparation for banners 2021-10-11 14:21:10 +00:00
Hypolite Petovan f05faf22a1
Merge pull request #10861 from annando/no-q 
Replace the legacy function "unavailableNetworks"
 2021-10-11 08:17:45 -04:00
Michael 86947b0997 Replace "p" with "select" 2021-10-11 06:25:04 +00:00
Michael d3ebb3ac49 Added missing "break" 2021-10-11 05:51:18 +00:00
Michael 41dc6cea2b Replace the legacy function 2021-10-11 04:33:10 +00:00
Hypolite Petovan a3e42a8c07
Merge pull request #10857 from annando/no-q 
`q` is now completely removed
 2021-10-10 23:40:28 -04:00
Philipp 83ca13ce86
Merge pull request #10859 from tobiasd/20211010-de 
DE translation updates
 2021-10-10 14:49:30 +02:00
Tobias Diekershoff 364c5317ff DE translation updates 2021-10-10 14:33:36 +02:00
Michael Vogel f0d7938fab
Merge pull request #10858 from tobiasd/20211010-regenlng 
regenerated all the strings
 2021-10-10 09:45:18 +02:00
Tobias Diekershoff eb94bedc0e regenerated all the strings 
This is a follow up for #10855 with the regenerated `string.php` files for all the languages currently in the repository.
 2021-10-10 08:22:58 +02:00
Michael Vogel 9617167fe6
Merge pull request #10855 from MrPetovan/bug/10832-po2php 
console po2php: Use Geekwright\Po for po file parsing to catch corner case with multi-line message
 2021-10-10 07:41:36 +02:00
Michael ee2b249d00 Empty comments removed 2021-10-10 05:38:49 +00:00
Michael 39907103f8 Fix test 2021-10-09 21:30:14 +00:00
Michael 2c134c5229 q is now completely removed 2021-10-09 21:16:15 +00:00
Michael Vogel d335c5038a
Merge pull request #10856 from MrPetovan/bug/fatal-errors 
Move false-coalescing operator outside of the parameter in mod/salmon
 2021-10-09 22:09:43 +02:00
Hypolite Petovan 3656647ee5 Move false-coalescing operator outside of the parameter in mod/salmon 
- Address https://github.com/friendica/friendica/issues/10756#issuecomment-939351242
 2021-10-09 15:50:14 -04:00
Hypolite Petovan ca2d0178fc Improve po2php transformation 
- Use Geekwright\Po for po file parsing to catch corner case with multi-line message
- Switch from risky double quoted strings to safer single quoted strings in the output file
 2021-10-09 15:46:58 -04:00