Commit Graph

58 Commits

Author SHA1 Message Date
88f44d5ed6 Merge branch 'master' into dist/envole/7/master 2022-05-10 09:31:05 +02:00
a4573d977f Synchronisation scribe niveaux + eleves classes + profs classes (ref #34132) 2022-05-10 09:24:44 +02:00
b01e053b5d synchro modif 2022-05-09 15:57:50 +02:00
3f839ba8d0 synchro modif 2022-05-09 15:35:19 +02:00
61f48af480 Merge branch 'master' into dist/envole/7/master 2022-02-16 09:11:45 +01:00
6a56c60fd1 svg 2022-02-16 09:07:04 +01:00
b40412eba6 svg 2022-02-07 17:11:23 +01:00
42a5c7ccdb svg 2022-02-07 15:19:23 +01:00
19f7b02491 Merge branch 'master' into dist/envole/7/master 2021-12-08 09:53:50 +01:00
4e2bcdd63d ajout variable activer_revprox si non existante 2021-12-08 09:50:21 +01:00
d497dfee83 Merge branch 'master' into dist/envole/7/master 2021-12-07 15:03:24 +01:00
8104257e11 templetisation du service wssnineboard 2021-12-07 15:00:04 +01:00
60672b68b5 Merge branch 'master' into dist/envole/7/master 2021-12-07 14:09:00 +01:00
babf012bb9 websocket server by service 2021-12-07 14:05:43 +01:00
19340f918a Merge branch 'master' into dist/envole/7/master 2021-12-07 09:12:16 +01:00
0735687123 secretkey for amonecole 2021-12-06 17:03:49 +01:00
e15cbdf218 configuration reverse proxy wss 2021-12-06 16:12:51 +01:00
2167813aee enquete 2021-12-06 14:47:42 +01:00
38b669a08a Merge branch 'master' into dist/envole/7/master 2021-10-18 10:45:39 +02:00
9199e9ff53 traduction du champ title (fixes #33010) 2021-10-18 10:21:20 +02:00
6e69322db8 Merge branch 'master' into dist/envole/7/master 2021-10-07 11:10:02 +02:00
0745ecb6a1 rapatrier les variables eoledb dans la famille eoledb (ref #33188) 2021-10-07 11:09:14 +02:00
b54728a0a9 Merge branch 'master' into dist/envole/7/master 2021-03-11 15:16:02 +01:00
57bbc26646 casdebug 2021-03-11 15:01:44 +01:00
d16e028166 ajout plugin ckeditor manquant 2021-02-23 13:57:21 +01:00
05f52533f8 Merge branch 'master' into dist/envole/7/master 2021-02-23 13:41:43 +01:00
ee192e04ee style local 2021-02-23 13:29:41 +01:00
105528358d Merge branch 'master' into dist/envole/7/master 2021-02-17 13:18:50 +01:00
acf9ea4c5c sonde dnma alone 2021-02-17 12:52:24 +01:00
7659a864c3 Merge branch 'master' into dist/envole/7/master 2021-02-17 11:31:56 +01:00
09d2cb8c28 sonde dnma alone 2021-02-17 11:18:03 +01:00
571544e4d2 Merge branch 'master' into dist/envole/7/master 2021-02-09 16:49:12 +01:00
6152c2ddac style local 2021-02-09 16:29:59 +01:00
a7ebeef0f4 Merge branch 'master' into dist/envole/7/master 2021-02-03 13:53:39 +01:00
a915a73ad3 ano ckeditor 2021-02-03 13:42:07 +01:00
38ec005383 Merge branch 'master' into dist/envole/7/master 2021-01-21 17:31:42 +01:00
4a57eb6a6c gestion synchro no mail 2021-01-21 17:17:23 +01:00
2f6710a4ed Merge branch 'master' into dist/envole/7/master 2021-01-21 16:38:32 +01:00
1174b3db42 gestion synchro no mail 2021-01-21 16:26:54 +01:00
8d7c25ac1b prise en compte du logrotate dans le paquet 2021-01-20 13:25:07 +01:00
4664ac517a Merge branch 'master' into dist/envole/7/master 2021-01-13 15:34:05 +01:00
b32c4e43eb livraison des lib manquantes 2021-01-13 15:22:33 +01:00
9ece4e8292 Merge branch 'master' into dist/envole/7/master 2020-12-18 10:03:29 +01:00
0ddf237a5f paquet apps en dep de dicos 2020-12-18 09:50:24 +01:00
9aa270ef24 Merge branch 'master' into dist/envole/7/master 2020-11-27 09:41:11 +01:00
cc53364f69 commit compilation 2020-11-27 09:40:17 +01:00
f401ac56f4 Merge branch 'master' into dist/envole/7/master 2020-11-27 09:34:35 +01:00
31d55f4bb5 svg 2020-11-26 16:09:28 +01:00
1755f0125e websocket 2020-11-23 13:08:15 +01:00
c174987967 websocket 2020-11-23 13:08:01 +01:00