Merge remote-tracking branch 'upstream/master' into probe-hubzilla

CHANGELOG

@@ -1,11 +1,59 @@
-Version 2019.12-dev (unreleased)
+Version 2019.12 (2019-12-23)
   Friendica Core:
+    Updates to the translations (CS, DE, ET, JA, NL, PL) [translation teams]
+    Updates to the documentation [copiis, MrPetovan, stom79, tobiasd]
+    Updates to the themes (all) [annando, hoergen, MrPetovan, tobiasd]
+    General code refactoring and enhancements [annando, MrPetovan, nupplaphil, tobiasd]
     Enhanced the manage functionality [annando]
+    Enhanced the federation with ActivityPub and Diaspora* protocol detection and contact requests [annando]
+    Enhanced federation with pixelfed and peertube [annando]
+    Enhanced how the API handles quoted postings [annando]
+    Enhanced the attachment removal by the API [annando]
+    Enhanced the 2FA field for mobile devices [nupplaphil]
+    Enhanced handling of re-shares [annando]
+    Enhanced the ACL dialog [annando, MrPetovan]
+    Enhanced transmission of postings by email and email handling in general [annando]
+    Enhanced the updating process of contacts [annando]
+    Enhanced the import of RSS/Atom feeds [annando]
+    Enhanced the registration form for require approval setups [tobiasd]
+    Enhanced the follow process for the Diaspora* protocol [annando]
+    Enhanced the display of the saved searched [AlfredSK]
+    Enhanced the display of image titles [annando]
+    Enhanced the handling of OpenID [annando]
+    Enhanced the Vagrant devel VM [tobiasd]
+    Enhanced handling of HTML special entities [nathilia-peirce]
+    Enhanced hashes by using HMAC [nathilia-peirce]
+    Enhancements to the ActivityPub implementation [annando]
+    Fixed a problem with delivery of direct messages over ActivityPub [annando]
     Fixed some problems with the remote auth functionality [annando]
+    Fixed an issue that prevented notifications for deleted postings be deleted themselves [annando]
+    Fixed a problem connecting to forums [annando]
+    Fixed messages in the admin panel [nupplaphil]
+    Fixed a problem when the log-file was not write-able [nupplaphil]
+    Fixed a problem with the caching directory for the password exposure check [MrPetovan]
+    Fixed a bug with detecting the browser language [nupplaphil]
+    Smart threading is now the default, but can be switched off by the user [annando]
+    Clarification: Posted order is now arrival order [annando]
     Added router configuration file [nupplaphil]
     Added drone.io as CI service [nupplaphil]
+    Added the ability to pin postings on account walls [annando]
+    Added various new API endpoints [annando, MrPetovan]
+    Added hooks for the email fetching process [annando]
+    Added support for nodeinfo 2 [annando]
+    Added export and import of followed contact data [tobiasd]
+    Added links to tag and category overview in the footer of postings [tobiasd]
+    Added config switch to use BCC instead of CC for ActivityPub delivery of non-public postings [annando]
 
   Friendica Addons:
+    Update to the translations (CA, DE, ET) [translation teams]
+    buffer
+      marked as unsupported [annando]
+    Discourse
+      New addon to integrate Discourse discussions [annando]
+    gnot
+      UI improvements [tobiasd]
+    js_upload
+      The addon got rewritten to adopt the new ACL [MrPetovan]
     mailstream:
       Support for new img format was added [mexon]
       BB Code is now included as plaintext [mexon]
@@ -13,7 +61,12 @@ Version 2019.12-dev (unreleased)
       ActivityPub "announce" notifications are not included [mexon]
 
   Closed Issues:
-    1071, 7548, 7657, 7681
+     989, 1071, 1188, 1334, 2537, 3229, 3231, 3385, 4112, 4442, 4451,
+    5048, 5568, 5802, 6865, 7190, 7308, 7316, 7418, 7613, 7657, 7659,
+    7664, 7671, 7679, 7681, 7682, 7685, 7688, 7691, 7702, 7707, 7709,
+    7718, 7733, 7740, 7747, 7756, 7766, 7773, 7776, 7778, 7781, 7821,
+    7825, 7834, 7863, 7868, 7880, 7888, 7889, 7902, 7914, 7920, 7946,
+    7953, 7978
 
 Version 2019.09 (2019-09-29)
   Friendica Core:

CREDITS.txt

@@ -1,5 +1,3 @@
-
-
 23n
 Abinoam P. Marques Jr.
 Abraham Pérez Hernández
@@ -47,6 +45,7 @@ bufalo1973
 Calango Jr
 Carlos Solís
 Carsten Pfeiffer
+Casper
 Cat Gray
 Chris Case
 Christian González
@@ -66,6 +65,7 @@ David Martín Miranda
 David Rabel
 Dean Townsley
 Denis Chenu
+dependabot[bot]
 Devlon Duthie
 Diego Souza
 Domovoy
@@ -115,6 +115,7 @@ Jens Tautenhahn
 jensp
 Jeroen De Meerleer
 jeroenpraat
+Joan Bar
 JOduMonT
 Johannes Schwab
 John Brazil
@@ -123,11 +124,13 @@ Jonny Tischbein
 Josef Moravek
 juanman
 julia.domagalska
+Julio Cova
 Karel
 Karolina
 Keith Fernie
 Klaus Weidenbach
 Koyu Berteon
+kPherox
 Kris
 Lea1995polish
 Leberwurscht
@@ -162,18 +165,20 @@ Michalina
 Mike Macgirvin
 miqrogroove
 mytbk
+nathilia-peirce
 Nicola Spanti
 Olaf Conradi
 Oliver
 Olivier
 Olivier Mehani
 Olivier Migeot
-Ozero Dien
+ozero dien
 Paolo Wave
 Pascal
 Pascal Deklerck
 Pavel Morozov
 PerigGouanvic
+peter
 Peter Liebetrau
 peturisfeld
 Phigger Phigger
@@ -193,6 +198,7 @@ Ralph
 Ratten
 rcmaniac
 rebeka-catalina
+René Wagner
 repat
 Ricardo Pereira
 Rik 4

VERSION

@@ -1 +1 @@
-2019.12-rc
+2019.12

boot.php

@@ -32,7 +32,7 @@ use Friendica\Util\DateTimeFormat;
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'Dalmatian Bellflower');
-define('FRIENDICA_VERSION',      '2019.12-rc');
+define('FRIENDICA_VERSION',      '2019.12');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 

doc/API-Mastodon.md

@@ -15,19 +15,21 @@ These endpoints use the [Mastodon API entities](https://docs.joinmastodon.org/en
 
 ## Implemented endpoints
 
-- [GET /api/v1/follow_requests](https://docs.joinmastodon.org/methods/accounts/follow_requests#pending-follows)
-- [POST /api/v1/follow_requests/:id/authorize](https://docs.joinmastodon.org/methods/accounts/follow_requests#accept-follow)
-    - Returns a [Relationship](https://docs.joinmastodon.org/entities/relationship) object.
-- [POST /api/v1/follow_requests/:id/reject](https://docs.joinmastodon.org/methods/accounts/follow_requests#reject-follow)
-    - Returns a [Relationship](https://docs.joinmastodon.org/entities/relationship) object.
-- POST /api/v1/follow_requests/:id/ignore
+- [`GET /api/v1/follow_requests`](https://docs.joinmastodon.org/methods/accounts/follow_requests#pending-follows)
+    - Returned IDs are specific to follow requests
+- [`POST /api/v1/follow_requests/:id/authorize`](https://docs.joinmastodon.org/methods/accounts/follow_requests#accept-follow)
+    - `:id` is a follow request ID, not a regular account id
+- [`POST /api/v1/follow_requests/:id/reject`](https://docs.joinmastodon.org/methods/accounts/follow_requests#reject-follow)
+    - `:id` is a follow request ID, not a regular account id
+- `POST /api/v1/follow_requests/:id/ignore`
     - Friendica-specific, hides the follow request from the list and prevents the remote contact from retrying.
+    - `:id` is a follow request ID, not a regular account id
     - Returns a [Relationship](https://docs.joinmastodon.org/entities/relationship) object.
-    
-
-- [GET /api/v1/instance](https://docs.joinmastodon.org/methods/instance#fetch-instance)
-- GET /api/v1/instance/peers - undocumented, but implemented by Mastodon and Pleroma
 
 
+- [`GET /api/v1/instance`](https://docs.joinmastodon.org/methods/instance#fetch-instance)
+- [`GET /api/v1/instance/peers`](https://docs.joinmastodon.org/methods/instance#list-of-connected-domains)
 
 ## Non-implemented endpoints
+
+- [`GET /api/v1/instance/activity`](https://docs.joinmastodon.org/methods/instance#weekly-activity)

doc/FAQ.md

@@ -172,7 +172,7 @@ Here is a list of known working clients:
 
 * Android
   * [Friendiqa](https://git.friendi.ca/lubuwest/Friendiqa) (available in Google Playstore or from a binary repository you can add to [F-Droid](https://freunde.ma-nic.de/display/3e98eba8185a13c5bdbf3d1539646854))
-  * [Fedilab](https://gitlab.com/tom79/mastalab) (available in F-Droid and Google stores)
+  * [Fedilab](https://fedilab.app/) (available in F-Droid and Google stores)
   * [DiCa](https://dica.mixi.cool/)
   * AndStatus
   * Twidere

doc/Home.md

@@ -55,7 +55,7 @@ Friendica Documentation and Resources
 	* [Move classes to `src`](help/Developer-How-To-Move-Classes-to-src)
 	* [Run tests](help/Tests)
 * Reference
-	* [Twitter/GNU Social API Functions](help/api)
+	* [API endpoints](help/api)
 	* [Code (Doxygen generated - sets cookies)](doc/html/)
 	* [Protocol Documentation](help/Protocol)
 	* [Database schema documentation](help/database)

mod/display.php

@@ -172,6 +172,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
 
 	$o = '';
 
+	$item = null;
+
 	if ($update) {
 		$item_id = $_REQUEST['item_id'];
 		$item = Item::selectFirst(['uid', 'parent', 'parent-uri'], ['id' => $item_id]);
@@ -221,7 +223,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
 		}
 	}
 
-	if (!$item_id) {
+	if (empty($item)) {
 		throw new HTTPException\NotFoundException(L10n::t('The requested item doesn\'t exist or has been deleted.'));
 	}