Merge branch 'release/2.0'

OpenConext · Jul 9, 2019 · 39d1da6 · 39d1da6
2 parents c77e240 + a12f213
commit 39d1da6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/src/OpenConext/ProfileBundle/Resources/views/MyConnections/overview.html.twig b/src/OpenConext/ProfileBundle/Resources/views/MyConnections/overview.html.twig
@@ -28,7 +28,7 @@
                     </div>
                     <div class="mdl-cell mdl-cell--3-col">
                         <div class="mdl-layout-title">{{ 'profile.my_connections.orcid.title'|trans }}</div>
-                        <p class="orcid"><img src="{{ asset('images/orcid_small.png') }}"> <a href="{{ connection.linkedId }}">{{ connection.linkedId }}</a></p>
+                        <p class="orcid"><img src="{{ asset('build/images/orcid_small.png') }}"> <a href="{{ connection.linkedId }}">{{ connection.linkedId }}</a></p>
                     </div>
                     <div class="mdl-cell mdl-cell--3-col">
                         <div class="mdl-layout-title">{{ 'profile.my_connections.orcid.status'|trans }}</div>