1
1
Fork 0
Commit graph

8348 commits

Author SHA1 Message Date
7fd202dbc9 Handle invalid avatar pictures 2021-10-24 11:33:35 +00:00
eacb584703 Fix PHP_NOTICE because of fsuggestion 2021-10-23 21:46:32 -04:00
01659d731f Fix FSuggestselect 2021-10-23 21:46:04 -04:00
8c9eb9a58d Fix FSuggestselect 2021-10-23 21:45:38 -04:00
0d517b590d fetch new FSuggest after update 2021-10-23 21:45:38 -04:00
Philipp
92c7b99a4f Update src/Contact/FriendSuggest/Exception/FriendSuggestPersistenceException.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-10-23 21:45:38 -04:00
Philipp
74cfb32085 Update src/Contact/FriendSuggest/Exception/FriendSuggestNotFoundException.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-10-23 21:45:38 -04:00
6623780cf8 Fix FSuggest conversation 2021-10-23 21:45:37 -04:00
61839d503a Fix "Suggest a friend" text 2021-10-23 21:45:37 -04:00
4a386b2f36 Add some missing Copyright header 2021-10-23 21:45:36 -04:00
5d92713a8e Rename Depository to Repository 2021-10-23 21:45:36 -04:00
b407fbedc1 Replace all 'fsuggest' usages with the new paradigm 2021-10-23 21:45:35 -04:00
82a6c78033 Move FSuggest to depository 2021-10-23 21:45:35 -04:00
acb06af28d
Add extended ErrorHandling 2021-10-23 20:58:38 +02:00
7ebf211ad2 Fixed indention 2021-10-23 17:23:11 +00:00
8185c591d8 New option to activate/deactivate contact avatar cache 2021-10-23 17:18:30 +00:00
a497bd3a3d Merge remote-tracking branch 'upstream/develop' into logging 2021-10-22 06:06:39 +00:00
Philipp
e0411743e2
Merge pull request #10913 from MrPetovan/bug/10903-profile-edit
Add redirection to clear the owner cache after profile update
2021-10-22 07:12:43 +02:00
cb86048b8a Add redirection to clear the owner cache after profile update 2021-10-21 19:11:28 -04:00
82c2a30c59 Fix wrong array access to Entity object
- Address https://github.com/friendica/friendica/issues/10756#issuecomment-949051839
2021-10-21 18:58:18 -04:00
096dacf0fd Manually expand ACLs coming from non-permissionset tables
- Return early if parameter is empty in ACLFormatter->expand
- Address https://github.com/friendica/friendica/issues/10756#issuecomment-949049195
2021-10-21 18:56:43 -04:00
17aa00bff8 Fix: Use correct condition to update the avatar 2021-10-21 17:19:41 -04:00
1cb76d23ff
Delete the intro after confirming it ;-) 2021-10-21 22:18:32 +02:00
e1574dc2e7
Fix foreign key violation for Notify insert with uri_id/parent_uri_id 0 instead NULL 2021-10-21 22:11:15 +02:00
bf7c66b2c7
Fix Model\Contact\Introduction::confirm() 2021-10-21 21:57:25 +02:00
f5786a8f4f
set intro::duplex deprecated because of no usage 2021-10-21 21:57:24 +02:00
d67b676ce5
Fix confirm parameter 2021-10-21 21:57:24 +02:00
3153e098b0
Remove deprecated, impossible code for discarding with FID 2021-10-21 21:57:24 +02:00
44627a0b12
fix intro.cid and intro.suggest-id 2021-10-21 21:57:23 +02:00
690369cc4b
Fixings & add tests 2021-10-21 21:56:46 +02:00
ed184bd592
Set intro.blocked to deprecated 2021-10-21 21:56:46 +02:00
bf0782dc6b
Rename setIgnore() to ignore() 2021-10-21 21:49:22 +02:00
d2c210753a
Remove logging leftover for debugging 2021-10-21 21:49:21 +02:00
7d7d310cc4
Replace almost every Introduction places 2021-10-21 21:49:21 +02:00
a40f503fdd
Move Introduction to new depository paradigm 2021-10-21 21:49:20 +02:00
0cf4a74dfe
Merge pull request #10907 from annando/notice
Avoid notice "Undefined property: Friendica\Util\Logger\StreamLogger::$DEBUG"
2021-10-20 16:06:04 -04:00
f6faae5bb1 Replace deprecated log calls 2021-10-20 18:53:52 +00:00
e041b969fc Avoid notice "Undefined property: Friendica\Util\Logger\StreamLogger::$DEBUG" 2021-10-20 17:50:16 +00:00
bc65f10190 replace the video entry in the Nav.php with media as well 2021-10-20 15:11:30 +02:00
353cd66b26
Merge pull request #10900 from annando/notify
`enotify.php` is removed and its functions were transferred
2021-10-19 22:22:41 -04:00
7e433c66c1
RemoveContent fix column name 2021-10-19 23:34:36 +02:00
Michael Vogel
e2d2f42802
Merge pull request #10901 from nupplaphil/bug/notify_post
Fix DB errors
2021-10-19 22:43:11 +02:00
88825c2520
Split contact-relation deletion 2021-10-19 22:35:57 +02:00
b838b594cd
contact-relation - Fix DB error 2021-10-19 22:24:14 +02:00
2f1f6f6fb2 Replace "notification" call with new function, removing enotify.php 2021-10-19 19:45:36 +00:00
3781b34272 PROFILE_PHOTOS is mostly removed and replaced 2021-10-19 19:15:28 +00:00
4422be9cea Removing functionality from enotify.php 2021-10-19 19:09:53 +00:00
b152fde9d1 Don't degrade an existing relationship when following again 2021-10-19 02:05:04 +00:00
bf224b58f8
Move to PermissionSet::isPublic() 2021-10-18 23:32:47 +02:00
64a336ee8d
Rename method again 2021-10-18 23:32:46 +02:00
b5d994394e
Fixing PUBLIC usage, Fixing DB-View, Creating tests 2021-10-18 23:32:45 +02:00
a07acac463
Fix PHP-CS 2021-10-18 23:32:45 +02:00
5fecc9ecf7
Adapt ProfileField & Fix current PermissionSet Usage at ProfileFields 2021-10-18 23:32:44 +02:00
7c0c102f9f
Add tests 2021-10-18 23:32:42 +02:00
f273c27e3b
Fixups 2021-10-18 23:32:42 +02:00
7061e16b27
Add copyright 2021-10-18 23:32:41 +02:00
838cdac5d1
Move ProfileFieldRepository::migrateFromLegacyProfile() & delete old repository 2021-10-18 23:32:41 +02:00
f403851946
Move ProfileFieldRepository::updateCollectionFromForm() 2021-10-18 23:32:40 +02:00
6f692b857b
Move ProfileField::selectByContactId() and ProfileField::selectByUserId() 2021-10-18 23:32:39 +02:00
a9981c792e
Use ProfileField::selectPublicFieldsByUserId 2021-10-18 23:32:39 +02:00
1c0f92c382
Move ProfileField from Model to Entity 2021-10-18 23:32:38 +02:00
39a927f213
Merge pull request #10891 from nupplaphil/bug/httpclientfactory_dbstructure
Fix possible missing dbstructure.config.php in HTTPClientFactory.php
2021-10-18 16:34:22 -04:00
Michael Vogel
df99ca8d82
Merge pull request #10888 from MrPetovan/task/10887-bbcode-style-block
Add conditional block output for BBCode tag [style]
2021-10-18 20:19:53 +02:00
493b428991
require_once dbstructure.config.php for HTTPClientFactory.php in case we didn't load the DB 2021-10-18 19:36:56 +02:00
Michael Vogel
1dc613a0a1
Merge pull request #10889 from MrPetovan/task/10886-bbcode-remove-class
Deprecate limited-use and potentially confusing [class] BBCode tag
2021-10-18 19:28:07 +02:00
6f290607de
Merge pull request #10890 from xundeenergie/improve-links
Improve links
2021-10-18 09:08:48 -04:00
39aff642aa Deprecate limited-use and potentially confusing [class] BBCode tag
- Replace its usage in Mastodon emoji with an internal tag [emoji]
2021-10-18 02:45:42 -04:00
Jakobus Schürz (admin)
4aaa5a6a46 open provider-url in new tab 2021-10-18 08:41:45 +02:00
Jakobus Schürz (admin)
c450a7a757 open link from picture in new tab 2021-10-18 08:39:01 +02:00
4bee4818cf Add conditional block output for BBCode tag [style]
- Move new line conversion to <br> tags
- Update BBCode help page
2021-10-17 21:27:05 -04:00
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
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
aea07a7c15 Add new purge contact content option to admin contact blocklist 2021-10-16 19:29:38 -04:00
fc2175260f Move Worker task RemoveContact to Contact\Remove 2021-10-16 19:22:24 -04:00
efe0e45170 Create new Worker task to remove a contact's content from the database 2021-10-16 19:19:56 -04:00
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
45fc6759b8 Remove unused method in Model\\Contact 2021-10-16 16:05:09 -04:00
66c0431144 Switch available contact selection to private-supporting networks in ACL 2021-10-16 16:00:41 -04:00
ca2c73a2cd Account for the PUBLIC value for id parameter in Depository\PermissionSet::selectOneById 2021-10-16 15:42:21 -04:00
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
c6021a45b1 Updated messages.po, keep a translatable string 2021-10-14 06:22:47 +00:00
a33185f835 Use a constant for the profile photo album 2021-10-14 04:12:00 +00:00
f05fecaec1
Merge pull request #10867 from annando/replace-p
replace "p" with higher level database functions
2021-10-13 19:33:59 -04:00
8d7846142d Hide blocked contacts when searching public contacts 2021-10-13 21:04:46 +00: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
2904f4ca0e Olq query removed, checking for deleted as well 2021-10-13 05:11:36 +00:00
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
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
b3c576b9ce Fix request parameter mapping to selectByBoundaries() in Api\Mastodon\Notifications 2021-10-12 21:17:19 -04:00
27b9da3df5 replace "p" with higher level database functions 2021-10-12 05:53:29 +00:00
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
13827edd2c New photo field "photo-type" as preparation for banners 2021-10-11 14:21:10 +00:00
f05faf22a1
Merge pull request #10861 from annando/no-q
Replace the legacy function "unavailableNetworks"
2021-10-11 08:17:45 -04:00
86947b0997 Replace "p" with "select" 2021-10-11 06:25:04 +00:00
d3ebb3ac49 Added missing "break" 2021-10-11 05:51:18 +00:00
41dc6cea2b Replace the legacy function 2021-10-11 04:33:10 +00:00
a3e42a8c07
Merge pull request #10857 from annando/no-q
`q` is now completely removed
2021-10-10 23:40:28 -04:00
ee2b249d00 Empty comments removed 2021-10-10 05:38:49 +00:00
2c134c5229 q is now completely removed 2021-10-09 21:16:15 +00:00
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
Philipp
58215e56c3
Merge pull request #10854 from MrPetovan/bug/10844-unfollow
Replace remaining explicit network value checks by Protocol::supportsFollow calls
2021-10-09 09:23:12 +02:00
b214470b1a Replace remaining explicit network value checks by Protocol::supportsFollow calls 2021-10-09 02:10:16 -04:00
5028258c3b Remove exception throwing on null protocol action result in Console\Contact 2021-10-09 02:09:49 -04:00
479458a389 Add missing parameters to Contact::block/unblock 2021-10-09 02:09:01 -04:00
880c2148c2 Fix overly strict return value for revokeFollow methods 2021-10-09 02:08:04 -04:00
201d728b9e Fix addon reloading
- The wrong variable was used to uninstall/install addons, which led to absolutely nothing done
2021-10-09 00:12:11 -04:00
80a8cd86c4
Merge pull request #10836 from nupplaphil/feat/depository_permissionset
Migrate PermissionSet to Depository paradigm
2021-10-08 09:39:39 -04:00
93c44e6186
exception msg .. once again ;-) 2021-10-08 13:36:19 +02:00
df8bd18673
Typo 2021-10-08 12:37:53 +02:00
a32c10b354 Simplifid query 2021-10-08 04:24:59 +00:00
3972fe62fe More replaced "q" calls 2021-10-08 04:10:45 +00:00
f73e4adc44
Add explicit check for PermissionSet and ProfileField 2021-10-07 20:48:39 +02:00
03164d00e8
Add feedback and tests 2021-10-07 19:53:39 +02:00
9e6962eac6
Make php-cs happy :-) 2021-10-07 19:53:38 +02:00
62eb16e9ad
Migrate PermissionSet to Depository paradigm 2021-10-07 19:53:38 +02:00
456ae169ab Fix overly strict return value for terminateFriendship methods 2021-10-06 20:18:44 -04:00
48f482665c Issue 10841: Redirect always to the same page 2021-10-06 19:02:26 +00:00
c0f03889c5 Pass correct hook data for support_follow and support_revoke_follow 2021-10-06 12:07:48 -04:00
ab17fbf6b2 Unneeded "ProxyUtils" renamed to "Proxy" 2021-10-05 20:18:19 +00:00
430e6c3285
Merge pull request #10834 from annando/legacy-reshare-removed
The legacy reshare functionality is removed
2021-10-05 15:19:15 -04:00
d20aa5f557 The legacy reshare functionality is removed 2021-10-05 18:58:35 +00:00
7471b7698b
Adapt filesystem tests 2021-10-05 20:29:52 +02:00
ccd8895237
Adress feedback :) 2021-10-05 20:07:14 +02:00
065b46c721
Split Storage usage and Storage configuration 2021-10-05 20:07:12 +02:00
Michael Vogel
0509e8f37e
Update src/Module/Photo.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-10-04 21:17:22 +02:00
Michael Vogel
790875d8be
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-10-04 21:06:13 +02:00
b2c2283817 separate parameter values for different functionalities 2021-10-04 18:04:41 +00:00
9eba41598d Code review changes 2021-10-04 14:01:46 +00:00
126aa6f148 Fix tests 2021-10-04 06:26:41 +00:00
43a17b6129 Merge remote-tracking branch 'upstream/develop' into photo-guid 2021-10-04 06:21:19 +00:00
Michael Vogel
c714595b70
Merge pull request #10821 from MrPetovan/bug/notices
Relax check on id parameter in /photo
2021-10-04 08:18:52 +02:00
Michael Vogel
2a8d8d402c
Merge pull request #10822 from MrPetovan/bug/fatal-errors
Trim XML before emptiness check in Protocol\Feed::import
2021-10-04 08:17:35 +02:00
Michael Vogel
6275159761
Merge pull request #10819 from MrPetovan/task/refactor-notifications
Cast object parameters to string in Database\Database
2021-10-04 08:16:58 +02:00
d30dc52101 Access contact avatars by guid 2021-10-04 06:13:52 +00:00
297ff76590 Relax check on id parameter in /photo
- Address https://github.com/friendica/friendica/issues/10756#issuecomment-933020126
- Address https://github.com/friendica/friendica/issues/10755#issuecomment-933020316
2021-10-03 20:59:47 -04:00
42e77e23ac Add logging to track a Notice messages
- Part of https://github.com/friendica/friendica/issues/10755#issuecomment-933040517
2021-10-03 20:59:41 -04:00
a4706e9521 Trim XML before emptiness check in Protocol\Feed::import
- Address https://github.com/friendica/friendica/issues/10791
2021-10-03 19:32:20 -04:00
1d86d79778 Merge remote-tracking branch 'upstream/develop' into more-q 2021-10-03 19:49:11 +00:00
Michael Vogel
caa1a5aeac
Merge pull request #10818 from MrPetovan/task/10691-remove-event-adjust
Display the current timezone in date time picker fields
2021-10-03 21:46:33 +02:00
b0bf4b4359 Some more "q" calls and deprecated logging replaced 2021-10-03 19:43:49 +00:00
24734b05fe Cast object parameters to string in Database\Database
- This makes string casting in Depository->save unnecessary
2021-10-03 15:35:47 -04:00
c40390c202 Revert "Explicitly cast Url objects to string"
This reverts commit ee5aa2d432.
2021-10-03 15:22:40 -04:00
Michael Vogel
dd3f573fec
Merge pull request #10817 from MrPetovan/task/refactor-notifications
Explicitly cast Url objects to string
2021-10-03 21:03:03 +02:00
ee5aa2d432 Explicitly cast Url objects to string
- Some systems do not do this operation automatically and it results in empty DB fields
2021-10-03 14:53:06 -04:00
a31a64827f Display the current timezone in date time picker fields 2021-10-03 13:42:32 -04:00
a9bb53b021 [frio] Fix event time display 2021-10-03 13:42:32 -04:00
9935e8e711 Remove event.adjust field
- It was confusing and introduced complexity that wasn't worth the unclear gain
2021-10-03 13:42:32 -04:00
6db211568a Remove most calls to date_default_timezone_* calls
- It was wrongly used to set the node-wide ot user-specific timezone
- It is now fully managed from the App object
- Add a static variable to DateTimeFormat maintain the convenient local() method
2021-10-03 13:42:31 -04:00
08c24fd4fa
Merge pull request #10816 from MrPetovan/task/refactor-notifications
Check if the string representation of Notify->link is empty in Module\Notifications\Notification
2021-10-03 17:39:14 +02:00
e91ba2b992 Check if the string representation of Notify->link is empty in Module\Notifications\Notification
- The property is a Url object which will always return true when tested for truthy value
2021-10-03 11:34:23 -04:00
6668591afe Merge remote-tracking branch 'upstream/develop' into more-q 2021-10-03 15:06:31 +00:00
763e264196 More "q" calls have been replaced 2021-10-03 15:02:20 +00:00
Michael Vogel
3d97149007
Merge pull request #10722 from MrPetovan/task/refactor-notifications
Move notify, notifications and introduction notifications to new paradigm
2021-10-03 14:13:28 +02:00
c84d4104e8 Add missing Module\Photo route for post-media id with no customsize 2021-10-03 07:58:52 -04:00
5112dd06f2 Add missing Module\Photo route for contact avatar 2021-10-03 07:48:46 -04:00
9961943b73 Code Style: Replace "AS" with "as" 2021-10-03 10:34:41 +00:00
c1ab3801ba Replace remaining reference to Model\Photo::stripExtension 2021-10-03 05:52:53 -04:00
42790fbc1f Don't store emoji images as media but links 2021-10-03 09:42:14 +00:00
8cb0bb5deb Switch uid with nickname in user picture URLs
- Keep previous URL scheme fallback as remote contact avatar URLs pointing to local user avatar URLs need to update
2021-10-02 19:06:59 -04:00
7cdd2d1336 Refactor User::getAvatarUrlForId into getAvatarUrl
- Use user/owner array as parameter instead of uid
- Rename $profile variables to $owner when it's the result of User::getOwnerDataByNick
- Replace Module\Photo::stripExtension with native pathinfo() calls
2021-10-02 19:06:25 -04:00
4f42522ebc Simplify Depository\Notify->selectAllForUser parameters
- Shifts database structure knowledge from the controller to the depository where it should be
2021-10-02 18:15:45 -04:00
8a1a2f658c Create new DI shorthands for notification-related factories 2021-10-02 18:15:45 -04:00
7a2d5f6a8e Move notification to the new paradigm 2021-10-02 18:15:45 -04:00
bc0734e0f1 Move notification introductions to the new paradigm 2021-10-02 18:15:45 -04:00
43e5b317ed Add new paradigm classes for notification and introduction notifications
- Add support for bounded select in BaseDepository
2021-10-02 18:15:44 -04:00
3e6fea30f2 Create constants for Mastodon notification types 2021-10-02 18:15:44 -04:00
ea6f7aba40 Fix method name typos in Model\Post\UserNotification
- Reformat file, improve type-hinting
2021-10-02 18:15:43 -04:00
dae5703e5c Improve accuracy of accepted parameter types in phpDoc of Database->fetch
- Suppresses an unwarranted type error raised by static analyzers
2021-10-02 18:15:43 -04:00
bf81f21001 Rename Model\Post\UserNotifications type constants 2021-10-02 18:15:43 -04:00
47acb6a278 Move notify to the new paradigm
- Remove unused frion notify template
- Update API test
2021-10-02 18:15:42 -04:00
1b4e3564a5 Add new paradigm classes for notify
- Create BaseDepository class
- Create Entity, Collection, Factory and Depository classes
- Create FormattedNotification Entity, Collection and Factory to remove business logic from Notify repository
- Create new NotificationCreationIntercepted exception to allow addons to cancel notification creation
- Remove unused frio notifications/notify.tpl template
2021-10-02 18:15:34 -04:00
810699b454
Merge pull request #10803 from nupplaphil/feat/message_log
Forgot one Logpoint ..
2021-10-02 17:41:34 -04:00
ce7d394ff9
Merge pull request #10801 from annando/network-thread-view
Fixing "Unknown column 'network-thread-view.uri-id'"
2021-10-02 17:40:00 -04:00
Michael Vogel
2a442952b6
Merge pull request #10800 from MrPetovan/task/10739-block
Add block and unblock hooks
2021-10-02 23:39:06 +02:00
66fec8944f Add block and unblock hooks 2021-10-02 17:30:40 -04:00
bd42f5757f Implement relationship termination for Mastodon block
- This is the expected Mastodon behavior on block
2021-10-02 17:30:07 -04:00
b0d8136b00 Remove contact record instead of setting rel = 0 in Contact::revokeFollow 2021-10-02 17:30:03 -04:00
254c32ac91
Forgot one Logpoint .. 2021-10-02 23:27:15 +02:00
Michael Vogel
fc9ac0ff46
Update src/Module/Conversation/Network.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-10-02 23:18:54 +02:00
80753ed1b6
Remove disturbing/superfluous logging messages 2021-10-02 23:11:33 +02:00
eea355ae3b Merge remote-tracking branch 'upstream/develop' into network-thread-view 2021-10-02 21:00:10 +00:00
bd85babc3e Fixing "Unknown column 'network-thread-view.uri-id'" 2021-10-02 20:56:11 +00:00
c4a4473cd0 Remove the obsolete parameter $two_way from terminateFriendship methods
- Follow revokation is now done independently
2021-10-02 16:14:22 -04:00
222333f64f Remove contact drop feature
- Feature was confusing, sometimes ineffective and overall overlapping with unfollow/block
2021-10-02 16:04:28 -04:00
1550c0cf13 Reverted unneeded changes 2021-10-02 19:33:51 +00:00
afa611bd50 The media class moved 2021-10-02 19:31:27 +00:00
da3fbced38 Merge branch 'contact-media' of github.com:annando/friendica into contact-media 2021-10-02 18:35:47 +00:00
2408ac8227 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 18:35:43 +00:00
Michael Vogel
a2f5190bdb
Update src/Model/Contact.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-10-02 20:31:30 +02:00
72fae04e97 Add revoke follow feature
- Add new follow revoke module
- Add new hooks: revoke_follow, support_follow, support_revoke_follow
- Add link in contact page action menu
2021-10-02 14:01:46 -04:00
9918fa3ec0 Move translation strings in their own array for confirm templates 2021-10-02 13:52:54 -04:00
e6aef548fb ActivityPub: Update relation when receiving a follow reject message 2021-10-02 13:52:54 -04:00
c822cdaebd Removing "blubb" 2021-10-02 17:47:11 +00:00
8dc4499bcf
Merge pull request #10797 from annando/diaspora-deprecated
Replaced deprecated code from the Diaspora implementation
2021-10-02 19:19:40 +02:00
e5ffda3478 Replaced deprecated code from the Diaspora implementation 2021-10-02 17:11:54 +00:00
a44d200c21 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 15:13:55 +00:00
c3554ac0f4 "Video" is replaced by a "Media" tab in contact and profile 2021-10-02 15:09:43 +00:00
797391e1d8 Rework contact termination to separate protocol-level and contact-level
- Mail and Feed contacts are now removed automatically on relationship termination
- Added logging and notice messages for different results
2021-10-02 08:31:59 -04:00