Commit Graph

6586 Commits

Author SHA1 Message Date
Xavier Guimard
251f8986ae Merge branch 'llng-2.0-improvements' into 'master'
Replace regex by display2fRegisters method

See merge request lemonldap-ng/lemonldap-ng!31
2018-05-02 09:50:01 +02:00
Christophe Maudoux
388bd387cf Replace regex by display2fRegisters method 2018-05-01 22:05:06 +02:00
Xavier Guimard
9b584d9509 Merge branch 'llng-2.0-improvements' into 'master'
Llng 2.0 improvements

See merge request lemonldap-ng/lemonldap-ng!30
2018-05-01 07:34:40 +02:00
Christophe Maudoux
52702d8723 Merge branch 'llng-2.0-improvements' of gitlab.ow2.org:maudoux/lemonldap-ng into llng-2.0-improvements 2018-04-30 23:11:21 +02:00
Christophe Maudoux
ed1229800a Display 2fregisters link only if at least a 2f device is registered (#1383) 2018-04-30 23:10:47 +02:00
Christophe Maudoux
43e7056efa Display 2fregisters link only if at once a 2f device is registered (#1383) 2018-04-30 23:01:53 +02:00
Christophe Maudoux
6cca6a8678 Typo 2018-04-30 21:37:51 +02:00
Christophe Maudoux
f2c287fc37 Typo 2018-04-30 21:27:15 +02:00
Christophe Maudoux
f1b2a6d587 Typo 2018-04-30 20:05:23 +02:00
Christophe Maudoux
89acef54c6 Fix langs 2018-04-30 20:05:04 +02:00
Christophe Maudoux
5a97e0dc4c Modify 2FManagment icon 2018-04-30 20:04:30 +02:00
Christophe Maudoux
bbc1b68517 Merge remote-tracking branch 'upstream/master' 2018-04-30 18:52:21 +02:00
Xavier Guimard
c673be7cf2 Set some default values in Attributes.pm (#595) 2018-04-30 18:06:15 +02:00
Christophe Maudoux
03c187ce06 Fix langs 2018-04-30 17:08:01 +02:00
Christophe Maudoux
813926e9d3 Delete empty _2fDevices session key 2018-04-30 16:56:47 +02:00
Christophe Maudoux
ed4b741319 Fix display bug when deleting 2F device from manager 2018-04-30 16:55:41 +02:00
Xavier Guimard
8fe6a90b1a Merge branch 'llng-2.0-improvements' into 'master'
LLNG 2.0 improvements

See merge request lemonldap-ng/lemonldap-ng!29
2018-04-29 22:50:03 +02:00
Christophe Maudoux
71a55e2af3 Add comment 2018-04-29 22:39:26 +02:00
Christophe Maudoux
0bd3c2ed00 Add comment 2018-04-29 22:38:11 +02:00
Christophe Maudoux
d1a1dad442 Update pod 2018-04-29 22:02:26 +02:00
Christophe Maudoux
ae852f8161 Modify Yubikey logo 2018-04-29 22:02:08 +02:00
Christophe Maudoux
134d11f10e Fix langs 2018-04-29 21:59:58 +02:00
Christophe Maudoux
c12c34e04e GUI minor improvement 2018-04-29 14:38:55 +02:00
Christophe Maudoux
b08eda9224 Fix langs 2018-04-29 14:21:46 +02:00
Christophe Maudoux
fa1fe7bcb8 Update Yubikey logo 2018-04-29 13:51:50 +02:00
Christophe Maudoux
3641f56f24 Update langs 2018-04-29 13:51:30 +02:00
Xavier Guimard
b014dae749 Merge branch 'portal-2f-improvement' into 'master'
Portal 2f improvement

See merge request lemonldap-ng/lemonldap-ng!28
2018-04-29 07:57:41 +02:00
Xavier Guimard
83b716dba2 Merge branch 'manager-2ndFA-module' into 'master'
Manager 2nfa module

See merge request lemonldap-ng/lemonldap-ng!27
2018-04-29 07:55:54 +02:00
Christophe Maudoux
5908a6a2d7 Append 2fregisters link into portal menu 2018-04-28 23:49:14 +02:00
Christophe Maudoux
7de8687116 Modifiy css td to display dates inline 2018-04-28 22:35:18 +02:00
Christophe Maudoux
5d45838a1b Color click 2018-04-28 22:34:22 +02:00
Christophe Maudoux
d648b49bed Colorized active module 2018-04-28 22:02:07 +02:00
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