From 21320685dc06266d0fe6c73016d5cf5f2372a246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20OUDOT?= Date: Fri, 20 Jul 2018 17:12:21 +0200 Subject: [PATCH 1/2] Adapt cancel parameter (#1461) --- lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl | 2 +- lemonldap-ng-portal/site/templates/bootstrap/idpchoice.tpl | 3 ++- .../site/templates/bootstrap/totp2fregister.tpl | 2 +- lemonldap-ng-portal/site/templates/bootstrap/u2fregister.tpl | 2 +- .../site/templates/bootstrap/yubikey2fregister.tpl | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl b/lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl index a8aa5fab6..f1d984498 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl @@ -59,7 +59,7 @@
- /?cancel=1&url=/?cancel=1" class="btn btn-primary" role="button"> + /?cancel=1&url=" class="btn btn-primary" role="button">   Cancel diff --git a/lemonldap-ng-portal/site/templates/bootstrap/idpchoice.tpl b/lemonldap-ng-portal/site/templates/bootstrap/idpchoice.tpl index bc4ae3ad8..a7d218ebc 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/idpchoice.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/idpchoice.tpl @@ -5,6 +5,7 @@
" class="confirm" role="form"> + " /> @@ -63,7 +64,7 @@
- /?cancel=1&url=/?cancel=1" class="btn btn-primary" role="button"> + /?cancel=1&url=" class="btn btn-primary" role="button">   Cancel diff --git a/lemonldap-ng-portal/site/templates/bootstrap/totp2fregister.tpl b/lemonldap-ng-portal/site/templates/bootstrap/totp2fregister.tpl index 82bc93e73..525f0b16d 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/totp2fregister.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/totp2fregister.tpl @@ -40,7 +40,7 @@ 2F managment      - /?cancel=1&url=/?cancel=1" class="btn btn-primary" role="button"> + /?cancel=1&url=" class="btn btn-primary" role="button">   Cancel diff --git a/lemonldap-ng-portal/site/templates/bootstrap/u2fregister.tpl b/lemonldap-ng-portal/site/templates/bootstrap/u2fregister.tpl index 51b65c5e3..c7dec0813 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/u2fregister.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/u2fregister.tpl @@ -34,7 +34,7 @@ 2F managment      - /?cancel=1&url=/?cancel=1" class="btn btn-primary" role="button"> + /?cancel=1&url=" class="btn btn-primary" role="button">   Cancel diff --git a/lemonldap-ng-portal/site/templates/bootstrap/yubikey2fregister.tpl b/lemonldap-ng-portal/site/templates/bootstrap/yubikey2fregister.tpl index ea6c0ae98..918d0a734 100644 --- a/lemonldap-ng-portal/site/templates/bootstrap/yubikey2fregister.tpl +++ b/lemonldap-ng-portal/site/templates/bootstrap/yubikey2fregister.tpl @@ -23,7 +23,7 @@ 2F managment      - /?cancel=1&url=/?cancel=1" class="btn btn-primary" role="button"> + /?cancel=1&url=" class="btn btn-primary" role="button">   Cancel From 903f1fe3bca58bbdeedfc76a092e464205552e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20OUDOT?= Date: Fri, 20 Jul 2018 17:25:21 +0200 Subject: [PATCH 2/2] Prepare 2.0.0 beta1 release --- changelog | 2 ++ debian/changelog | 7 +++++++ rpm/lemonldap-ng.spec | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index dfcd9870b..8f59e4252 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,5 @@ +lemonldap-ng (2.0.0~beta1) testing; urgency=low + lemonldap-ng (2.0.0~alpha3) testing; urgency=low lemonldap-ng (2.0.0~alpha2) testing; urgency=low diff --git a/debian/changelog b/debian/changelog index d0a997f24..4f9cafaa7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lemonldap-ng (2.0.0~beta1-1) unstable; urgency=medium + + * Beta release. See changes on our website: + https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng + + -- Clement OUDOT Fri, 20 Jul 2018 12:00:00 +0100 + lemonldap-ng (2.0.0~alpha3-1) unstable; urgency=medium * Alpha release. See changes on our website: diff --git a/rpm/lemonldap-ng.spec b/rpm/lemonldap-ng.spec index b6f7ac23e..ebe3aeba9 100644 --- a/rpm/lemonldap-ng.spec +++ b/rpm/lemonldap-ng.spec @@ -14,7 +14,7 @@ %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch) %define real_name lemonldap-ng -%define real_version 2.0.0~alpha3 +%define real_version 2.0.0~beta1 %define cpan_version 2.0.0 %define cpan_common_version %{cpan_version} %define cpan_handler_version %{cpan_version} @@ -567,6 +567,8 @@ fi # Changelog #============================================================================== %changelog +* Fri Jul 20 2018 Clement Oudot - 2.0.0~beta1-1 +- Firts beta version for 2.0.0 * Fri Jan 26 2018 Clement Oudot - 2.0.0~alpha3-1 - Third alpha version for 2.0.0 * Tue Jan 23 2018 Clement Oudot - 1.9.15-1