diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bf5a4719..5e302ff3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Next release +# 2.0.1 +**Changes** + +* Add /build to asset paths #131 +* Bump Stepup SAML bundle to 4.1.5 #132 + # 2.0.0 Version 2.0 drops PHP 5.6 support. And more important Symfony was updated to version 3.4 diff --git a/app/config/global_view_parameters.yml.dist b/app/config/global_view_parameters.yml.dist index 1a30875f3..827e1357d 100644 --- a/app/config/global_view_parameters.yml.dist +++ b/app/config/global_view_parameters.yml.dist @@ -15,9 +15,9 @@ parameters: nl: "https://www.surfconext.nl" pt: "https://www.surfconext.nl/en" profile_explanation_image_path: - en: "/images/profile_home_en.png" - nl: "/images/profile_home_nl.png" - pt: "/images/profile_home_pt.png" + en: "build/images/profile_home_en.png" + nl: "build/images/profile_home_nl.png" + pt: "build/images/profile_home_pt.png" attribute_information_url: en: 'https://support.surfconext.nl/attributes-en' nl: 'https://support.surfconext.nl/attributes-nl' diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 7de295bbf..8a74d95fd 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -36,7 +36,7 @@ parameters: attribute_aggregation_api_verify_ssl: true # orcid aa attribute settings for orcid - attribute_aggregation_orcid_logo_path: '/images/orcid.png' + attribute_aggregation_orcid_logo_path: 'build/images/orcid.png' attribute_aggregation_orcid_connect_url: 'https://link.surfconext.nl/orcid?redirectUrl=https://profile.surfconext.nl/my-connections' mailer_transport: sendmail diff --git a/composer.lock b/composer.lock index 222dbfdbe..521f94a8c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "329241d243d58e7c699df5dee35d7695", + "content-hash": "f8bf4b9dfeeab72b911754725b203d98", "packages": [ { "name": "beberlei/assert", @@ -1930,16 +1930,16 @@ }, { "name": "surfnet/stepup-saml-bundle", - "version": "4.1.4", + "version": "4.1.5", "source": { "type": "git", "url": "https://github.com/OpenConext/Stepup-saml-bundle.git", - "reference": "bcac100da97865c30e8e079bf824b5e4452a268d" + "reference": "6b56f5ba41db8bf31d4278a75c2cc04e7782bcbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OpenConext/Stepup-saml-bundle/zipball/bcac100da97865c30e8e079bf824b5e4452a268d", - "reference": "bcac100da97865c30e8e079bf824b5e4452a268d", + "url": "https://api.github.com/repos/OpenConext/Stepup-saml-bundle/zipball/6b56f5ba41db8bf31d4278a75c2cc04e7782bcbf", + "reference": "6b56f5ba41db8bf31d4278a75c2cc04e7782bcbf", "shasum": "" }, "require": { @@ -1978,7 +1978,7 @@ "stepup", "surfnet" ], - "time": "2019-05-28T08:15:22+00:00" + "time": "2019-07-09T12:45:12+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -5127,7 +5127,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^5.6|^7.0" + "php": "^7.0" }, "platform-dev": [] } diff --git a/src/OpenConext/ProfileBundle/Resources/views/MyConnections/overview.html.twig b/src/OpenConext/ProfileBundle/Resources/views/MyConnections/overview.html.twig index 38fcaf47b..4e29b933a 100644 --- a/src/OpenConext/ProfileBundle/Resources/views/MyConnections/overview.html.twig +++ b/src/OpenConext/ProfileBundle/Resources/views/MyConnections/overview.html.twig @@ -28,7 +28,7 @@