From c555343d669499cab2c2d2f18c40cc251891e69e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 7 May 2020 07:06:22 +0200 Subject: [PATCH 01/12] Hot Fix: Move perfect-scrollbar dependency from Bower to npm - The original git repository used in Bower was wiped --- composer.json | 12 +++--- composer.lock | 61 +++++++++++++++++++++++++++++- view/templates/head.tpl | 6 ++- view/theme/frio/templates/head.tpl | 6 ++- 4 files changed, 76 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 108ea8473d..20bc30edbe 100644 --- a/composer.json +++ b/composer.json @@ -50,19 +50,19 @@ "bower-asset/base64": "^1.0", "bower-asset/chart-js": "^2.8", "bower-asset/dompurify": "^1.0", - "bower-asset/perfect-scrollbar": "^0.6", + "bower-asset/fork-awesome": "^1.1", "bower-asset/vue": "^2.6", + "npm-asset/cropperjs": "1.2.2", "npm-asset/es-jquery-sortable": "^0.9.13", + "npm-asset/fullcalendar": "^3.10", + "npm-asset/imagesloaded": "4.1.4", "npm-asset/jquery": "^2.0", "npm-asset/jquery-colorbox": "^1.6", "npm-asset/jquery-datetimepicker": "^2.5", "npm-asset/jgrowl": "^1.4", "npm-asset/moment": "^2.24", - "npm-asset/fullcalendar": "^3.10", - "npm-asset/cropperjs": "1.2.2", - "npm-asset/imagesloaded": "4.1.4", - "npm-asset/typeahead.js": "^0.11.1", - "bower-asset/fork-awesome": "^1.1" + "npm-asset/perfect-scrollbar": "0.6.16", + "npm-asset/typeahead.js": "^0.11.1" }, "repositories": [ { diff --git a/composer.lock b/composer.lock index 8834f3f701..60b883d841 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e1a839b13f7ba5892c8730d0da3ddf1c", + "content-hash": "b3a7490d8f103ef40431848a26fcc2a6", "packages": [ { "name": "asika/simple-console", @@ -1755,6 +1755,64 @@ ], "time": "2019-01-21T21:10:34+00:00" }, + { + "name": "npm-asset/perfect-scrollbar", + "version": "0.6.16", + "dist": { + "type": "tar", + "url": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-0.6.16.tgz", + "shasum": "b1d61a5245cf3962bb9a8407a3fc669d923212fc" + }, + "type": "npm-asset-library", + "extra": { + "npm-asset-bugs": { + "url": "https://github.com/noraesae/perfect-scrollbar/issues" + }, + "npm-asset-files": [ + "dist", + "src", + "index.js", + "jquery.js", + "perfect-scrollbar.d.ts" + ], + "npm-asset-main": "./index.js", + "npm-asset-directories": [], + "npm-asset-repository": { + "type": "git", + "url": "git+https://github.com/noraesae/perfect-scrollbar.git" + }, + "npm-asset-scripts": { + "test": "gulp", + "before-deploy": "gulp && gulp compress", + "release": "rm -rf dist && gulp && npm publish" + }, + "npm-asset-engines": { + "node": ">= 0.12.0" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Hyunje Jun", + "email": "me@noraesae.net" + }, + { + "name": "Hyunje Jun", + "email": "me@noraesae.net" + } + ], + "description": "Minimalistic but perfect custom scrollbar plugin", + "homepage": "https://github.com/noraesae/perfect-scrollbar#readme", + "keywords": [ + "frontend", + "jquery-plugin", + "scroll", + "scrollbar" + ], + "time": "2017-01-10T01:03:05+00:00" + }, { "name": "npm-asset/php-date-formatter", "version": "v1.3.5", @@ -3018,6 +3076,7 @@ ], "description": "This tool check syntax of PHP files about 20x faster than serial check.", "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint", + "abandoned": "php-parallel-lint/php-parallel-lint", "time": "2018-02-24T15:31:20+00:00" }, { diff --git a/view/templates/head.tpl b/view/templates/head.tpl index 3896a4b4ad..eaec270364 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -6,7 +6,7 @@ - + {{foreach $stylesheets as $stylesheetUrl}} @@ -40,7 +40,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> f1c1103e1... Merge pull request #8595 from MrPetovan/task/8578-perfect-scrollbar-dependency diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl index b539a90d96..d0821f36e0 100644 --- a/view/theme/frio/templates/head.tpl +++ b/view/theme/frio/templates/head.tpl @@ -11,7 +11,7 @@ - + @@ -61,7 +61,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> f1c1103e1... Merge pull request #8595 from MrPetovan/task/8578-perfect-scrollbar-dependency From a3168bcbf68ca9007c124563eb7a8f4bc8cbffac Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 13 May 2020 23:59:22 -0400 Subject: [PATCH 02/12] Hot Fix: Actually remove bower-asset/perfect-scrollbar from composer.lock --- composer.lock | 44 ++++++-------------------------------------- 1 file changed, 6 insertions(+), 38 deletions(-) diff --git a/composer.lock b/composer.lock index 60b883d841..155f754ae0 100644 --- a/composer.lock +++ b/composer.lock @@ -237,37 +237,6 @@ ], "time": "2019-02-28T15:21:34+00:00" }, - { - "name": "bower-asset/perfect-scrollbar", - "version": "0.6.16", - "source": { - "type": "git", - "url": "https://github.com/utatti/perfect-scrollbar-bower.git", - "reference": "3049129e5dbb403295ce8507a461cdd0f200938c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/utatti/perfect-scrollbar-bower/zipball/3049129e5dbb403295ce8507a461cdd0f200938c", - "reference": "3049129e5dbb403295ce8507a461cdd0f200938c", - "shasum": "" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": [ - "css/perfect-scrollbar.css", - "js/perfect-scrollbar.js" - ], - "bower-asset-ignore": [ - "**/.*", - "bower_components" - ] - }, - "license": [ - "MIT" - ], - "description": "Minimalistic but perfect custom scrollbar plugin", - "time": "2017-01-10T01:04:09+00:00" - }, { "name": "bower-asset/vue", "version": "v2.6.10", @@ -485,7 +454,6 @@ "jsonld.php" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], @@ -503,11 +471,11 @@ "description": "A JSON-LD Processor and API implementation in PHP.", "homepage": "https://git.friendi.ca/friendica/php-json-ld", "keywords": [ + "JSON", "JSON-LD", "Linked Data", "RDF", "Semantic Web", - "json", "jsonld" ], "time": "2018-10-08T20:41:00+00:00" @@ -3984,7 +3952,7 @@ } ], "description": "Provides the functionality to compare PHP values for equality", - "homepage": "https://github.com/sebastianbergmann/comparator", + "homepage": "http://www.github.com/sebastianbergmann/comparator", "keywords": [ "comparator", "compare", @@ -4086,7 +4054,7 @@ } ], "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "https://github.com/sebastianbergmann/environment", + "homepage": "http://www.github.com/sebastianbergmann/environment", "keywords": [ "Xdebug", "environment", @@ -4154,7 +4122,7 @@ } ], "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "https://github.com/sebastianbergmann/exporter", + "homepage": "http://www.github.com/sebastianbergmann/exporter", "keywords": [ "export", "exporter" @@ -4206,7 +4174,7 @@ } ], "description": "Snapshotting of global state", - "homepage": "https://github.com/sebastianbergmann/global-state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", "keywords": [ "global state" ], @@ -4308,7 +4276,7 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "https://github.com/sebastianbergmann/recursion-context", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", "time": "2016-11-19T07:33:16+00:00" }, { From 9e90c6fdf77ea6f0c329863ea0b041f0e2035c89 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 14 May 2020 00:01:38 -0400 Subject: [PATCH 03/12] Hot Fix: Fix remaining conflicts in templates --- view/templates/head.tpl | 4 ---- view/theme/frio/templates/head.tpl | 4 ---- 2 files changed, 8 deletions(-) diff --git a/view/templates/head.tpl b/view/templates/head.tpl index eaec270364..f1ffcf69a5 100644 --- a/view/templates/head.tpl +++ b/view/templates/head.tpl @@ -40,11 +40,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> f1c1103e1... Merge pull request #8595 from MrPetovan/task/8578-perfect-scrollbar-dependency diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl index d0821f36e0..9ad0c8a7e9 100644 --- a/view/theme/frio/templates/head.tpl +++ b/view/theme/frio/templates/head.tpl @@ -61,11 +61,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> f1c1103e1... Merge pull request #8595 from MrPetovan/task/8578-perfect-scrollbar-dependency From a62cc8d27701e77a2c3b50fec4590169fa89f8a3 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 27 Jun 2020 16:24:03 +0200 Subject: [PATCH 04/12] 2020.06 CHANGELOG --- CHANGELOG | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 89f200df9b..6da44b90b9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,11 +1,53 @@ Version 2020.06 (unreleased) Friendica Core: + Update to the translations: DE, FR, ET, NL, PL, RU, ZH-CN [translation teams] + Updates to the themes (frio, vier) [MrPetovan] + Updated the shipped composer version, and the dependency list [annando, MrPetovan, tobiasd] + Updates to the documentation [MrPetovan] + General code refactoring and enhancements [AlfredSK, annando, MrPetovan] + Replace charged terms with "allowlist", "denylist" and "blocklist" [MrPetovan] + Enhanced the comment distribution in threads that involve diaspora*, AP and DFRN actors [annando] + Enhanced the profile probing mechanism [annando, MrPetovan] + Enhanced the post update process of the database [annando] + Enhanced the database performance [annando] + Enhanced ActivityPub attachment handling [MrPetovan] + Enhanced security of redirections [annando] + Enhanced database performance [annando] + Enhanced the handling of BBCode [pre] tags [MrPetovan] + Enhanced Markdown to BBCode conversion [MrPetovan] + Fixed a problem recognising logins via the API [MrPetovan] + Fixed a problem with handling local diaspora* URLs [MrPetovan] + Fixed a problem with implicit mentions [annando] + Fixed a problem with the password reset token security [lynn-stephenson] + Fixed a problem with receiving non-public posts via ActivityPub [annando] + Fixed a problem with the photo endpoint of the API [MrPetovan] + Fixed a problem with pressing the ESC key in the frio-theme [MrPetovan] + Fixed a problem with the display if post categories [annando] + Added notification count to page title [MrPetovan] + Added handling of relative URLs during feed detection [MrPetovan] + Added entities [nupplaphil] Friendica Addons: + Diaspora*: + Enhanced conntector settings [MrPetovan] + PHP Mailer SMTP: + Updated phpmailer version [dependabot] showmore_dyn: New addon to collapse long post depending on their actual height [wiwie] + twitter: + Enhaceed the handling of mobile twitter URLs [annando] + Enhanced the handling of quoted tweets [MrPetovan] + added HTML error code handling [MrPetovan] + various: + enhancements to the probe mechanism [MrPetovan] Closed Issues: + 3084, 3884, 8287, 8314, 8374, 8400, 8425, 8432, 8458, 8470, 8477, + 8482, 8488, 8489, 8490, 8493, 8495, 8498, 8511, 8523, 8527, 8551, + 8553, 8560, 8564, 8565, 8568, 8578, 8586, 8593, 8606, 8610, 8612, + 8626, 8664, 8672, 8683, 8685, 8691, 8694, 8702, 8714, 8717, 8722, + 8726, 8732, 8736, 8743, 8744, 8746, 8756, 8766, 8769, 8781, 8800, + 8807, 8808 Version 2020.03 "Red Hot Poker" (2020-03-30) Friendica Core: From 44d995ad905b19e0ed748caac297db3c81ab9936 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 27 Jun 2020 16:33:13 +0200 Subject: [PATCH 05/12] translations of the addons --- CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 6da44b90b9..e5d73be082 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -28,7 +28,8 @@ Version 2020.06 (unreleased) Added entities [nupplaphil] Friendica Addons: - Diaspora*: + Update to the translations (NB NO, NL, PL, RU, ZH CN) [translation teams] + Diaspora*: Enhanced conntector settings [MrPetovan] PHP Mailer SMTP: Updated phpmailer version [dependabot] From d8cf36435cb381d4a5115a096d7ef12e021b89b1 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 1 Jul 2020 12:43:32 +0200 Subject: [PATCH 06/12] indentation --- CHANGELOG | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e5d73be082..defa45820e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -28,8 +28,8 @@ Version 2020.06 (unreleased) Added entities [nupplaphil] Friendica Addons: - Update to the translations (NB NO, NL, PL, RU, ZH CN) [translation teams] - Diaspora*: + Update to the translations (NB NO, NL, PL, RU, ZH CN) [translation teams] + Diaspora*: Enhanced conntector settings [MrPetovan] PHP Mailer SMTP: Updated phpmailer version [dependabot] From cd68341de7a61727931e902a040bf54680d1ad21 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 12 Jul 2020 10:18:41 +0200 Subject: [PATCH 07/12] updated closed issue numbers --- CHANGELOG | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index defa45820e..ef35e6a5db 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -44,11 +44,11 @@ Version 2020.06 (unreleased) Closed Issues: 3084, 3884, 8287, 8314, 8374, 8400, 8425, 8432, 8458, 8470, 8477, - 8482, 8488, 8489, 8490, 8493, 8495, 8498, 8511, 8523, 8527, 8551, - 8553, 8560, 8564, 8565, 8568, 8578, 8586, 8593, 8606, 8610, 8612, - 8626, 8664, 8672, 8683, 8685, 8691, 8694, 8702, 8714, 8717, 8722, - 8726, 8732, 8736, 8743, 8744, 8746, 8756, 8766, 8769, 8781, 8800, - 8807, 8808 + 8482, 8488, 8489, 8490, 8493, 8495, 8498, 8511, 8517, 8523, 8527, + 8551, 8553, 8560, 8564, 8565, 8568, 8578, 8586, 8593, 8606, 8610, + 8612, 8626, 8664, 8672, 8683, 8685, 8691, 8694, 8702, 8709, 8714, + 8717, 8722, 8726, 8732, 8736, 8743, 8744, 8746, 8756, 8766, 8769, + 8781, 8800, 8807, 8808, 8827, 8829, 8836, 8844, 8846, 8857 Version 2020.03 "Red Hot Poker" (2020-03-30) Friendica Core: From d8c669c5bea48a4cd1bd4123d66a68658df5f884 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 12 Jul 2020 12:28:06 +0200 Subject: [PATCH 08/12] enhanced blockbot list and a potential release date --- CHANGELOG | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ef35e6a5db..39057855b7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ -Version 2020.06 (unreleased) +Version 2020.07 (2020-07-12) Friendica Core: - Update to the translations: DE, FR, ET, NL, PL, RU, ZH-CN [translation teams] + Update to the translations: DE, EN GB, EN US, FR, ET, NL, PL, RU, ZH-CN [translation teams] Updates to the themes (frio, vier) [MrPetovan] Updated the shipped composer version, and the dependency list [annando, MrPetovan, tobiasd] Updates to the documentation [MrPetovan] @@ -15,6 +15,7 @@ Version 2020.06 (unreleased) Enhanced database performance [annando] Enhanced the handling of BBCode [pre] tags [MrPetovan] Enhanced Markdown to BBCode conversion [MrPetovan] + Enhanced the speed of the network page [annando] Fixed a problem recognising logins via the API [MrPetovan] Fixed a problem with handling local diaspora* URLs [MrPetovan] Fixed a problem with implicit mentions [annando] @@ -23,12 +24,17 @@ Version 2020.06 (unreleased) Fixed a problem with the photo endpoint of the API [MrPetovan] Fixed a problem with pressing the ESC key in the frio-theme [MrPetovan] Fixed a problem with the display if post categories [annando] + Fixed a problem with validation of feeds [annando] + Fixed a problem that prevented AP activities being fetched sometimes [annando] + Renamed the -q option of the console user delete command to -y [MrPetovan] Added notification count to page title [MrPetovan] Added handling of relative URLs during feed detection [MrPetovan] Added entities [nupplaphil] Friendica Addons: - Update to the translations (NB NO, NL, PL, RU, ZH CN) [translation teams] + Update to the translations (EN GB, NB NO, NL, PL, RU, ZH CN) [translation teams] + blockbot: + The list of accepted user agents was enhanced [annando] Diaspora*: Enhanced conntector settings [MrPetovan] PHP Mailer SMTP: From 03eae812d24d78a3b210feb3395225f3aa65f0ad Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 12 Jul 2020 17:27:38 +0200 Subject: [PATCH 09/12] an issue closed --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 39057855b7..5de7de698c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -54,7 +54,7 @@ Version 2020.07 (2020-07-12) 8551, 8553, 8560, 8564, 8565, 8568, 8578, 8586, 8593, 8606, 8610, 8612, 8626, 8664, 8672, 8683, 8685, 8691, 8694, 8702, 8709, 8714, 8717, 8722, 8726, 8732, 8736, 8743, 8744, 8746, 8756, 8766, 8769, - 8781, 8800, 8807, 8808, 8827, 8829, 8836, 8844, 8846, 8857 + 8781, 8800, 8807, 8808, 8827, 8829, 8836, 8844, 8846, 8857, 8866 Version 2020.03 "Red Hot Poker" (2020-03-30) Friendica Core: From 98eb53c20f6e42d095c4991ead1099d4c317782a Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 12 Jul 2020 20:48:26 +0200 Subject: [PATCH 10/12] Version 2020.07 --- VERSION | 2 +- boot.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index dfee2dea7a..13c5ea6649 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2020.06-rc +2020.07 diff --git a/boot.php b/boot.php index d5a01c044e..cf86d67627 100644 --- a/boot.php +++ b/boot.php @@ -38,7 +38,7 @@ use Friendica\Util\DateTimeFormat; define('FRIENDICA_PLATFORM', 'Friendica'); define('FRIENDICA_CODENAME', 'Red Hot Poker'); -define('FRIENDICA_VERSION', '2020.06-rc'); +define('FRIENDICA_VERSION', '2020.07'); define('DFRN_PROTOCOL_VERSION', '2.23'); define('NEW_UPDATE_ROUTINE_VERSION', 1170); From 13a4483c59d916b48f9585beb7f5a71328055b72 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 12 Jul 2020 20:50:27 +0200 Subject: [PATCH 11/12] Version 2020.09-dev --- VERSION | 2 +- boot.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 13c5ea6649..454e445f6e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2020.07 +2020.09-dev diff --git a/boot.php b/boot.php index cf86d67627..b07ad8483f 100644 --- a/boot.php +++ b/boot.php @@ -38,7 +38,7 @@ use Friendica\Util\DateTimeFormat; define('FRIENDICA_PLATFORM', 'Friendica'); define('FRIENDICA_CODENAME', 'Red Hot Poker'); -define('FRIENDICA_VERSION', '2020.07'); +define('FRIENDICA_VERSION', '2020.09-dev'); define('DFRN_PROTOCOL_VERSION', '2.23'); define('NEW_UPDATE_ROUTINE_VERSION', 1170); From a345a7acfbe550715d64dba08c20f8bde9e2fc46 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 12 Jul 2020 21:23:03 +0200 Subject: [PATCH 12/12] mark 2020.09 as unreleased in the CHANGELOG --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 5de7de698c..2c5662c2b7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +Version 2020.09 (unreleased) + Version 2020.07 (2020-07-12) Friendica Core: Update to the translations: DE, EN GB, EN US, FR, ET, NL, PL, RU, ZH-CN [translation teams]