Commit Graph

971 Commits

Author SHA1 Message Date
Christophe Maudoux
48d51b1c5e Merge remote-tracking branch 'origin/master' into favapps 2019-04-21 22:34:31 +02:00
Xavier Guimard
bd94c5579d Merge branch 'v2.0' 2019-04-16 13:39:31 +02:00
Xavier Guimard
5fd9e9d422 Fix boolean values for YAML
Closes: #1684
2019-04-15 11:44:11 +02:00
Christophe Maudoux
e490addd2d WIP - favApps skeleton (#1689) 2019-04-14 22:34:58 +02:00
Christophe Maudoux
476212094a Merge branch 'v2.0' 2019-04-14 21:13:43 +02:00
maudoux
b8977ffb2f Manage Viewer routes with function (#1710) & Improve unit tests 2019-04-12 22:58:47 +02:00
Xavier
27bf1ea3d8 Merge branch 'v2.0' 2019-04-11 22:12:02 +02:00
Christophe Maudoux
71300988f9 Fix route conflict (#1661) 2019-04-11 11:13:05 +02:00
maudoux
1d08372a8c Sort CAS servers & update langs (#1704) 2019-04-10 21:58:37 +02:00
Xavier
1bcf828a89 Merge remote-tracking branch 'arosier/idpsort' into v2.0 2019-04-10 19:48:26 +02:00
Antoine ROSIER
f7b296b032 Sorting OIDc (#1704) 2019-04-10 17:06:41 +02:00
Antoine ROSIER
8636da45be Sorting SAML idp (#1704) 2019-04-10 17:06:41 +02:00
Xavier
4d7a3b8a33 Merge branch 'v2.0' 2019-04-09 22:30:05 +02:00
maudoux
02c473c919 Update ConfTree (#1699) 2019-04-05 22:39:58 +02:00
Christophe Maudoux
398e16c4b9 Update Zero.pm 2019-04-05 12:06:13 +02:00
Xavier Guimard
01b5951b73 Merge branch 'v2.0' 2019-04-05 10:10:40 +02:00
Xavier Guimard
2159957c34 Update versions 2019-04-05 09:54:43 +02:00
maudoux
5b67f1f743 Use rule to enable OTT (#1694) 2019-04-03 23:28:45 +02:00
Xavier Guimard
ece9b21219 Remove trailing whitespaces 2019-04-03 14:15:16 +02:00
Xavier
4798683129 Merge branch 'v2.0' 2019-04-02 06:56:45 +02:00
maudoux
2d402a347a Disable Diff link if useless (#1661) 2019-04-01 22:55:47 +02:00
maudoux
98869b5ae6 Enable routes if required (#1661) 2019-04-01 21:58:05 +02:00
maudoux
b7a826abfd Make json (#1661) 2019-04-01 14:57:41 +02:00
maudoux
b790949492 Update parameter name (#1661) 2019-04-01 14:52:23 +02:00
maudoux
b6162f5ae9 Hide secret keys in diff.html 2019-04-01 14:42:52 +02:00
Xavier Guimard
b40f292d8a Merge branch 'v2.0' 2019-03-27 10:31:30 +01:00
Christophe Maudoux
43b825e6e0 Disable browser route (#1661) 2019-03-26 22:57:24 +01:00
Christophe Maudoux
b76db50022 Update zeroConf 2019-03-26 22:57:24 +01:00
Xavier Guimard
4cb497e5a2 Merge branch 'v2.0' 2019-03-26 08:09:56 +01:00
Xavier
27b45d1af8 Add LinkedIn in combination modules (Fixes: #1682) 2019-03-26 07:00:53 +01:00
Xavier
3cea903c79 Merge branch 'v2.0' 2019-03-25 22:14:10 +01:00
Christophe Maudoux
40643f1258 Fix parameters setting (#1661) 2019-03-20 17:38:45 +01:00
Christophe Maudoux
73c8a1a8d7 Allow to hide other keys (#1661) 2019-03-19 17:56:46 +01:00
Xavier
4fcf77e721 Merge branch 'v2.0' 2019-03-19 08:32:33 +01:00
Christophe Maudoux
6903087f63 Merge branch 'viewer' of gitlab.ow2.org:lemonldap-ng/lemonldap-ng into viewer 2019-03-15 15:52:30 +01:00
Christophe Maudoux
e7f21b2c73 Append Viewer SPA (#1661) 2019-03-15 15:40:08 +01:00
Christophe Maudoux
71fc765d01 WIP - Inherits Conf.pm (#1661) 2019-03-15 15:40:08 +01:00
Christophe Maudoux
bfa7482a1f WIP - Hidden ConfTree PK (#1661) 2019-03-15 15:40:08 +01:00
Christophe Maudoux
2070b03303 WIP - Viewer SPA (#1661) 2019-03-15 15:40:08 +01:00
Christophe Maudoux
4a8a614bc9 WIP - Append relative files (#1661) 2019-03-15 15:40:08 +01:00
Christophe Maudoux
ab4054b6b9 WIP - Inherits Conf.pm (#1661) 2019-03-14 16:39:49 +01:00
Xavier Guimard
8941ee4dd5 Merge branch 'v2.0' 2019-03-14 14:57:39 +01:00
Christophe Maudoux
3729b70717 Merge branch 'v2.0' into viewer 2019-03-14 09:41:19 +01:00
Christophe Maudoux
a32a1626bc WIP - Hidden ConfTree PK (#1661) 2019-03-13 22:56:16 +01:00
Clément OUDOT
d620ae2e8b Merge branch 'maxbes/lemonldap-ng-saml-issuer-entityid-override' into v2.0 2019-03-13 10:30:16 +01:00
Christophe Maudoux
c06ea5d5f1 WIP - Viewer SPA (#1661) 2019-03-12 22:59:15 +01:00
Christophe Maudoux
4201fe25d8 WIP - Append relative files (#1661) 2019-03-12 16:33:09 +01:00
Christophe Maudoux
be28b60e66 Append identities rule (#1658) 2019-03-09 23:29:10 +01:00
Christophe Maudoux
09281f8d22 Append identities rule and fix error catching (#1664) 2019-03-08 11:39:19 +01:00
Xavier Guimard
77301e70ca Merge branch 'v2.0' 2019-03-07 22:29:34 +01:00