From 7395321926361babb31b36e5f9875e204702dd10 Mon Sep 17 00:00:00 2001
From: Reinier Kip
Date: Thu, 26 Mar 2015 14:43:51 +0100
Subject: [PATCH 01/33] Remove Tiqr second factor from UI.
---
.../views/Registration/displaySecondFactorTypes.html.twig | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/views/Registration/displaySecondFactorTypes.html.twig b/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/views/Registration/displaySecondFactorTypes.html.twig
index bd9b7aad9..45ae48750 100644
--- a/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/views/Registration/displaySecondFactorTypes.html.twig
+++ b/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/views/Registration/displaySecondFactorTypes.html.twig
@@ -19,11 +19,6 @@
'security': 2,
'url': path('ss_registration_sms_send_challenge')
} only %}
- {% include 'SurfnetStepupSelfServiceSelfServiceBundle::Registration/partial/secondFactor.html.twig' with {
- 'type': 'tiqr',
- 'security': 2,
- 'url': path('ss_registration_gssf_initiate', {'provider': 'tiqr'})
- } only %}
{% include 'SurfnetStepupSelfServiceSelfServiceBundle::Registration/partial/secondFactor.html.twig' with {
'type': 'yubikey',
'security': 3,
From 205e8ac38314ff21f81d67730378d4cb176c5340 Mon Sep 17 00:00:00 2001
From: Reinier Kip
Date: Thu, 26 Mar 2015 14:45:27 +0100
Subject: [PATCH 02/33] Use stable versions of SURFnet Step-up packages.
---
composer.json | 6 +++---
composer.lock | 37 +++++++++++++++++--------------------
2 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/composer.json b/composer.json
index cbfb01a84..39c8b2bac 100644
--- a/composer.json
+++ b/composer.json
@@ -23,11 +23,11 @@
"fortawesome/font-awesome": "~4.2.0",
"jms/translation-bundle": "~1.1.0",
"jms/di-extra-bundle": "~1.4.0",
- "surfnet/stepup-middleware-client-bundle": "dev-develop",
+ "surfnet/stepup-middleware-client-bundle": "0.1.*",
"guzzlehttp/guzzle": "~4",
"simplesamlphp/saml2": "dev-master",
- "surfnet/stepup-saml-bundle": "dev-develop",
- "surfnet/stepup-bundle": "dev-develop",
+ "surfnet/stepup-saml-bundle": "0.3.*",
+ "surfnet/stepup-bundle": "0.1.*",
"symfony/swiftmailer-bundle": "~2.3"
},
"require-dev": {
diff --git a/composer.lock b/composer.lock
index bcb89f76b..ae176ae6e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "78c35d8072070ce6e8769db4a985cfc7",
+ "hash": "1189d4f29e30bbe28b91c7f457859a25",
"packages": [
{
"name": "beberlei/assert",
@@ -1751,16 +1751,16 @@
},
{
"name": "surfnet/stepup-bundle",
- "version": "dev-develop",
+ "version": "0.1.0",
"source": {
"type": "git",
"url": "https://github.com/SURFnet/Stepup-bundle.git",
- "reference": "0ee5031946a9108ddcdb124263a0ed0cdcf4c809"
+ "reference": "5d91dc357c9ba0cbc7749b2d2ac5bc940bda665e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SURFnet/Stepup-bundle/zipball/0ee5031946a9108ddcdb124263a0ed0cdcf4c809",
- "reference": "0ee5031946a9108ddcdb124263a0ed0cdcf4c809",
+ "url": "https://api.github.com/repos/SURFnet/Stepup-bundle/zipball/5d91dc357c9ba0cbc7749b2d2ac5bc940bda665e",
+ "reference": "5d91dc357c9ba0cbc7749b2d2ac5bc940bda665e",
"shasum": ""
},
"require": {
@@ -1797,20 +1797,20 @@
"suaas",
"surfnet"
],
- "time": "2015-03-24 10:40:33"
+ "time": "2015-03-26 12:46:11"
},
{
"name": "surfnet/stepup-middleware-client-bundle",
- "version": "dev-develop",
+ "version": "0.1.0",
"source": {
"type": "git",
"url": "https://github.com/SURFnet/Stepup-Middleware-clientbundle.git",
- "reference": "a8f26101ac56d0a8b8ca9af5017c36a354f819c1"
+ "reference": "9f9b6aa9fd655b023737c1fab1b393532cb015d6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SURFnet/Stepup-Middleware-clientbundle/zipball/a8f26101ac56d0a8b8ca9af5017c36a354f819c1",
- "reference": "a8f26101ac56d0a8b8ca9af5017c36a354f819c1",
+ "url": "https://api.github.com/repos/SURFnet/Stepup-Middleware-clientbundle/zipball/9f9b6aa9fd655b023737c1fab1b393532cb015d6",
+ "reference": "9f9b6aa9fd655b023737c1fab1b393532cb015d6",
"shasum": ""
},
"require": {
@@ -1846,20 +1846,20 @@
"Apache-2.0"
],
"description": "Symfony2 bundle for consuming the Step-up Middleware API.",
- "time": "2015-03-09 15:41:17"
+ "time": "2015-03-26 13:05:18"
},
{
"name": "surfnet/stepup-saml-bundle",
- "version": "dev-develop",
+ "version": "0.3.0",
"source": {
"type": "git",
"url": "https://github.com/SURFnet/Stepup-saml-bundle.git",
- "reference": "b62b06fdde54086ffd68cbe056dd25e32ee88c67"
+ "reference": "7370c9ba7449d2ec1f622ff34a18f121a8b2c47c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SURFnet/Stepup-saml-bundle/zipball/b62b06fdde54086ffd68cbe056dd25e32ee88c67",
- "reference": "b62b06fdde54086ffd68cbe056dd25e32ee88c67",
+ "url": "https://api.github.com/repos/SURFnet/Stepup-saml-bundle/zipball/7370c9ba7449d2ec1f622ff34a18f121a8b2c47c",
+ "reference": "7370c9ba7449d2ec1f622ff34a18f121a8b2c47c",
"shasum": ""
},
"require": {
@@ -1892,7 +1892,7 @@
"stepup",
"surfnet"
],
- "time": "2015-02-27 08:08:36"
+ "time": "2015-03-26 12:53:04"
},
{
"name": "swiftmailer/swiftmailer",
@@ -4145,10 +4145,7 @@
"minimum-stability": "stable",
"stability-flags": {
"mopa/bootstrap-bundle": 10,
- "surfnet/stepup-middleware-client-bundle": 20,
- "simplesamlphp/saml2": 20,
- "surfnet/stepup-saml-bundle": 20,
- "surfnet/stepup-bundle": 20
+ "simplesamlphp/saml2": 20
},
"prefer-stable": false,
"prefer-lowest": false,
From 9207bcd51942bfb2bb44ed31e516e909f692bfb5 Mon Sep 17 00:00:00 2001
From: Reinier Kip
Date: Thu, 26 Mar 2015 14:48:22 +0100
Subject: [PATCH 03/33] Release of new version 0.1.0
---
CHANGELOG | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 CHANGELOG
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 000000000..20a3d2589
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,6 @@
+
+VERSION 0 FIRST PILOT RELEASE
+==============================
+
+ Version 0.1 - First pilot release
+ 26/03/2015 14:48 0.1.0 initial release
\ No newline at end of file
From c8ba88e15bd4253338149520ea63635ebd09d305 Mon Sep 17 00:00:00 2001
From: Pieter van der Meulen
Date: Thu, 26 Mar 2015 16:30:15 +0100
Subject: [PATCH 04/33] Fix translation: USB drive -> USB po(o)rt
---
app/Resources/translations/messages.en_GB.xliff | 2 +-
app/Resources/translations/messages.nl_NL.xliff | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/Resources/translations/messages.en_GB.xliff b/app/Resources/translations/messages.en_GB.xliff
index 897a64223..81bd2abda 100644
--- a/app/Resources/translations/messages.en_GB.xliff
+++ b/app/Resources/translations/messages.en_GB.xliff
@@ -342,7 +342,7 @@
Registration/Yubikey/provePossession.html.twig
- Connect your Yubikey with the USB drive of your computer.
+ Connect your Yubikey with the USB port of your computer.
Registration/Yubikey/provePossession.html.twig
diff --git a/app/Resources/translations/messages.nl_NL.xliff b/app/Resources/translations/messages.nl_NL.xliff
index 0c125cc74..d6a42d3d6 100644
--- a/app/Resources/translations/messages.nl_NL.xliff
+++ b/app/Resources/translations/messages.nl_NL.xliff
@@ -342,7 +342,7 @@
Registration/Yubikey/provePossession.html.twig
- Stop je Yubikey in de USB drive van je computer.
+ Stop je Yubikey in de USB poort van je computer.
Registration/Yubikey/provePossession.html.twig
From b4188164cf94303b39cefd9480d3aba61e0e7da3 Mon Sep 17 00:00:00 2001
From: Reinier Kip
Date: Thu, 26 Mar 2015 16:42:26 +0100
Subject: [PATCH 05/33] Release of new version 0.1.1
---
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG b/CHANGELOG
index 20a3d2589..ada68d366 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,4 +3,5 @@ VERSION 0 FIRST PILOT RELEASE
==============================
Version 0.1 - First pilot release
+ 26/03/2015 16:42 0.1.1 Update USB port translation
26/03/2015 14:48 0.1.0 initial release
\ No newline at end of file
From 5cf877dacdd251f443021d2b267a12efe38d2c82 Mon Sep 17 00:00:00 2001
From: Reinier Kip
Date: Thu, 2 Apr 2015 17:50:37 +0200
Subject: [PATCH 06/33] Stabilise Stepup bundle.
---
composer.json | 2 +-
composer.lock | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/composer.json b/composer.json
index f00546a3b..8b3310495 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
"guzzlehttp/guzzle": "~4",
"simplesamlphp/saml2": "dev-master",
"surfnet/stepup-saml-bundle": "0.3.*",
- "surfnet/stepup-bundle": "dev-develop",
+ "surfnet/stepup-bundle": "0.2.*",
"symfony/swiftmailer-bundle": "~2.3"
},
"require-dev": {
diff --git a/composer.lock b/composer.lock
index 22db9602f..bbbf2bcc0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "275e90348c9d98cda76666be2a3f47a8",
+ "hash": "3e1f6c603760908137ca76043aedfa21",
"packages": [
{
"name": "beberlei/assert",
@@ -1751,16 +1751,16 @@
},
{
"name": "surfnet/stepup-bundle",
- "version": "dev-develop",
+ "version": "0.2.0",
"source": {
"type": "git",
"url": "https://github.com/SURFnet/Stepup-bundle.git",
- "reference": "cae60583cbb8907f5f2fa4730091765c59a4204a"
+ "reference": "57c493202612595d2b5efeccdd7af538292afee7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/SURFnet/Stepup-bundle/zipball/cae60583cbb8907f5f2fa4730091765c59a4204a",
- "reference": "cae60583cbb8907f5f2fa4730091765c59a4204a",
+ "url": "https://api.github.com/repos/SURFnet/Stepup-bundle/zipball/57c493202612595d2b5efeccdd7af538292afee7",
+ "reference": "57c493202612595d2b5efeccdd7af538292afee7",
"shasum": ""
},
"require": {
@@ -1797,7 +1797,7 @@
"suaas",
"surfnet"
],
- "time": "2015-04-02 12:24:11"
+ "time": "2015-04-02 14:06:30"
},
{
"name": "surfnet/stepup-middleware-client-bundle",
@@ -4145,8 +4145,7 @@
"minimum-stability": "stable",
"stability-flags": {
"mopa/bootstrap-bundle": 10,
- "simplesamlphp/saml2": 20,
- "surfnet/stepup-bundle": 20
+ "simplesamlphp/saml2": 20
},
"prefer-stable": false,
"prefer-lowest": false,
From 3b17e4e579d4ff2b79ec3b719a11cf89c675f741 Mon Sep 17 00:00:00 2001
From: Reinier Kip
Date: Thu, 2 Apr 2015 17:55:30 +0200
Subject: [PATCH 07/33] Release of new version 0.2.0
---
CHANGELOG | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index ada68d366..c9e704a9a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
VERSION 0 FIRST PILOT RELEASE
==============================
+ Version 0.2 - SMS brute-force protection, secure OTPs
+ 02/04/2015 17:55 0.2.0 initial release
+
Version 0.1 - First pilot release
26/03/2015 16:42 0.1.1 Update USB port translation
26/03/2015 14:48 0.1.0 initial release
\ No newline at end of file
From 97f851640b6048be55c6355033d68f4768924371 Mon Sep 17 00:00:00 2001
From: Joost van Dijk
Date: Fri, 1 May 2015 16:02:11 +0200
Subject: [PATCH 08/33] change texts on request by eeha
---
app/Resources/translations/messages.nl_NL.xliff | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/Resources/translations/messages.nl_NL.xliff b/app/Resources/translations/messages.nl_NL.xliff
index 35795da53..476f4de7e 100644
--- a/app/Resources/translations/messages.nl_NL.xliff
+++ b/app/Resources/translations/messages.nl_NL.xliff
@@ -137,7 +137,7 @@
Resources/views/translations.twig
- Registreren bij Tiqr
+ Registreer een tiqr account
Resources/views/translations.twig
@@ -157,7 +157,7 @@
Resources/views/translations.twig
- Registreren bij Tiqr
+ Registreer een tiqr account
Registration/partial/progressBar.html.twig
From b45c8186aa2ee064bf0fbe6bfa9d48a57374f712 Mon Sep 17 00:00:00 2001
From: Joost van Dijk
Date: Mon, 4 May 2015 11:17:47 +0200
Subject: [PATCH 09/33] change texts on request by eeha
---
.../Registration/Gssf/initiate.html.twig | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/views/Registration/Gssf/initiate.html.twig b/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/views/Registration/Gssf/initiate.html.twig
index 5b558ab08..529bb2fc5 100644
--- a/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/views/Registration/Gssf/initiate.html.twig
+++ b/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/views/Registration/Gssf/initiate.html.twig
@@ -11,7 +11,24 @@
{% block content %}
{{ block('page_title') }}
- {{ ('ss.registration.gssf.initiate.' ~ provider ~ '.text.explanation')|trans }}
+
+
+ -
+ Download de tiqr app op je smartphone:
+
+
+ -
+ Sta push notificaties van de tiqr app toe zodat het inloggen in het vervolg makkelijker wordt.
+
+ -
+ Klik vervolgens op ‘{{ ('ss.registration.gssf.initiate.' ~ provider ~ '.button.initiate')|trans }}’ om verder te gaan.
+
+
+ Na het registreren van je tiqr account keer je hier terug.
+
+
+
From f11377a1e63be081a221c2f844a40f80d0df9e91 Mon Sep 17 00:00:00 2001
From: DRvanR
Date: Mon, 4 May 2015 15:57:02 +0200
Subject: [PATCH 10/33] Release of new version 0.3.0
---
CHANGELOG | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index c9e704a9a..4d4b01e21 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
VERSION 0 FIRST PILOT RELEASE
==============================
+ Version 0.3 - Second release for the Pilot
+ 04/05/2015 15:57 0.3.0 initial release
+
Version 0.2 - SMS brute-force protection, secure OTPs
02/04/2015 17:55 0.2.0 initial release
From 7cf1ad7d65fa36843dfca5607ed5ab76c68da281 Mon Sep 17 00:00:00 2001
From: DRvanR
Date: Mon, 4 May 2015 16:02:02 +0200
Subject: [PATCH 11/33] Re-enable Tiqr in the SelfService
---
.../views/Registration/displaySecondFactorTypes.html.twig | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/views/Registration/displaySecondFactorTypes.html.twig b/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/views/Registration/displaySecondFactorTypes.html.twig
index 45ae48750..bd9b7aad9 100644
--- a/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/views/Registration/displaySecondFactorTypes.html.twig
+++ b/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/views/Registration/displaySecondFactorTypes.html.twig
@@ -19,6 +19,11 @@
'security': 2,
'url': path('ss_registration_sms_send_challenge')
} only %}
+ {% include 'SurfnetStepupSelfServiceSelfServiceBundle::Registration/partial/secondFactor.html.twig' with {
+ 'type': 'tiqr',
+ 'security': 2,
+ 'url': path('ss_registration_gssf_initiate', {'provider': 'tiqr'})
+ } only %}
{% include 'SurfnetStepupSelfServiceSelfServiceBundle::Registration/partial/secondFactor.html.twig' with {
'type': 'yubikey',
'security': 3,
From 708ef7517c2b52a3a6daaf4582a86e78f426227c Mon Sep 17 00:00:00 2001
From: DRvanR
Date: Mon, 4 May 2015 16:04:45 +0200
Subject: [PATCH 12/33] Release of new version 0.3.1
---
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG b/CHANGELOG
index 4d4b01e21..87a924a02 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ VERSION 0 FIRST PILOT RELEASE
==============================
Version 0.3 - Second release for the Pilot
+ 04/05/2015 16:04 0.3.1 Implementing pilot only changes
04/05/2015 15:57 0.3.0 initial release
Version 0.2 - SMS brute-force protection, secure OTPs
From 4c8e8d1ad209603791855a114d7843d4bc74aab4 Mon Sep 17 00:00:00 2001
From: DRvanR
Date: Fri, 19 Jun 2015 15:27:49 +0200
Subject: [PATCH 13/33] Release of new version 1.0.0
---
CHANGELOG | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 87a924a02..06c3b3b46 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,10 @@
+VERSION 1 RELEASE 1.0
+======================
+
+ Version 1.0 - Release 1.0
+ 19/06/2015 15:27 1.0.0 initial release
+
VERSION 0 FIRST PILOT RELEASE
==============================
From 9c47ef15aec8014d63e882eebb8919bc39245f92 Mon Sep 17 00:00:00 2001
From: DRvanR
Date: Mon, 22 Jun 2015 10:06:02 +0200
Subject: [PATCH 14/33] Release of new version 1.0.1
---
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG b/CHANGELOG
index 06c3b3b46..a4fe96946 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ VERSION 1 RELEASE 1.0
======================
Version 1.0 - Release 1.0
+ 22/06/2015 10:06 1.0.1 Fixing missing dependency
19/06/2015 15:27 1.0.0 initial release
VERSION 0 FIRST PILOT RELEASE
From e8eb093a52c243878c291471ced89fd7ca09b99d Mon Sep 17 00:00:00 2001
From: Reinier Kip
Date: Tue, 23 Jun 2015 10:26:33 +0200
Subject: [PATCH 15/33] Release of new version 1.0.2
---
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG b/CHANGELOG
index a4fe96946..ca5ddec81 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ VERSION 1 RELEASE 1.0
======================
Version 1.0 - Release 1.0
+ 23/06/2015 10:26 1.0.2 Switch back to original SAML2 library
22/06/2015 10:06 1.0.1 Fixing missing dependency
19/06/2015 15:27 1.0.0 initial release
From e2d88611def30e3ec19f1be099b9d55993cb1630 Mon Sep 17 00:00:00 2001
From: DRvanR
Date: Wed, 15 Jul 2015 13:44:08 +0200
Subject: [PATCH 16/33] Release of new version 1.1.0
---
CHANGELOG | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index ca5ddec81..7832b3f88 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
VERSION 1 RELEASE 1.0
======================
+ Version 1.1 - Security improvements and bugfixes
+ 15/07/2015 13:44 1.1.0 initial release
+
Version 1.0 - Release 1.0
23/06/2015 10:26 1.0.2 Switch back to original SAML2 library
22/06/2015 10:06 1.0.1 Fixing missing dependency
From fb6679043cf589b130f109221ce33e8fab3c4ab8 Mon Sep 17 00:00:00 2001
From: Pieter van der Meulen
Date: Wed, 29 Jul 2015 16:39:45 +0200
Subject: [PATCH 17/33] Change version tag format to not include branch
---
.rmt.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.rmt.yml b/.rmt.yml
index 05102d27e..9dbb9b56d 100644
--- a/.rmt.yml
+++ b/.rmt.yml
@@ -20,7 +20,7 @@ _default:
version-generator: semantic # More complex versionning (semantic)
version-persister:
vcs-tag: # Release with VCS tag
- tag-prefix: "{branch-name}_" # Prefix any tag with the VCS branch name
+ tag-prefix: "" # Prefix any tag with the VCS branch name
dump-commits: true
pre-release-actions:
changelog-update: # Update a CHANGELOG file before the release
From 6049be057128c8f90b84e24d7b95254237f3580e Mon Sep 17 00:00:00 2001
From: Pieter van der Meulen
Date: Wed, 29 Jul 2015 16:50:31 +0200
Subject: [PATCH 18/33] Release of new version 1.2.0
---
CHANGELOG | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 7832b3f88..a0c38bcd6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
VERSION 1 RELEASE 1.0
======================
+ Version 1.2 - Text and layout updates, disable Tiqr choice
+ 29/07/2015 16:50 1.2.0 initial release
+
Version 1.1 - Security improvements and bugfixes
15/07/2015 13:44 1.1.0 initial release
From edac9ccd8b075ea1fedb6650fed00e2a45e6038d Mon Sep 17 00:00:00 2001
From: Pieter van der Meulen
Date: Wed, 29 Jul 2015 19:35:18 +0200
Subject: [PATCH 19/33] Revert "Change version tag format to not include
branch"
This reverts commit fb6679043cf589b130f109221ce33e8fab3c4ab8.
---
.rmt.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.rmt.yml b/.rmt.yml
index 9dbb9b56d..05102d27e 100644
--- a/.rmt.yml
+++ b/.rmt.yml
@@ -20,7 +20,7 @@ _default:
version-generator: semantic # More complex versionning (semantic)
version-persister:
vcs-tag: # Release with VCS tag
- tag-prefix: "" # Prefix any tag with the VCS branch name
+ tag-prefix: "{branch-name}_" # Prefix any tag with the VCS branch name
dump-commits: true
pre-release-actions:
changelog-update: # Update a CHANGELOG file before the release
From 18c357c01b28effd9f81fa0ad8a67d8427f447b0 Mon Sep 17 00:00:00 2001
From: Pieter van der Meulen
Date: Wed, 29 Jul 2015 19:46:32 +0200
Subject: [PATCH 20/33] Revert "Release of new version 1.2.0"
This reverts commit 6049be057128c8f90b84e24d7b95254237f3580e.
---
CHANGELOG | 3 ---
1 file changed, 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index a0c38bcd6..7832b3f88 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,9 +2,6 @@
VERSION 1 RELEASE 1.0
======================
- Version 1.2 - Text and layout updates, disable Tiqr choice
- 29/07/2015 16:50 1.2.0 initial release
-
Version 1.1 - Security improvements and bugfixes
15/07/2015 13:44 1.1.0 initial release
From 3e1fbcb60e53ce4f54f5b1cca8be202b69d76268 Mon Sep 17 00:00:00 2001
From: Pieter van der Meulen
Date: Wed, 29 Jul 2015 19:47:48 +0200
Subject: [PATCH 21/33] Release of new version 1.2.0
---
CHANGELOG | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 7832b3f88..18da215cf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
VERSION 1 RELEASE 1.0
======================
+ Version 1.2 - Text and layout updates, disable Tiqr choice
+ 29/07/2015 19:47 1.2.0 initial release
+
Version 1.1 - Security improvements and bugfixes
15/07/2015 13:44 1.1.0 initial release
From dde781d10ad0bb3d4378d9d527b60d1eb1adcb66 Mon Sep 17 00:00:00 2001
From: Reinier Kip
Date: Mon, 5 Oct 2015 11:41:25 +0200
Subject: [PATCH 22/33] Release of new version 1.3.0
---
CHANGELOG | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 18da215cf..231cc9092 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
VERSION 1 RELEASE 1.0
======================
+ Version 1.3 - U2F
+ 05/10/2015 11:41 1.3.0 initial release
+
Version 1.2 - Text and layout updates, disable Tiqr choice
29/07/2015 19:47 1.2.0 initial release
From db88dd0696f24b7aa8ba0558934e7239bddfd9fc Mon Sep 17 00:00:00 2001
From: Reinier Kip
Date: Thu, 12 Nov 2015 12:06:37 +0100
Subject: [PATCH 23/33] Release of new version 1.3.1
---
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG b/CHANGELOG
index 231cc9092..3da6b7a28 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ VERSION 1 RELEASE 1.0
======================
Version 1.3 - U2F
+ 12/11/2015 12:06 1.3.1 Update mopa/composer-bridge to address deployment issue
05/10/2015 11:41 1.3.0 initial release
Version 1.2 - Text and layout updates, disable Tiqr choice
From d21da7ab90731fec64c5c180633259a4029682f6 Mon Sep 17 00:00:00 2001
From: Reinier Kip
Date: Fri, 29 Apr 2016 11:35:49 +0200
Subject: [PATCH 24/33] Release of new version 1.4.0
---
CHANGELOG | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 3da6b7a28..00690fd3c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
VERSION 1 RELEASE 1.0
======================
+ Version 1.4 - New second factor type "biometric"
+ 29/04/2016 11:35 1.4.0 initial release
+
Version 1.3 - U2F
12/11/2015 12:06 1.3.1 Update mopa/composer-bridge to address deployment issue
05/10/2015 11:41 1.3.0 initial release
From 2f8a7eece7b7b6c6d4ff32e9386a8ee0293cbeb6 Mon Sep 17 00:00:00 2001
From: DRvanR
Date: Mon, 8 Aug 2016 17:43:18 +0200
Subject: [PATCH 25/33] Release of new version 2.0.0
---
CHANGELOG | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 00690fd3c..cd0f7a096 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,10 @@
+VERSION 2 RELEASE 2.0
+======================
+
+ Version 2.0 - Release 2.0
+ 08/08/2016 17:43 2.0.0 initial release
+
VERSION 1 RELEASE 1.0
======================
From 0fe329a64b14e0f15cb956cd0c043e4b1595d8d7 Mon Sep 17 00:00:00 2001
From: Alex Rothuis
Date: Fri, 12 Aug 2016 17:07:13 +0200
Subject: [PATCH 26/33] Release of new version 2.1.0
---
CHANGELOG | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index cd0f7a096..00be522cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
VERSION 2 RELEASE 2.0
======================
+ Version 2.1 - Added configurable explicit absolute and relative session timeouts
+ 12/08/2016 17:07 2.1.0 initial release
+
Version 2.0 - Release 2.0
08/08/2016 17:43 2.0.0 initial release
From 8792083b95fe2e073318ba68e4f92329249673ad Mon Sep 17 00:00:00 2001
From: Alex Rothuis
Date: Tue, 18 Oct 2016 11:28:04 +0200
Subject: [PATCH 27/33] Release of new version 2.2.0
---
CHANGELOG | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 00be522cc..dc9395e0c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
VERSION 2 RELEASE 2.0
======================
+ Version 2.2 - Improves the way locale cookies are set.
+ 18/10/2016 11:28 2.2.0 initial release
+
Version 2.1 - Added configurable explicit absolute and relative session timeouts
12/08/2016 17:07 2.1.0 initial release
From eebc000542020fa8518edf016221e9b973874bd2 Mon Sep 17 00:00:00 2001
From: Alex Rothuis
Date: Fri, 18 Nov 2016 11:57:35 +0100
Subject: [PATCH 28/33] Release of new version 2.3.0
---
CHANGELOG | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index dc9395e0c..d3462eb7e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
VERSION 2 RELEASE 2.0
======================
+ Version 2.3 - Added issuer check and multi locale URLs.
+ 18/11/2016 11:57 2.3.0 initial release
+
Version 2.2 - Improves the way locale cookies are set.
18/10/2016 11:28 2.2.0 initial release
From bf4bb9d21e20f028e2714b09ef0bc4fab3a1ace9 Mon Sep 17 00:00:00 2001
From: Alex Rothuis
Date: Tue, 13 Dec 2016 11:16:16 +0100
Subject: [PATCH 29/33] Release of new version 2.4.0
---
CHANGELOG | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index d3462eb7e..fe1557df9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
VERSION 2 RELEASE 2.0
======================
+ Version 2.4 - Updated SAML2 version in Composer lock-file, containing changes related to EPTI handling and security fixes
+ 13/12/2016 11:16 2.4.0 initial release
+
Version 2.3 - Added issuer check and multi locale URLs.
18/11/2016 11:57 2.3.0 initial release
From fe5c1ff607652f47b6c297bc3c8622a787135846 Mon Sep 17 00:00:00 2001
From: Alex Rothuis
Date: Tue, 21 Feb 2017 16:46:13 +0100
Subject: [PATCH 30/33] Release of new version 2.5.0
---
CHANGELOG | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index fe1557df9..92c037dd9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
VERSION 2 RELEASE 2.0
======================
+ Version 2.5 - Added AllowedSecondFactorList.
+ 21/02/2017 16:46 2.5.0 initial release
+
Version 2.4 - Updated SAML2 version in Composer lock-file, containing changes related to EPTI handling and security fixes
13/12/2016 11:16 2.4.0 initial release
From bcdb514ca3fe0640519e75c0dba1eb4152762a22 Mon Sep 17 00:00:00 2001
From: Nic Wortel
Date: Fri, 10 Mar 2017 10:27:59 +0100
Subject: [PATCH 31/33] Release of new version 2.6.0
---
CHANGELOG | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 92c037dd9..83f781df1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
VERSION 2 RELEASE 2.0
======================
+ Version 2.6 - Updated Guzzle and added second factor test mode
+ 10/03/2017 10:27 2.6.0 initial release
+
Version 2.5 - Added AllowedSecondFactorList.
21/02/2017 16:46 2.5.0 initial release
From e0c5c97dbf0196b227b479accd999eec95686136 Mon Sep 17 00:00:00 2001
From: Alex Rothuis
Date: Mon, 27 Mar 2017 13:31:19 +0200
Subject: [PATCH 32/33] Release of new version 2.6.1
---
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG b/CHANGELOG
index 83f781df1..700ad7cc8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ VERSION 2 RELEASE 2.0
======================
Version 2.6 - Updated Guzzle and added second factor test mode
+ 27/03/2017 13:31 2.6.1 Fixed use of wrong Guzzle interface
10/03/2017 10:27 2.6.0 initial release
Version 2.5 - Added AllowedSecondFactorList.
From e4031c52eee042ad52085dbb8c0300a2eca400a2 Mon Sep 17 00:00:00 2001
From: Michiel Kodde
Date: Wed, 17 May 2017 14:12:55 +0200
Subject: [PATCH 33/33] Release of new version 2.6.2
---
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG b/CHANGELOG
index 700ad7cc8..79d3f81fb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ VERSION 2 RELEASE 2.0
======================
Version 2.6 - Updated Guzzle and added second factor test mode
+ 17/05/2017 14:12 2.6.2 Updated translations
27/03/2017 13:31 2.6.1 Fixed use of wrong Guzzle interface
10/03/2017 10:27 2.6.0 initial release