Merge remote-tracking branch 'upstream/develop' into remote-rework

diff --git a/CHANGELOG b/CHANGELOG
index d3a3f83ed827ada0e1315d7c3d885b268bf1a03d..0121e1d5f56927588a93578dc9f404fec7702216 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2019.09-dev (UNRELEASED)
+Version 2019.09 (2019-09-29)
   Friendica Core:
     Update to the translations (CS, DE, EN GB, EN US, FR, JA, NL, PL) [translation teams]
     Update to the themes (frio, vier) [JeroenED, MrPetovan, tobiasd, vinzv]
@@ -10,16 +10,16 @@ Version 2019.09-dev (UNRELEASED)
     Enhanced communication about deleted accounts via AP [annando]
     Enhanced the following process [annando]
     Enhanced the tests [nupplaphil]
-    Enhanced the frontend worker [annando]
+    Enhanced the front-end worker [annando]
     Enhanced the img format to allow alternative texts [annando]
     Enhanced the detection of supported protocols for contacts [annando]
-    Enhanced the reshare of items [annando]
+    Enhanced the re-share of items [annando]
     Enhanced 2FA process [MrPetovan]
     Enhanced server wide theme settings [MrPetovan]
     Enhanced config loading process [MrPetovan, nupplaphil]
     Enhanced handling of emoticons [MrPetovan]
     Enhanced performance [annando]
-    Fixed a bug in the admin panel leading to orphand options [tobiasd]
+    Fixed a bug in the admin panel leading to orphaned options [tobiasd]
     Fixed a problem that could lead to duplicated Pleroma contacts [annando]
     Fixed a problem with the hide profile setting [annando]
     Fixed the problem sending out the post when hitting the enter key in the ACL dialog [MrPetovan]
@@ -40,7 +40,8 @@ Version 2019.09-dev (UNRELEASED)
     Fixed a bug in BBCode -> Markdown conversation for font size [annando]
     Fixed a BBCode parser problem with the audio tag [MrPetovan]
     Fixed a session problem [annando]
-    Fixed a problem with the autoinstaller [nupplaphil]
+    Fixed a problem with the auto-installer [nupplaphil]
+    Fixed a bug with magic links redirection for non profiles [annando]
     General code cleaning [annando, MrPetovan, nupplaphil]
     Removed contacts auto completion (in /contacts [MrPetovan]
     Replaced FontAwesome by ForkAwesome in frio theme [vinzv]
@@ -73,7 +74,7 @@ Version 2019.09-dev (UNRELEASED)
     7367, 7383, 7396, 7397, 7401, 7406, 7408, 7426, 7428, 7456, 7442,
     7457, 7468, 7471, 7473, 7488, 7497, 7498, 7501, 7507, 7521, 7526,
     7527, 7536, 7542, 7545, 7576, 7586, 7594, 7597, 7603, 7610, 7618,
-    7629, 7635, 7638, 7663, 7665
+    7629, 7635, 7638, 7663, 7665, 7672
 
 Version 2019.06 (2019-06-23)
   Friendica Core:

diff --git a/VERSION b/VERSION
index 3193eddcdaf16b7896a168386a38853a2f72423f..41367d09e212cd613662bac5cac516c365f52da9 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2019.09-rc
+2019.12-dev

diff --git a/boot.php b/boot.php
index 6aada42cbef6a9399f124ecf553091634eb4e17e..9d7ee2b0923beeac4d95d97a79d20700887196ca 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -32,7 +32,7 @@ use Friendica\Util\DateTimeFormat;
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'Dalmatian Bellflower');
-define('FRIENDICA_VERSION',      '2019.09-rc');
+define('FRIENDICA_VERSION',      '2019.12-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);