]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #9823 from MrPetovan/task/9677-2fa-remember-device
authorMichael Vogel <icarus@dabo.de>
Wed, 27 Jan 2021 21:32:08 +0000 (22:32 +0100)
committerGitHub <noreply@github.com>
Wed, 27 Jan 2021 21:32:08 +0000 (22:32 +0100)
Add "Remember this device" feature to two factor authentication

1  2 
src/Object/Api/Friendica/Notification.php
static/routes.config.php

index ebe418094fb2cf6e3a487d80863d033d542bb656,60c824a5668897307f691779b495ca8bde678ac6..2ae4aac61988c82abade51e3c3a0c913f920fc77
  
  namespace Friendica\Object\Api\Friendica;
  
- use Friendica\BaseEntity;
+ use Friendica\BaseDataTransferObject;
  use Friendica\Content\Text\BBCode;
  use Friendica\Content\Text\HTML;
 -use Friendica\Model\Notify;
 +use Friendica\Model\Notification as NotificationModel;
  use Friendica\Util\DateTimeFormat;
  use Friendica\Util\Temporal;
  
Simple merge