From c94a3ed1a8cdc18f8107a02ef721b3c1e34366f1 Mon Sep 17 00:00:00 2001 From: andriyun Date: Thu, 26 Aug 2021 09:37:26 +0200 Subject: [PATCH 1/8] Updated admin toolbar module --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 0744bf302..3cf8fee5d 100644 --- a/composer.lock +++ b/composer.lock @@ -2475,17 +2475,17 @@ }, { "name": "drupal/admin_toolbar", - "version": "2.4.0", + "version": "2.5.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/admin_toolbar.git", - "reference": "8.x-2.4" + "reference": "8.x-2.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/admin_toolbar-8.x-2.4.zip", - "reference": "8.x-2.4", - "shasum": "6240047b8d91ac78f98d861ba8282af971fa0b38" + "url": "https://ftp.drupal.org/files/projects/admin_toolbar-8.x-2.5.zip", + "reference": "8.x-2.5", + "shasum": "c71e58051b8d6818272df96d14cb11407d5e5ceb" }, "require": { "drupal/core": "^8.8.0 || ^9.0" @@ -2493,8 +2493,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.4", - "datestamp": "1601999178", + "version": "8.x-2.5", + "datestamp": "1629907119", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" From 10550430ce4fd035d70a33807c641f50d8b8a011 Mon Sep 17 00:00:00 2001 From: andriyun Date: Thu, 26 Aug 2021 09:39:20 +0200 Subject: [PATCH 2/8] Switched ballerup updb command to get dumps --- .docksal/commands/db/ballerup | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.docksal/commands/db/ballerup b/.docksal/commands/db/ballerup index ef297a16c..e3547b4e3 100755 --- a/.docksal/commands/db/ballerup +++ b/.docksal/commands/db/ballerup @@ -27,19 +27,14 @@ DRUPAL_ROOT=/var/www/ballerup.bellcom.dk/web/sites/default DRUSH="drush" echo-yellow "Copying db dump from server" -## @TODO This command only for development phase. -ssh $SSH_CRED "cd ${DRUPAL_ROOT} && drush sql-dump | gzip -9 > ~/${DB_NAME}.sql.gz" -scp $SSH_CRED:$DB_NAME* ./ -## To use after release. -#scp $SSH_CRED:/var/lib/mysql_backup/$DB_NAME* ./ +scp $SSH_CRED:/var/lib/mysql_backup/$DB_NAME* ./ echo-yellow "Dropping existing local db" fin exec "${DRUSH} sql-drop -y" echo-yellow "Loading downloaded db dump" fin exec "zcat < ${DB_NAME}.sql.gz | ${DRUSH} sqlc" -## To use after release. -#fin exec "zcat < ${DB_NAME}-cache-structure.sql.gz | ${DRUSH} sqlc" +fin exec "zcat < ${DB_NAME}-cache-structure.sql.gz | ${DRUSH} sqlc" echo-yellow "Removing db dump" fin exec "rm ${DB_NAME}.sql.gz" From 06f0c5aaae427e486fc65311607597b75534a534 Mon Sep 17 00:00:00 2001 From: andriyun Date: Thu, 26 Aug 2021 09:41:02 +0200 Subject: [PATCH 3/8] Updated docksal env settings --- .docksal/docksal.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.docksal/docksal.env b/.docksal/docksal.env index 69ec407bf..ff5882852 100644 --- a/.docksal/docksal.env +++ b/.docksal/docksal.env @@ -1,4 +1,4 @@ DOCKSAL_STACK=default DOCROOT=web -COMPOSER_DEFAULT_VERSION="1" -CLI_IMAGE="docksal/cli:2.11-php7.4" +COMPOSER_DEFAULT_VERSION="2" +CLI_IMAGE="docksal/cli:2.12-php7.4" From 7ce46dc03ae6918a62761cf185ca182c3e734754 Mon Sep 17 00:00:00 2001 From: andriyun Date: Fri, 27 Aug 2021 13:59:46 +0200 Subject: [PATCH 4/8] Updated os2web_rest_api module --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 2380d945a..3e7974578 100644 --- a/composer.json +++ b/composer.json @@ -78,7 +78,7 @@ "os2web/os2web_news": "dev-master", "os2web/os2web_pagebuilder": "dev-master", "os2web/os2web_person_information": "dev-master", - "os2web/os2web_rest_api": "^0.0.1", + "os2web/os2web_rest_api": "0.*", "os2web/os2web_search": "dev-master", "os2web/os2web_spotbox": "dev-master", "vlucas/phpdotenv": "^4.0", diff --git a/composer.lock b/composer.lock index 3cf8fee5d..a663dddc0 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": "30526c913ef9f518ec192ee05889d7af", + "content-hash": "0f4517176d6eda4aca7c500fcdde4897", "packages": [ { "name": "alchemy/zippy", @@ -11846,16 +11846,16 @@ }, { "name": "os2web/os2web_rest_api", - "version": "0.0.1", + "version": "0.0.2", "source": { "type": "git", "url": "https://github.com/OS2web/os2web_rest_api.git", - "reference": "68f8361d2612fc8ffcaa28abb49bff91ff0eee43" + "reference": "8793a5a36e5defdbd789d01472f1e2de148fa134" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OS2web/os2web_rest_api/zipball/68f8361d2612fc8ffcaa28abb49bff91ff0eee43", - "reference": "68f8361d2612fc8ffcaa28abb49bff91ff0eee43", + "url": "https://api.github.com/repos/OS2web/os2web_rest_api/zipball/8793a5a36e5defdbd789d01472f1e2de148fa134", + "reference": "8793a5a36e5defdbd789d01472f1e2de148fa134", "shasum": "" }, "require": { @@ -11870,9 +11870,9 @@ "description": "OS2Web Rest API", "support": { "issues": "https://github.com/OS2web/os2web_rest_api/issues", - "source": "https://github.com/OS2web/os2web_rest_api/tree/0.0.1" + "source": "https://github.com/OS2web/os2web_rest_api/tree/0.0.2" }, - "time": "2021-08-24T12:33:47+00:00" + "time": "2021-08-27T11:44:24+00:00" }, { "name": "os2web/os2web_search", From 5065b569b4a3d7943c072465cff2728c309ee8a3 Mon Sep 17 00:00:00 2001 From: andriyun Date: Fri, 27 Aug 2021 17:03:55 +0200 Subject: [PATCH 5/8] Updated os2web_rest_api module --- composer.lock | 71 +++++---------------------------------------------- 1 file changed, 7 insertions(+), 64 deletions(-) diff --git a/composer.lock b/composer.lock index a663dddc0..94ca2bf35 100644 --- a/composer.lock +++ b/composer.lock @@ -7242,62 +7242,6 @@ "source": "https://git.drupalcode.org/project/redirect_after_login" } }, - { - "name": "drupal/restui", - "version": "1.20.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/restui.git", - "reference": "8.x-1.20" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/restui-8.x-1.20.zip", - "reference": "8.x-1.20", - "shasum": "df1d3c486ee0e7b4e9a24e6523a69c9efe73caff" - }, - "require": { - "drupal/core": "^8.7.7 || ^9" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "8.x-1.20", - "datestamp": "1616839543", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "-enzo-", - "homepage": "https://www.drupal.org/user/294937" - }, - { - "name": "clemens.tolboom", - "homepage": "https://www.drupal.org/user/125814" - }, - { - "name": "juampynr", - "homepage": "https://www.drupal.org/user/682736" - }, - { - "name": "klausi", - "homepage": "https://www.drupal.org/user/262198" - } - ], - "description": "Provides a user interface to manage REST resources.", - "homepage": "https://www.drupal.org/project/restui", - "support": { - "source": "https://git.drupalcode.org/project/restui" - } - }, { "name": "drupal/rules", "version": "3.0.0-alpha6", @@ -11846,21 +11790,20 @@ }, { "name": "os2web/os2web_rest_api", - "version": "0.0.2", + "version": "0.0.3", "source": { "type": "git", "url": "https://github.com/OS2web/os2web_rest_api.git", - "reference": "8793a5a36e5defdbd789d01472f1e2de148fa134" + "reference": "f4e2dabcbd97c75b3d32f3247b824dc706b0d49d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OS2web/os2web_rest_api/zipball/8793a5a36e5defdbd789d01472f1e2de148fa134", - "reference": "8793a5a36e5defdbd789d01472f1e2de148fa134", + "url": "https://api.github.com/repos/OS2web/os2web_rest_api/zipball/f4e2dabcbd97c75b3d32f3247b824dc706b0d49d", + "reference": "f4e2dabcbd97c75b3d32f3247b824dc706b0d49d", "shasum": "" }, "require": { - "drupal/core": "*", - "drupal/restui": "*" + "drupal/core": "*" }, "type": "drupal-module", "notification-url": "https://packagist.org/downloads/", @@ -11870,9 +11813,9 @@ "description": "OS2Web Rest API", "support": { "issues": "https://github.com/OS2web/os2web_rest_api/issues", - "source": "https://github.com/OS2web/os2web_rest_api/tree/0.0.2" + "source": "https://github.com/OS2web/os2web_rest_api/tree/0.0.3" }, - "time": "2021-08-27T11:44:24+00:00" + "time": "2021-08-27T15:00:09+00:00" }, { "name": "os2web/os2web_search", From 075cf42413c176631314f98c6e912249a24b77f4 Mon Sep 17 00:00:00 2001 From: andriyun Date: Mon, 30 Aug 2021 13:46:10 +0200 Subject: [PATCH 6/8] Update os2web_rest_api --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 94ca2bf35..009932795 100644 --- a/composer.lock +++ b/composer.lock @@ -11790,16 +11790,16 @@ }, { "name": "os2web/os2web_rest_api", - "version": "0.0.3", + "version": "0.0.4", "source": { "type": "git", "url": "https://github.com/OS2web/os2web_rest_api.git", - "reference": "f4e2dabcbd97c75b3d32f3247b824dc706b0d49d" + "reference": "2239681b3634e646a8f9e4863142015fcbbf0b5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OS2web/os2web_rest_api/zipball/f4e2dabcbd97c75b3d32f3247b824dc706b0d49d", - "reference": "f4e2dabcbd97c75b3d32f3247b824dc706b0d49d", + "url": "https://api.github.com/repos/OS2web/os2web_rest_api/zipball/2239681b3634e646a8f9e4863142015fcbbf0b5f", + "reference": "2239681b3634e646a8f9e4863142015fcbbf0b5f", "shasum": "" }, "require": { @@ -11813,9 +11813,9 @@ "description": "OS2Web Rest API", "support": { "issues": "https://github.com/OS2web/os2web_rest_api/issues", - "source": "https://github.com/OS2web/os2web_rest_api/tree/0.0.3" + "source": "https://github.com/OS2web/os2web_rest_api/tree/0.0.4" }, - "time": "2021-08-27T15:00:09+00:00" + "time": "2021-08-30T11:44:10+00:00" }, { "name": "os2web/os2web_search", From 6871cb37d7ae258bee6c2e443d91f2f4ceb7f99b Mon Sep 17 00:00:00 2001 From: andriyun Date: Wed, 1 Sep 2021 16:39:29 +0200 Subject: [PATCH 7/8] Updated anonymous subscription module --- composer.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.lock b/composer.lock index 009932795..b2771d4cf 100644 --- a/composer.lock +++ b/composer.lock @@ -2557,7 +2557,7 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/anonymous_subscriptions.git", - "reference": "7d657a65a660da1e7005e5f78f22d0949718d8d5" + "reference": "970a1fda8dfa69bad7134abd993532283d96848f" }, "require": { "drupal/core": "^8.7.7 || ^9" @@ -2568,8 +2568,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.0-alpha+5-dev", - "datestamp": "1625218445", + "version": "8.x-1.0-alpha+7-dev", + "datestamp": "1628082826", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." From b97c11adaf32f912db0712fb118bb22474625f5e Mon Sep 17 00:00:00 2001 From: andriyun Date: Fri, 3 Sep 2021 12:31:26 +0200 Subject: [PATCH 8/8] Added file management contrib module --- composer.json | 1 + composer.lock | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3e7974578..f0b43fd9c 100644 --- a/composer.json +++ b/composer.json @@ -52,6 +52,7 @@ "drupal/core": "^8.8.0", "drupal/core-composer-scaffold": "^8.8.0", "drupal/fancy_file_delete": "^2.0", + "drupal/file_management": "^1.0@alpha", "drupal/gin": "^3.0", "drupal/gin_login": "^1.0@RC", "drupal/memcache": "^2.2", diff --git a/composer.lock b/composer.lock index b2771d4cf..b223c4911 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": "0f4517176d6eda4aca7c500fcdde4897", + "content-hash": "413e362477b015e71176860985ce0ad8", "packages": [ { "name": "alchemy/zippy", @@ -5472,6 +5472,56 @@ "source": "https://git.drupalcode.org/project/fieldblock" } }, + { + "name": "drupal/file_management", + "version": "1.0.0-alpha3", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/file_management.git", + "reference": "8.x-1.0-alpha3" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/file_management-8.x-1.0-alpha3.zip", + "reference": "8.x-1.0-alpha3", + "shasum": "90c0ae85f06ecddff5adfbd4ca7fcdd9ad50bdb6" + }, + "require": { + "drupal/core": "~8.0" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.0-alpha3", + "datestamp": "1553253780", + "security-coverage": { + "status": "not-covered", + "message": "Project has not opted into security advisory coverage!" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "David Pacassi Torrico (dpacassi)", + "homepage": "https://www.drupal.org/u/dpacassi", + "role": "Maintainer" + }, + { + "name": "mattbloomfield", + "homepage": "https://www.drupal.org/user/3620586" + } + ], + "description": "Allows you to edit existing files or images.", + "homepage": "https://www.drupal.org/project/file_management", + "support": { + "source": "https://cgit.drupalcode.org/file_management", + "issues": "https://www.drupal.org/project/issues/file_management" + } + }, { "name": "drupal/gin", "version": "3.0.0-alpha35", @@ -21016,6 +21066,7 @@ "stability-flags": { "bellcom/fds_base_theme": 20, "drupal/anonymous_subscriptions": 20, + "drupal/file_management": 15, "drupal/gin_login": 5, "os2web/os2web": 20, "os2web/os2web_borgerdk": 20,