Merge branch 'release/1.2'

OpenConext · May 1, 2019 · 19db5cd · 19db5cd
2 parents 884c1c7 + ed72d0e
commit 19db5cd
Show file tree

Hide file tree

Showing 27 changed files with 1,591 additions and 411 deletions.
diff --git a/CHANGELOG b/CHANGELOG
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,63 @@
+# Next release
+
+# 1.2.2
+
+Further removes the SURFconextId usages in the project. The AA Api client still used the attribute, causing issues on the My connections page. Thanks @domgon for raising the issue!
+
+**Bugfix**
+* Stop using SurfConextId in the AA client #118 
+* Add Portuguese language support #119 (Thanks @domgon!) #120
+
+**Maintenance**
+ * Install Symfony and Twig security updates #119
+ * Removed RMT from the project
+ * Updated documentation links
+ * Upgraded Security Checker to version 5
+
+# 1.2.1
+
+In order to be compatible with EngineBlock 5.9, Profile needed to stop using the SURFconextId. As Engine no longer releases it.
+
+**Bugfix**
+* Stop using SURFconextId as user identifier #114 
+
+**Maintenance**
+* Security updates #113
+
+# Old releases
+
+## VERSION 1  OPENCONEXT PROFILE
+### Version 1.2 - Provide User Lifecycle support
+#### 22/01.2019 15:38  1.2.0  initial release
+
+### Version 1.1 - Various improvements to the 'My services' and 'My connections' pages
+#### 24/05/2018 10:00  1.1.1  Allow service providers without NameIDFormat
+#### 07/03/2018 10:00  1.1.0  SSO improvements, allow IDPs without contacts and better error templates
+
+### Version 1.0 - Various improvements to the 'My services' and 'My connections' pages
+#### 06/03/2018 12:23  1.0.3  Security patches for https://simplesamlphp.org/security/201803-01
+#### 05/02/2018 12:23  1.0.2  Security patches for simplesamlphp/saml2 and paragonie/random_compat
+#### 05/02/2018 12:23  1.0.1  SAML2 library upgrade and EB 5.5 compatibility changes
+#### 15/01/2018 10:00  1.0.0  initial release
+
+
+## VERSION 0  FIRST PRE-RELEASE OF PROFILE APPLICATION EXTRACTED FROM ENGINEBLOCK
+
+### Version 0.6 - Changed consumption of EB Consent API due to changes in EB 5.2
+#### 14/02/2017 13:46  0.6.0  initial release
+
+### Version 0.5 - Apply ARP to attributes in My Services, requires EB >= 5.1
+#### 03/11/2016 09:53  0.5.1  This patch fixes issues when applying the ARP to attributes without a definition known to Profile.
+#### 01/11/2016 13:16  0.5.0  initial release
+
+### Version 0.4 - Update Profile with improvements
+#### 24/10/2016 13:11  0.4.0  initial release
+
+### Version 0.3 - Made locale cookie more configurable, fixed dealing with mattribute multiplicity, corrected development ip for engineblock
+#### 14/06/2016 10:58  0.3.0  initial release
+
+### Version 0.2 - Added script to aid with deployment of tar-balls
+#### 03/06/2016 10:06  0.2.0  initial release
+
+### Version 0.1 - First pre-release of Profile application extracted from EngineBlock
+#### 31/12/2015 13:51  0.1.0  initial release
diff --git a/README.md b/README.md
@@ -88,10 +88,8 @@ Make sure to fill all parameters, also when the `user_lifecycle_enabled` toggle
 
 See the User Lifecycle project on [GitHub](https://github.com/OpenConext/OpenConext-user-lifecycle) for more information.
 
-## Releases
-`RMT` is used for tagging releases. Run `./RMT release` to tag a release.  Make
-sure you are on the `master` branch and don't have any changes before tagging
-a release.
+## Release strategy
+Please read: https://github.com/OpenConext/Stepup-Deploy/wiki/Release-Management for more information on the release strategy used in Openconext projects.
 
 ## Deployment
 Run `./makeRelease.sh` with the version number of the relevant release to create a deployable tar-ball.

diff --git a/RMT b/RMT
diff --git a/app/Resources/translations/messages.en.xliff b/app/Resources/translations/messages.en.xliff
@@ -179,6 +179,11 @@ This profile page gives you insight in which personal data, provided by your ins
         <target>EN</target>
         <jms:reference-file line="169">/../src/OpenConext/ProfileBundle/Resources/views/translations.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="0135c23e335a69b86430fa515b01d20cb65a21c5" resname="profile.locale.pt">
+        <source>profile.locale.pt</source>
+        <target>PT</target>
+        <jms:reference-file line="180">/../src/OpenConext/ProfileBundle/Resources/views/translations.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="6f6d681a481879428f3cb1fedecc96d9774eecbb" resname="profile.locale.locale_change_fail">
         <source>profile.locale.locale_change_fail</source>
         <target>Could not change language</target>

diff --git a/app/Resources/translations/messages.nl.xliff b/app/Resources/translations/messages.nl.xliff
@@ -180,6 +180,11 @@ Deze profielpagina geeft je inzicht in welke persoonlijke data, afkomstig van jo
         <target>EN</target>
         <jms:reference-file line="169">/../src/OpenConext/ProfileBundle/Resources/views/translations.html.twig</jms:reference-file>
       </trans-unit>
+      <trans-unit id="0135c23e335a69b86430fa515b01d20cb65a21c5" resname="profile.locale.pt">
+        <source>profile.locale.pt</source>
+        <target>PT</target>
+        <jms:reference-file line="180">/../src/OpenConext/ProfileBundle/Resources/views/translations.html.twig</jms:reference-file>
+      </trans-unit>
       <trans-unit id="6f6d681a481879428f3cb1fedecc96d9774eecbb" resname="profile.locale.locale_change_fail">
         <source>profile.locale.locale_change_fail</source>
         <target>Kon taal niet veranderen</target>