diff --git a/composer.json b/composer.json index c642c4ac2bae48778f8e0ad11045baa487e0dd3f..54d59e0bb6181c641dfbb3ac0116fa1611dcfaae 100644 --- a/composer.json +++ b/composer.json @@ -68,8 +68,8 @@ "wpackagist-theme/threattocreativity": "^3.2", "wpackagist-theme/twentyeleven": "^3.5", "wpackagist-theme/twentyfifteen": "^2.7", - "wpackagist-theme/twentyfourteen": "^2.9", - "wpackagist-theme/twentynineteen": "^1.7", + "wpackagist-theme/twentyfourteen": "^3.1", + "wpackagist-theme/twentynineteen": "^2.0", "wpackagist-theme/twentyseventeen": "^2.4", "wpackagist-theme/twentysixteen": "^2.2", "wpackagist-theme/twentyten": "^3.1", @@ -89,7 +89,7 @@ "wpackagist-plugin/autopost-to-mastodon": "^3.6", "wpackagist-plugin/bogo": "^3.3", "wpackagist-plugin/classic-editor": "^1.6", - "wpackagist-plugin/disable-comments": "^1.11", + "wpackagist-plugin/disable-comments": "1.11.0", "wpackagist-plugin/dvk-social-sharing": "^1.3", "wpackagist-plugin/event-list": "^0.8.3", "wpackagist-plugin/feedwordpress": "^2020.0818", @@ -107,7 +107,7 @@ "wpackagist-plugin/wordpress-importer": "^0.7.0", "wpackagist-plugin/wp-recaptcha-bp": "^4.1", "wpackagist-plugin/wp2pgpmail": "^1.27", - "wpackagist-plugin/buddypress": "^6.3", + "wpackagist-plugin/buddypress": "^7.3", "noblogs/noblogs-home": "^0.1.0", "wpackagist-plugin/katex": "^2.1", "noblogs/eu-compliance": "^0.1.0", diff --git a/composer.lock b/composer.lock index 5706811c939035b407d36cf15222bfbc959c8611..a7e48de5b51f906016ff231bd08ae526cb3ab147 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": "fc4d813a81be3aa85951300ed0837ba6", + "content-hash": "716e0fc0b8a1dd99f716c32d0b33655e", "packages": [ { "name": "bjornjohansen/wplang", @@ -47,16 +47,16 @@ }, { "name": "composer/installers", - "version": "v1.10.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d" + "reference": "ae03311f45dfe194412081526be2e003960df74b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d", - "reference": "1a0357fccad9d1cc1ea0c9a05b8847fbccccb78d", + "url": "https://api.github.com/repos/composer/installers/zipball/ae03311f45dfe194412081526be2e003960df74b", + "reference": "ae03311f45dfe194412081526be2e003960df74b", "shasum": "" }, "require": { @@ -150,6 +150,7 @@ "majima", "mako", "mediawiki", + "miaoxing", "modulework", "modx", "moodle", @@ -167,6 +168,7 @@ "sydes", "sylius", "symfony", + "tastyigniter", "typo3", "wordpress", "yawik", @@ -187,7 +189,7 @@ "type": "tidelift" } ], - "time": "2021-01-14T11:07:16+00:00" + "time": "2021-04-28T06:42:17+00:00" }, { "name": "cweagans/composer-patches", @@ -419,6 +421,11 @@ { "name": "noblogs/ai-buddypress-plugin", "version": "0.1.1", + "source": { + "type": "git", + "url": "https://git.autistici.org/noblogs/ai-buddypress-plugin.git", + "reference": "040fbb40e585eade232f046bd31f9b10415263d5" + }, "dist": { "type": "zip", "url": "https://git.autistici.org/api/v4/projects/486/packages/composer/archives/noblogs/ai-buddypress-plugin.zip?sha=040fbb40e585eade232f046bd31f9b10415263d5", @@ -440,6 +447,11 @@ { "name": "noblogs/ai-mu-plugins", "version": "0.1.1", + "source": { + "type": "git", + "url": "https://git.autistici.org/noblogs/ai-mu-plugins.git", + "reference": "52441dfe74a4f0ab667effbbe32c3539a002c4dd" + }, "dist": { "type": "zip", "url": "https://git.autistici.org/api/v4/projects/452/packages/composer/archives/noblogs/ai-mu-plugins.zip?sha=52441dfe74a4f0ab667effbbe32c3539a002c4dd", @@ -461,6 +473,11 @@ { "name": "noblogs/eu-compliance", "version": "0.1.0", + "source": { + "type": "git", + "url": "https://git.autistici.org/noblogs/eu-compliance.git", + "reference": "05a3c2427024a8f3611b59c3ee2c3f7e1f9f553b" + }, "dist": { "type": "zip", "url": "https://git.autistici.org/api/v4/projects/466/packages/composer/archives/noblogs/eu-compliance.zip?sha=05a3c2427024a8f3611b59c3ee2c3f7e1f9f553b", @@ -485,6 +502,11 @@ { "name": "noblogs/noblogs-home", "version": "0.1.0", + "source": { + "type": "git", + "url": "https://git.autistici.org/noblogs/noblogs-home.git", + "reference": "5a09630127c6b9e6c8d3d12a02167151dcc1f447" + }, "dist": { "type": "zip", "url": "https://git.autistici.org/api/v4/projects/467/packages/composer/archives/noblogs/noblogs-home.zip?sha=5a09630127c6b9e6c8d3d12a02167151dcc1f447", @@ -513,6 +535,11 @@ { "name": "noblogs/noblogs-wp-ssl", "version": "0.1.0", + "source": { + "type": "git", + "url": "https://git.autistici.org/noblogs/noblogs-wp-ssl.git", + "reference": "fe58b34f3a940322ecf74356425d0dc4fc47b7c8" + }, "dist": { "type": "zip", "url": "https://git.autistici.org/api/v4/projects/221/packages/composer/archives/noblogs/noblogs-wp-ssl.zip?sha=fe58b34f3a940322ecf74356425d0dc4fc47b7c8", @@ -534,6 +561,11 @@ { "name": "noblogs/nospam", "version": "0.1.2", + "source": { + "type": "git", + "url": "https://git.autistici.org/noblogs/nospam.git", + "reference": "1ad2dac27cb795be25d7b4473b05bda4dd14e7b2" + }, "dist": { "type": "zip", "url": "https://git.autistici.org/api/v4/projects/465/packages/composer/archives/noblogs/nospam.zip?sha=1ad2dac27cb795be25d7b4473b05bda4dd14e7b2", @@ -555,6 +587,11 @@ { "name": "noblogs/r2db", "version": "0.1.7", + "source": { + "type": "git", + "url": "https://git.autistici.org/noblogs/r2db.git", + "reference": "9261edddf161b186ed8bf6245c6fe5baa88d5068" + }, "dist": { "type": "zip", "url": "https://git.autistici.org/api/v4/projects/449/packages/composer/archives/noblogs/r2db.zip?sha=9261edddf161b186ed8bf6245c6fe5baa88d5068", @@ -579,6 +616,11 @@ { "name": "noblogs/remove-gravatar", "version": "0.1.1", + "source": { + "type": "git", + "url": "https://git.autistici.org/noblogs/remove-gravatar.git", + "reference": "080ff553dc8fa0b6c7e2939f6d88f42e747fb2ee" + }, "dist": { "type": "zip", "url": "https://git.autistici.org/api/v4/projects/456/packages/composer/archives/noblogs/remove-gravatar.zip?sha=080ff553dc8fa0b6c7e2939f6d88f42e747fb2ee", @@ -603,6 +645,11 @@ { "name": "noblogs/themes-child", "version": "0.1.1", + "source": { + "type": "git", + "url": "https://git.autistici.org/noblogs/themes-child.git", + "reference": "d166355c78aa2de6c469d64a6fa843ef1f593e49" + }, "dist": { "type": "zip", "url": "https://git.autistici.org/api/v4/projects/464/packages/composer/archives/noblogs/themes-child.zip?sha=d166355c78aa2de6c469d64a6fa843ef1f593e49", @@ -619,6 +666,11 @@ { "name": "noblogs/themes-misc", "version": "0.1.1", + "source": { + "type": "git", + "url": "https://git.autistici.org/noblogs/themes-misc.git", + "reference": "829b0a411a869e372a4cc360139cd04a0d699a19" + }, "dist": { "type": "zip", "url": "https://git.autistici.org/api/v4/projects/487/packages/composer/archives/noblogs/themes-misc.zip?sha=829b0a411a869e372a4cc360139cd04a0d699a19", @@ -776,15 +828,15 @@ }, { "name": "wpackagist-plugin/buddypress", - "version": "6.4.0", + "version": "7.3.0", "source": { "type": "svn", "url": "https://plugins.svn.wordpress.org/buddypress/", - "reference": "tags/6.4.0" + "reference": "tags/7.3.0" }, "dist": { "type": "zip", - "url": "https://downloads.wordpress.org/plugin/buddypress.6.4.0.zip" + "url": "https://downloads.wordpress.org/plugin/buddypress.7.3.0.zip" }, "require": { "composer/installers": "~1.0" @@ -895,15 +947,15 @@ }, { "name": "wpackagist-plugin/event-list", - "version": "0.8.5", + "version": "0.8.6", "source": { "type": "svn", "url": "https://plugins.svn.wordpress.org/event-list/", - "reference": "tags/0.8.5" + "reference": "tags/0.8.6" }, "dist": { "type": "zip", - "url": "https://downloads.wordpress.org/plugin/event-list.0.8.5.zip" + "url": "https://downloads.wordpress.org/plugin/event-list.0.8.6.zip" }, "require": { "composer/installers": "~1.0" @@ -1257,15 +1309,15 @@ }, { "name": "wpackagist-plugin/wp-super-cache", - "version": "1.7.2", + "version": "1.7.3", "source": { "type": "svn", "url": "https://plugins.svn.wordpress.org/wp-super-cache/", - "reference": "tags/1.7.2" + "reference": "tags/1.7.3" }, "dist": { "type": "zip", - "url": "https://downloads.wordpress.org/plugin/wp-super-cache.1.7.2.zip" + "url": "https://downloads.wordpress.org/plugin/wp-super-cache.1.7.3.zip" }, "require": { "composer/installers": "~1.0" @@ -1896,15 +1948,15 @@ }, { "name": "wpackagist-theme/twentyfourteen", - "version": "2.9", + "version": "3.1", "source": { "type": "svn", "url": "https://themes.svn.wordpress.org/twentyfourteen/", - "reference": "2.9" + "reference": "3.1" }, "dist": { "type": "zip", - "url": "https://downloads.wordpress.org/theme/twentyfourteen.2.9.zip" + "url": "https://downloads.wordpress.org/theme/twentyfourteen.3.1.zip" }, "require": { "composer/installers": "~1.0" @@ -1919,15 +1971,15 @@ }, { "name": "wpackagist-theme/twentynineteen", - "version": "1.9", + "version": "2.0", "source": { "type": "svn", "url": "https://themes.svn.wordpress.org/twentynineteen/", - "reference": "1.9" + "reference": "2.0" }, "dist": { "type": "zip", - "url": "https://downloads.wordpress.org/theme/twentynineteen.1.9.zip" + "url": "https://downloads.wordpress.org/theme/twentynineteen.2.0.zip" }, "require": { "composer/installers": "~1.0" @@ -1937,15 +1989,15 @@ }, { "name": "wpackagist-theme/twentyseventeen", - "version": "2.6", + "version": "2.7", "source": { "type": "svn", "url": "https://themes.svn.wordpress.org/twentyseventeen/", - "reference": "2.6" + "reference": "2.7" }, "dist": { "type": "zip", - "url": "https://downloads.wordpress.org/theme/twentyseventeen.2.6.zip" + "url": "https://downloads.wordpress.org/theme/twentyseventeen.2.7.zip" }, "require": { "composer/installers": "~1.0" diff --git a/patches/themes/0187-twentyseventeen.patch b/patches/themes/0187-twentyseventeen.patch index cdf282f507ade24d8ea7f17fe8002b8fa3e4baa2..caeba80a70bd74c899df97652a49188d6b2252d1 100644 --- a/patches/themes/0187-twentyseventeen.patch +++ b/patches/themes/0187-twentyseventeen.patch @@ -1,22 +1,26 @@ -diff --git a/wp-content/themes/twentyseventeen/functions.php b/wp-content/themes/twentyseventeen/functions.php -index 1ef1b570..952da193 100644 ---- a/wp-content/themes/twentyseventeen/functions.php -+++ b/wp-content/themes/twentyseventeen/functions.php +--- functions.php 2021-04-27 02:44:06.000000000 +0200 ++++ functions.php 2021-05-08 15:16:31.037502297 +0200 @@ -306,7 +306,7 @@ - 'display' => urlencode( 'fallback' ), - ); - -- $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' ); -+ $fonts_url = add_query_arg( $query_args, '' ); - } - - return esc_url_raw( $fonts_url ); -@@ -324,7 +324,7 @@ - function twentyseventeen_resource_hints( $urls, $relation_type ) { - if ( wp_style_is( 'twentyseventeen-fonts', 'queue' ) && 'preconnect' === $relation_type ) { - $urls[] = array( -- 'href' => 'https://fonts.gstatic.com', -+ 'href' => '', - 'crossorigin', - ); - } + 'display' => urlencode( 'fallback' ), + ); + +- $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' ); ++ // $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' ); + } + + return esc_url_raw( $fonts_url ); +@@ -322,12 +322,12 @@ + * @return array URLs to print for resource hints. + */ + function twentyseventeen_resource_hints( $urls, $relation_type ) { +- if ( wp_style_is( 'twentyseventeen-fonts', 'queue' ) && 'preconnect' === $relation_type ) { ++ /* if ( wp_style_is( 'twentyseventeen-fonts', 'queue' ) && 'preconnect' === $relation_type ) { + $urls[] = array( + 'href' => 'https://fonts.gstatic.com', + 'crossorigin', + ); +- } ++ } */ + + return $urls; + }