Commit Graph

527 Commits

Author SHA1 Message Date
Christophe Maudoux
b705b10da8 Merge branch 'v2.0' 2019-07-17 12:26:55 +02:00
Xavier Guimard
966eef33ee Fix df96168c error: _example/conf/lmConf-1.json is auto-generated (#1850) 2019-07-10 17:15:40 +02:00
Christophe Maudoux
b7c8d30b3f Merge branch 'v2.0' 2019-07-10 12:16:43 +02:00
Christophe Maudoux
36c806fa61 make json 2019-07-07 22:30:24 +02:00
Christophe Maudoux
2aee0467b0 Hide _session_id with CheckUser (#1658) 2019-07-06 22:55:31 +02:00
Christophe Maudoux
e77a017e4d Typo (1783) 2019-07-02 23:31:08 +02:00
Xavier Guimard
af63d55c08 Merge branch 'v2.0' 2019-07-01 20:21:42 +02:00
Christophe Maudoux
b94cbe0144 Fix default value (#1825) 2019-07-01 13:28:01 +02:00
Xavier Guimard
8ab4e51540 Update translations 2019-07-01 10:14:10 +02:00
Christophe Maudoux
1be79bce4b make json 2019-06-30 19:01:14 +02:00
Christophe Maudoux
a1f5791e06 Merge branch '1783' into v2.0 2019-06-30 19:00:41 +02:00
Christophe Maudoux
4e97b8dd02 Update lang (#1825) 2019-06-29 21:14:59 +02:00
Christophe Maudoux
11d2909b0a WIP - Disable persistent sessions storage (#1825) 2019-06-29 21:10:16 +02:00
Xavier
1a1ccd7568 Merge branch 'crypto-improvements' 2019-06-27 22:03:05 +02:00
Christophe Maudoux
8ad895c3b8 Merge branch 'v2.0' into 1783 2019-06-27 21:11:56 +02:00
Christophe Maudoux
859d7fad79 Update fr.json 2019-06-27 10:49:59 +02:00
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
Christophe Maudoux
266f2fdf02 Merge branch 'v2.0' into 1783 2019-06-24 23:36:54 +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
831a988516 Append conf test (#1783) 2019-06-23 22:55:10 +02:00
Christophe Maudoux
e5f03f34d9 Append ContextSwitching plugin (#1783) 2019-06-23 22:19:40 +02:00
Christophe Maudoux
b69ffc0ff8 WIP - ContextSwitching (#1783) 2019-06-21 15:23:06 +02:00
Christophe Maudoux
9ac5834bfe Merge branch 'v2.0' 2019-06-17 22:42:28 +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
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
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
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
f75093d433 Merge branch 'v2.0' 2019-05-28 22:12:50 +02:00