Merge branch 'main' into feature/role-application-manay-to-many

OpenConext · Nov 23, 2023 · 1e35d9c · 1e35d9c
2 parents 947511d + 6f75e7b
commit 1e35d9c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/client/docker/appconf.conf b/client/docker/appconf.conf
@@ -59,5 +59,5 @@ Header set Expires "Sun, 8 Jun 1986 08:06:00 GMT"
 </FilesMatch>
 
 Header always set X-Frame-Options "DENY"
-Header always set Referrer-Policy "origin-when-cross-origin"
+Header always set Referrer-Policy "strict-origin-when-cross-origin"
 Header always set X-Content-Type-Options "nosniff"
diff --git a/client/src/locale/en.js b/client/src/locale/en.js
@@ -14,9 +14,9 @@ const en = {
             //Arrays of titles and info blocks and if a function is an admin function
             ["Invites", "<p>SURF invites institution managers who can create roles for their applications.</p>" +
             "<p>Applications are services connected to SURFconext.</p>", true],
-            ["Roles", "<p>The application managers will invite colleagues for roles who then can invite guests.</p>", true],
+            ["Roles", "<p>The application managers will invite colleagues for roles who can in turn invite guests.</p>", true],
             ["Join", "<p>Invited colleagues who accept the invitation are granted access rights for the applications.</p><br/>", false],
-            ["Groups", "<p>The roles are actually group memberships that can be provisioned to external SCIM API's.</p>", false]
+            ["Groups", "<p>The roles are actually group memberships that can be used in SURFconext rules, or provisioned as attributes or to external SCIM API's.</p>", false]
         ],
         footer: "<p>SURFconext Invite is a service for access management to SURFconext-connected service providers.</p>" +
             "<p>Do you want to know more? <a href='https://support.surfconext.nl/invite-en'>Read more</a>.</p>",

diff --git a/client/src/locale/nl.js b/client/src/locale/nl.js
@@ -14,8 +14,7 @@ const nl = {
             //Arrays of titles and info blocks and if a function is an admin function
             ["Uitnodigen", "<p>Instellingsbeheerders kunnen rollen aanmaken voor hun applicaties.</p>" +
             "<p>Applicaties zijn diensten gekoppeld aan SURFconext.</p>", true],
-            ["Rollen", "<p>De applicatiebeheerders nodigen collega's die weer gasten kunnen uitnodigen.</p>" +
-            "<p>Uitnodigingen.</p>", true],
+            ["Rollen", "<p>De applicatiebeheerders nodigen collega's uit die op hun beurt weer gasten kunnen uitnodigen.</p>", true],
             ["Word lid", "<p>Uitgenodigde collega's die op de uitnodiging zijn ingegaan krijgen toegang tot applicaties.</p><br/>", false],
             ["Groepen", "<p>De rollen zijn feitelijk groepslidmaatschappen die gebruikt kunnen worden in SURFconext autorisatieregels, doorgegeven als attributen of via externe SCIM API's.</p>", false]
         ],

diff --git a/welcome/docker/appconf.conf b/welcome/docker/appconf.conf
@@ -52,5 +52,5 @@ Header set Expires "Sun, 8 Jun 1986 08:06:00 GMT"
 </FilesMatch>
 
 Header always set X-Frame-Options "DENY"
-Header always set Referrer-Policy "origin-when-cross-origin"
+Header always set Referrer-Policy "strict-origin-when-cross-origin"
 Header always set X-Content-Type-Options "nosniff"
diff --git a/welcome/src/locale/en.js b/welcome/src/locale/en.js
@@ -14,12 +14,11 @@ const en = {
             //Arrays of titles and info blocks and if a function is an admin function
             ["Invites", "<p>SURF invites institution managers who can create roles for their applications.</p>" +
             "<p>Applications are services connected to SURFconext.</p>", true],
-            ["Roles", "<p>The application managers will invite colleagues for roles who can invite guests.</p>" +
-            "<p>Invites.</p>", true],
+            ["Roles", "<p>The application managers will invite colleagues for roles who can in turn invite guests.</p>", true],
             ["Join", "<p>Invited colleagues who accept the invitation are granted access rights for the applications.</p><br/>", false],
-            ["Groups", "<p>The roles are actually group memberships that can be provisioned to external SCIM API's.</p>", false]
+            ["Groups", "<p>The roles are actually group memberships that can be used in SURFconext rules, or provisioned as attributes or to external SCIM API's.</p>", false]
         ],
-        footer: "<p>SURFconext Invite is a service for access management of Dutch led service providers.</p>" +
+        footer: "<p>SURFconext Invite is a service for access management for research and education.</p>" +
             "<p>Do you want to know more? <a href='https://support.surfconext.nl/invite-en'>Read more</a>.</p>",
     },
     header: {

diff --git a/welcome/src/locale/nl.js b/welcome/src/locale/nl.js
@@ -14,8 +14,7 @@ const nl = {
             //Arrays of titles and info blocks and if a function is an admin function
             ["Uitnodigen", "<p>Instellingsbeheerders kunnen rollen aanmaken voor hun applicaties.</p>" +
             "<p>Applicaties zijn diensten gekoppeld aan SURFconext.</p>", true],
-            ["Rollen", "<p>De applicatiebeheerders nodigen collega's die weer gasten kunnen uitnodigen.</p>" +
-            "<p>Uitnodigingen.</p>", true],
+            ["Rollen", "<p>De applicatiebeheerders nodigen collega's uit die op hun beurt weer gasten kunnen uitnodigen.</p>", true],
             ["Word lid", "<p>Uitgenodigde collega's die op de uitnodiging zijn ingegaan krijgen toegang tot applicaties.</p><br/>", false],
             ["Groepen", "<p>De rollen zijn feitelijk groepslidmaatschappen die gebruikt kunnen worden in SURFconext autorisatieregels, doorgegeven als attributen of via externe SCIM API's.</p>", false]
         ],