Commit Graph

60 Commits

Author SHA1 Message Date
714a6e5a9c Merge branch 'master' into dist/envole/7/master 2021-12-07 09:12:56 +01:00
f298298fb4 secretkey for amonecole 2021-12-06 17:03:32 +01:00
ed36a30dfe configuration reverse proxy wss 2021-12-06 16:13:13 +01:00
37531ca37c conf proxy wss 2021-12-06 14:46:37 +01:00
5e814b948c Merge branch 'master' into dist/envole/7/master 2021-10-18 10:31:59 +02:00
93f61c02ba correction orthographe (fixes #33009) 2021-10-18 10:07:17 +02:00
bf650e537f Merge branch 'master' into dist/envole/7/master 2021-10-07 11:01:11 +02:00
2a2f24222e rapatrier les variables eoledb dans la famille eoledb (ref #33188) 2021-10-07 11:00:24 +02:00
4ea2c08a51 Merge branch 'master' into dist/envole/7/master 2021-03-11 15:15:28 +01:00
33f88f5c9d casdebug 2021-03-11 15:01:03 +01:00
0ab0958a8f Merge branch 'master' into dist/envole/7/master 2021-02-17 13:18:14 +01:00
96382c0698 sonde dnma alone 2021-02-17 12:51:42 +01:00
9dd5c7d4b3 Merge branch 'master' into dist/envole/7/master 2021-02-17 11:32:19 +01:00
3f5f96c279 sonde dnma alone 2021-02-17 11:14:25 +01:00
5c03e3b44f Merge branch 'master' into dist/envole/7/master 2021-02-09 17:02:23 +01:00
e4365913b4 initsession 2021-02-09 16:51:03 +01:00
477d5f6689 Merge branch 'master' into dist/envole/7/master 2021-02-03 13:54:11 +01:00
d0556edfdd ano ckeditor 2021-02-03 13:41:28 +01:00
18c9b008ee Merge branch 'master' into dist/envole/7/master 2021-01-21 17:30:24 +01:00
bbc1fd225e gestion synchro no mail 2021-01-21 17:17:48 +01:00
109f7e80d3 Merge branch 'master' into dist/envole/7/master 2021-01-21 16:28:48 +01:00
6821d4106f gestion synchro no mail 2021-01-21 16:18:09 +01:00
3ab6730f98 prise en compte du logrotate dans le paquet 2021-01-20 13:24:20 +01:00
ebad96e849 Merge branch 'master' into dist/envole/7/master 2021-01-13 15:32:44 +01:00
45daf482d9 livraison des lib manquantes 2021-01-13 15:21:12 +01:00
333012b0b1 Merge branch 'master' into dist/envole/7/master 2020-12-18 10:02:41 +01:00
dc1f23314d paquet apps en dep de dicos 2020-12-18 09:49:35 +01:00
5f5e81870c Merge branch 'master' into dist/envole/7/master 2020-12-16 11:46:56 +01:00
85f47e57a1 svg 2020-12-16 11:34:59 +01:00
09b456becc Merge branch 'master' into dist/envole/7/master 2020-11-27 09:33:58 +01:00
8658bb5a23 svg 2020-11-26 16:09:47 +01:00
d1a2131e0b websocket 2020-11-23 13:08:32 +01:00
85ff851a1a svg 2020-11-15 17:50:07 +01:00
d2f283d4eb Merge branch 'master' into dist/envole/7/master 2020-11-13 18:01:38 +01:00
4523f516e0 mise à niveau 2020-11-13 17:53:22 +01:00
1348555264 mise à niveau proxy et asset 2020-11-13 13:31:09 +01:00
8f17591995 Merge branch 'master' into dist/envole/7/master 2020-11-12 16:30:58 +01:00
7ec78a2a70 pb init 2020-11-12 16:23:52 +01:00
d0066c6f96 Merge branch 'master' into dist/envole/7/master 2020-10-23 15:33:04 +02:00
673a0063fc refonte sonde 2020-10-23 15:22:28 +02:00
284a6f3a5b revu filtre sso 2020-10-23 14:46:39 +02:00
7bedb306da Merge branch 'master' into dist/envole/7/master 2020-10-19 11:17:56 +02:00
9f0b1ce883 mise à niveau log 2020-10-19 11:06:36 +02:00
665ec502a5 Merge branch 'master' into dist/envole/7/master 2020-10-05 16:15:25 +02:00
29bd42be09 reconfigure nine 2020-10-05 16:07:43 +02:00
1fe0c3819b Merge branch 'master' into dist/envole/7/master 2020-10-05 15:57:22 +02:00
c134748327 Merge branch 'master' of https://dev-eole.ac-dijon.fr/git/nineschool 2020-10-05 15:52:12 +02:00
c54ee69400 ajout model env 2020-10-05 15:52:00 +02:00
a10f979a02 Merge branch 'master' into dist/envole/7/master 2020-10-05 15:35:57 +02:00
805865f4a6 compilation 2020-10-05 15:35:46 +02:00