Commit Graph

1842 Commits

Author SHA1 Message Date
Xavier Guimard
72439d341f Merge branch 'v2.0' 2019-06-27 07:59:37 +02:00
Xavier Guimard
c222fb4009 Update tr 2019-06-26 07:50:31 +02:00
Xavier Guimard
4bfad92530 Merge branch 'v2.0' 2019-06-24 11:46:57 +02:00
Xavier Guimard
f9fb8a2772 Update manager JS 2019-06-24 11:45:53 +02:00
Christophe Maudoux
9ac5834bfe Merge branch 'v2.0' 2019-06-17 22:42:28 +02:00
Christophe Maudoux
774a82d674 Fix double default value setting 2019-06-17 22:31:44 +02:00
Christophe Maudoux
9fa11709e6 Append options to use Notifications plugin & set notification reference (#1796) 2019-06-17 22:31:44 +02:00
Christophe Maudoux
c3b3c281ad Hide _2fDevices with REST services 2019-06-16 20:33:34 +02:00
Xavier
400df1a137 Update translations 2019-06-16 16:42:23 +02:00
Christophe Maudoux
d6f3dd459a Display message (#1796) 2019-06-16 16:02:48 +02:00
Christophe Maudoux
f514da3c3a Hide _2fDevices with REST services 2019-06-15 22:38:21 +02:00
Xavier
d27e4bcc55 Merge branch 'v2.0' 2019-06-15 09:23:50 +02:00
Christophe Maudoux
5218944bf2 Improve unit tests (#1796) 2019-06-14 23:11:10 +02:00
Christophe Maudoux
fde6ff2cc8 WIP (#1796) 2019-06-14 23:09:32 +02:00
Xavier Guimard
65eaefa75f Tidy 2019-06-14 17:23:26 +02:00
Xavier Guimard
056306a9c4 Update fr translation 2019-06-14 08:54:08 +02:00
Xavier Guimard
e7bc7b3f4e Add restExportSecretKeys option (#1799) 2019-06-14 08:51:58 +02:00
Christophe Maudoux
aabb65629b Merge remote-tracking branch 'origin/v2.0' 2019-06-10 21:07:42 +02:00
Xavier
a1ea32981c Optimize perlExpr handling (#1717) 2019-06-10 08:56:56 +02:00
Christophe Maudoux
69e7ea7938 Update langs 2019-06-09 19:54:16 +02:00
Christophe Maudoux
b71f678f80 Filter SSO groups to merge (#1791) 2019-06-08 22:08:58 +02:00
Christophe Maudoux
e3c2766809 Test 2F TTL (#1782) 2019-06-07 19:51:51 +02:00
Christophe Maudoux
bbe18393a5 Update langs (#1782) 2019-06-07 19:51:51 +02:00
Xavier Guimard
f59681e80e Merge branch 'v2.0' 2019-06-07 17:48:32 +02:00
Christophe Maudoux
a3d66a22b1 Improve unit test (#1717) 2019-06-07 11:26:07 +02:00
Christophe Maudoux
3015faef0e Share functions with Safe (#1717) 2019-06-07 11:26:07 +02:00
Christophe Maudoux
57bd151aaa Update fr (#1765) 2019-06-05 21:11:04 +02:00
Xavier Guimard
f457b79438 Update translations 2019-06-05 14:24:52 +02:00
Xavier Guimard
ee661fc61d Merge branch 'v2.0' 2019-06-04 17:59:55 +02:00
Christophe Maudoux
132e57b4b3 Manage CORS headers (#1765) 2019-05-31 17:00:39 +02:00
Xavier
7ab5c3e654 More comment (#1767) 2019-05-31 09:07:40 +02:00
Xavier
d278d33f87 Partial revert of 380d4da1 (#1767) 2019-05-31 08:45:44 +02:00
Christophe Maudoux
59f6106ba6 Merge remote-tracking branch 'origin/v2.0' 2019-05-31 00:16:07 +02:00
Christophe Maudoux
380d4da1ec Update and Fix overScheme (#1767) 2019-05-30 23:35:20 +02:00
Xavier
20ef62e4fb Add restore command to cli (#1770) 2019-05-30 10:18:41 +02:00
Xavier
a09e299b3d Rename dump command to save (#1770) 2019-05-30 09:43:28 +02:00
Xavier
00852d1a66 Add dump() command in cli
Closes: #1770
2019-05-30 09:39:36 +02:00
Xavier
f75093d433 Merge branch 'v2.0' 2019-05-28 22:12:50 +02:00
Xavier Guimard
8fd3f6be90 Merge branch 'issue1521-appmenu' into 'v2.0'
Preserve applicationList key names (#1521)

See merge request lemonldap-ng/lemonldap-ng!76
2019-05-28 22:10:53 +02:00
Maxime Besson
b12992755f Preserve applicationList key names (#1521)
Previously, every configuration save from the manager would overwrite
applicationList key names to preserve their ordering.

This commit introduces a new "order" key in the JSON config instead.
2019-05-28 15:38:26 +02:00
Christophe Maudoux
455221781f Modify ServiceToken TTL option (#1773) 2019-05-27 23:07:18 +02:00
Xavier Guimard
1509d44d5f Merge branch 'v2.0' 2019-05-27 12:03:45 +02:00
Christophe Maudoux
535ae3f7be Append ServiceToken TTL option (#1773) 2019-05-26 21:43:13 +02:00
Christophe Maudoux
1bc9539538 Fix unit test (#1773) 2019-05-26 20:43:43 +02:00
Christophe Maudoux
74b9960afb Build conf (#1773) 2019-05-26 18:32:38 +02:00
Maxime Besson
c65e22dcf8 Add missing Finnish flag
And some unit tests to make all language have a matching flag icon
2019-05-24 15:18:49 +02:00
Xavier Guimard
4678649367 Merge branch 'v2.0' 2019-05-24 10:23:40 +02:00
Christophe Maudoux
2a3907a28d Improve code (#1758) 2019-05-17 22:06:26 +02:00
Xavier
8c562c7817 Modularize Display/login (#1652) 2019-05-17 10:26:45 +02:00
Xavier Guimard
5a1c090a18 Merge branch 'v2.0' 2019-05-17 10:26:19 +02:00