Commit Graph

6654 Commits

Author SHA1 Message Date
Christophe Maudoux
bf9ca17708 Merge branch 'master' into portal-2f-improvement 2018-04-28 19:54:54 +02:00
Xavier Guimard
57715c8b69 Fix #1413 2018-04-28 09:09:34 +02:00
Christophe Maudoux
7e572da88c Merge branch 'master' into portal-2f-improvement 2018-04-27 21:47:59 +02:00
Xavier Guimard
564b34176b Fix rule if 0 (#1413) 2018-04-27 20:10:31 +02:00
Clément OUDOT
90dc78932e Fix error on undefined object method (#1413) 2018-04-27 15:57:07 +02:00
Xavier Guimard
baf0b90b68 Fix name error in rule (#1413) 2018-04-27 13:54:06 +02:00
Xavier Guimard
0283231dd9 Typo 2018-04-26 12:05:11 +02:00
Xavier Guimard
6557b2105a Merge branch 'master' of gitlab.ow2.org:lemonldap-ng/lemonldap-ng 2018-04-26 12:01:54 +02:00
Xavier Guimard
6f87ae5078 Debug hook (#1413) 2018-04-26 12:01:40 +02:00
Clément OUDOT
d3db202488 forcedSAML is no more a Choice (#1256) 2018-04-26 11:44:03 +02:00
Xavier Guimard
023be4c4eb Bad object (#1413) 2018-04-26 07:46:49 +02:00
Xavier Guimard
6605ea1857 Eval() in init() (#1413) 2018-04-26 07:38:17 +02:00
Clément OUDOT
2d388c174a Condition on Choice tab (#1413) 2018-04-25 15:40:19 +02:00
Christophe Maudoux
e4f05b583a Merge branch 'master' into portal-2f-improvement 2018-04-24 21:02:09 +02:00
Xavier Guimard
cc100316f5 Optimize SQL query 2018-04-23 17:17:34 +02:00
Xavier Guimard
b372d1de9f Add cli_examples.html in doc 2018-04-23 14:58:36 +02:00
Xavier Guimard
7d33324eed Update js 2018-04-23 09:52:52 +02:00
Xavier Guimard
109ceab452 Some comments 2018-04-22 16:08:34 +02:00
Christophe Maudoux
cfbf032dab Typo 2018-04-21 23:24:55 +02:00
Xavier Guimard
e925660985 Some node-handler hooks (#782) 2018-04-21 08:10:20 +02:00
Xavier Guimard
7477ce0890 Merge branch 'manager-2ndFA-module' into 'master'
Manager 2ndfa module

See merge request lemonldap-ng/lemonldap-ng!25
2018-04-20 19:59:24 +02:00
Xavier Guimard
0d72ad10df Merge branch 'portal-2f-improvement' into 'master'
Portal 2f improvement

See merge request lemonldap-ng/lemonldap-ng!26
2018-04-20 19:57:49 +02:00
Christophe Maudoux
98ff9bbc93 Typo (#1386) 2018-04-20 16:35:50 +02:00
Christophe Maudoux
6312ae367f Typo (#1386) 2018-04-20 16:35:38 +02:00
Christophe Maudoux
6ab28b03b0 Propage multi U2F verification (#1386) 2018-04-20 16:15:26 +02:00
Christophe Maudoux
14a34d8597 Color active module link - WIP 2018-04-19 23:04:32 +02:00
Christophe Maudoux
adc5b083af Improve session dates display (#1392) 2018-04-19 22:02:20 +02:00
Christophe Maudoux
74bc8af3a0 Fix langs (#1392) 2018-04-19 16:49:09 +02:00
Christophe Maudoux
2b1d6d4819 Propage 2F devices display to session module (#1391) 2018-04-19 16:28:49 +02:00
Christophe Maudoux
abd25790fc Typo 2018-04-19 13:36:04 +02:00
Christophe Maudoux
8ba5aa1bd5 Improve 2F sessions explorer (#1392) 2018-04-19 11:35:42 +02:00
Christophe Maudoux
5efa969b17 Improve 2F sessions explorer (#1392) 2018-04-19 00:08:25 +02:00
Christophe Maudoux
4a85adb8b1 Improve 2F sessions explorer (#1392) 2018-04-18 23:48:13 +02:00
Christophe Maudoux
c9d6d9e027 Hide deleted 2F device (#1386) 2018-04-18 21:51:35 +02:00
Christophe Maudoux
d943696ddc Add goToportal button (#1386) 2018-04-18 17:06:12 +02:00
Christophe Maudoux
ad59c64ecd Merge branch 'master' into manager-2ndFA-module 2018-04-17 23:03:54 +02:00
Xavier Guimard
904947b43b Propage @maudoux changes to UTOTP (#1391) 2018-04-17 23:01:34 +02:00
Christophe Maudoux
2119be03e1 Merge branch 'master' into manager-2ndFA-module 2018-04-17 22:54:31 +02:00
Xavier Guimard
22e5cf5bf0 Merge branch 'portal-multi-U2F-registration' into 'master'
Portal multi u2f registration

See merge request lemonldap-ng/lemonldap-ng!24
2018-04-17 22:48:37 +02:00
Christophe Maudoux
4946498a52 Fix msg mistake 2018-04-17 22:40:34 +02:00
Christophe Maudoux
f7f0255a86 Merge branch 'master' into portal-multi-U2F-registration 2018-04-17 22:01:25 +02:00
Christophe Maudoux
5420cb2abb Typo 2018-04-17 21:48:16 +02:00
Christophe Maudoux
bb97e804d2 Typo 2018-04-17 21:36:34 +02:00
Christophe Maudoux
b1dc72452a Multi U2F - Fix errors ;-) - IT WORKS !!! 2018-04-17 20:05:45 +02:00
Christophe Maudoux
06c14f5972 Security: avoid challenge replay (#1148) 2018-04-17 19:09:23 +02:00
Christophe Maudoux
9a96b38435 Apply U2F.patch 2018-04-17 18:09:18 +02:00
Xavier Guimard
797fa5b5c3 Security: avoid challenge replay (#1148) 2018-04-17 17:27:49 +02:00
Xavier Guimard
c81757152f Set handler in-memory cache to 15s 2018-04-17 16:19:23 +02:00
Xavier Guimard
492ae116f8 Missing debug (#1148) 2018-04-17 12:06:09 +02:00
Xavier Guimard
a8cccf20a6 make documentation 2018-04-17 10:33:26 +02:00