dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 1464

Browse Source
This commit is contained in:
Christophe Maudoux 2018-07-20 19:37:17 +02:00
commit b633b7aa05
8 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog
View File

@ -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

7
debian/changelog vendored
View File

@ -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 <clement@oodo.net> 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:

2
lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl
View File

@ -59,7 +59,7 @@
<TMPL_IF NAME="PORTAL_URL">
<div id="logout">
<div class="buttons">
<a href="<TMPL_VAR NAME="PORTAL_URL">/?cancel=1<TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"><TMPL_ELSE>/?cancel=1</TMPL_IF>" class="btn btn-primary" role="button">
<a href="<TMPL_VAR NAME="PORTAL_URL">/?cancel=1<TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"></TMPL_IF>" class="btn btn-primary" role="button">
<span class="glyphicon glyphicon-home"></span>&nbsp;
<span trspan="cancel">Cancel</span>
</a>

3
lemonldap-ng-portal/site/templates/bootstrap/idpchoice.tpl
View File

@ -5,6 +5,7 @@
<form id="form" action="#" method="<TMPL_VAR NAME="FORM_METHOD">" class="confirm" role="form">
<TMPL_VAR NAME="HIDDEN_INPUTS">
<input type="hidden" name="cancel" value="0" />
<TMPL_IF NAME="AUTH_URL">
<input type="hidden" name="url" value="<TMPL_VAR NAME="AUTH_URL">" />
</TMPL_IF>
@ -63,7 +64,7 @@
<TMPL_IF NAME="PORTAL_URL">
<div id="logout">
<div class="buttons">
<a href="<TMPL_VAR NAME="PORTAL_URL">/?cancel=1<TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"><TMPL_ELSE>/?cancel=1</TMPL_IF>" class="btn btn-primary" role="button">
<a href="<TMPL_VAR NAME="PORTAL_URL">/?cancel=1<TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"></TMPL_IF>" class="btn btn-primary" role="button">
<span class="glyphicon glyphicon-home"></span>&nbsp;
<span trspan="cancel">Cancel</span>
</a>

2
lemonldap-ng-portal/site/templates/bootstrap/totp2fregister.tpl
View File

@ -40,7 +40,7 @@
<span trspan="2FManagment">2F managment</span>
</a>
&nbsp;&nbsp;&nbsp;&nbsp;
<a id="goback" href="<TMPL_VAR NAME="PORTAL_URL">/?cancel=1<TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"><TMPL_ELSE>/?cancel=1</TMPL_IF>" class="btn btn-primary" role="button">
<a id="goback" href="<TMPL_VAR NAME="PORTAL_URL">/?cancel=1<TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"></TMPL_IF>" class="btn btn-primary" role="button">
<span class="glyphicon glyphicon-home"></span>&nbsp;
<span trspan="cancel">Cancel</span>
</a>

2
lemonldap-ng-portal/site/templates/bootstrap/u2fregister.tpl
View File

@ -34,7 +34,7 @@
<span trspan="2FManagment">2F managment</span>
</a>
&nbsp;&nbsp;&nbsp;&nbsp;
<a id="goback" href="<TMPL_VAR NAME="PORTAL_URL">/?cancel=1<TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"><TMPL_ELSE>/?cancel=1</TMPL_IF>" class="btn btn-primary" role="button">
<a id="goback" href="<TMPL_VAR NAME="PORTAL_URL">/?cancel=1<TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"></TMPL_IF>" class="btn btn-primary" role="button">
<span class="glyphicon glyphicon-home"></span>&nbsp;
<span trspan="cancel">Cancel</span>
</a>

2
lemonldap-ng-portal/site/templates/bootstrap/yubikey2fregister.tpl
View File

@ -23,7 +23,7 @@
<span trspan="2FManagment">2F managment</span>
</a>
&nbsp;&nbsp;&nbsp;&nbsp;
<a id="goback" href="<TMPL_VAR NAME="PORTAL_URL">/?cancel=1<TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"><TMPL_ELSE>/?cancel=1</TMPL_IF>" class="btn btn-primary" role="button">
<a id="goback" href="<TMPL_VAR NAME="PORTAL_URL">/?cancel=1<TMPL_IF NAME="AUTH_URL">&url=<TMPL_VAR NAME="AUTH_URL"></TMPL_IF>" class="btn btn-primary" role="button">
<span class="glyphicon glyphicon-home"></span>&nbsp;
<span trspan="cancel">Cancel</span>
</a>

4
rpm/lemonldap-ng.spec
View File

@ -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 <clem.oudot@gmail.com> - 2.0.0~beta1-1
- Firts beta version for 2.0.0
* Fri Jan 26 2018 Clement Oudot <clem.oudot@gmail.com> - 2.0.0~alpha3-1
- Third alpha version for 2.0.0
* Tue Jan 23 2018 Clement Oudot <clem.oudot@gmail.com> - 1.9.15-1