Commit Graph

463 Commits

Author SHA1 Message Date
68c8d599ff Merge branch 'master' into dist/envole/6/master 2020-07-27 10:19:39 +02:00
ececb38afe demander la motiviation uniquement si registration byadmin et non whitelist 2020-07-27 09:54:26 +02:00
95784beed6 Merge branch 'master' into dist/envole/6/master 2020-07-23 10:09:10 +02:00
b7d157cf1b configuration pour envolemigration 2020-07-23 10:07:16 +02:00
30eb0d07e2 Merge branch 'master' into dist/envole/6/master 2020-07-22 13:39:52 +02:00
b6a33c03ec modification theme transnum 2020-07-22 09:05:07 +02:00
87ef7fb6c7 resolution merge 2020-07-17 16:08:06 +02:00
57a5517e19 system de tag sur les icones (ref #190) 2020-07-17 16:06:18 +02:00
6db9222fc4 phrase indicateur sur la création des icones (ref #192) 2020-07-17 12:14:48 +02:00
de803ac336 pouvoir gérer les icones directement via la selection des icones (ref #188) 2020-07-17 12:02:25 +02:00
bdddfc925f gestion des annonces masquables (ref #191) 2020-07-17 11:12:01 +02:00
af5fbf0a6a Merge branch 'master' into dist/envole/6/master 2020-07-15 16:57:37 +02:00
01fd5f297f widget chat non accessible sur les pages perso (ref #193) 2020-07-15 16:54:28 +02:00
2119a68368 modification icone modifier page/blog/calendar/project en engrenage & acces direct depuis les listes (ref #185 #184) 2020-07-15 16:50:41 +02:00
0602505f63 creation categorie alerte par défaut (ref #189) 2020-07-15 15:36:18 +02:00
c4815ac935 orthographe icône (ref #187) 2020-07-15 15:25:24 +02:00
514fe6b82c orthographe connection en connexion (ref #186) 2020-07-15 15:15:38 +02:00
2c1078d19e purge des groupes inexistant dans l'annuaire 2020-07-15 15:08:42 +02:00
fb879143d5 parametrer la synchro scribe (ref #183) 2020-07-15 14:38:16 +02:00
177f366a83 pb sur modification du mail sur synchronisation ldap (ref #182) 2020-07-15 14:07:39 +02:00
4ae4dabb9f resolv conflict 2020-07-10 12:23:07 +02:00
39c469fd45 afficher tt item si vu item only 2020-07-10 12:21:42 +02:00
2392318922 Merge branch 'master' into dist/envole/6/master 2020-07-10 09:37:23 +02:00
4a941665dc suppression du = dans les noms de groupe scribe 2020-07-10 09:31:00 +02:00
5ee9a52554 Merge branch 'master' into dist/envole/6/master 2020-07-07 09:25:12 +02:00
8dec77a946 post api à la place de get api 2020-07-07 09:23:24 +02:00
ec6cf7e062 Merge branch 'master' into dist/envole/6/master 2020-07-06 12:00:07 +02:00
025009e76c tout les groups sur rest user 2020-07-06 11:59:17 +02:00
5cdd0a6703 Merge branch 'master' into dist/envole/6/master 2020-07-06 11:54:32 +02:00
e59b85701c rest api 2020-07-06 11:19:44 +02:00
c856315a8d rest users & groups 2020-07-03 16:10:28 +02:00
f4325bfb4f rest users & groups 2020-07-03 10:30:41 +02:00
d1637e4efa Merge branch 'master' into dist/envole/6/master 2020-06-26 15:46:34 +02:00
151be1a66e event shared 2020-06-26 15:45:48 +02:00
ba41570721 Merge branch 'master' into dist/envole/6/master 2020-06-26 08:43:25 +02:00
2a8c9287b1 erreur sur param synchro envole 2020-06-26 08:42:33 +02:00
0777934192 Merge branch 'master' into dist/envole/6/master 2020-06-25 13:40:55 +02:00
328189222a gestion nineboard 2020-06-25 13:40:17 +02:00
c1fed2d994 ajout des event shared dans le widget calendar (ref #168) 2020-06-25 11:37:03 +02:00
0a6a5abe38 conflic 2020-06-24 13:46:57 +02:00
88a4e9882b binary 2020-06-24 13:45:36 +02:00
baf09e9e82 rename dico postservice 2020-06-24 13:39:39 +02:00
bd039015e1 rename dicos 2020-06-24 12:12:29 +02:00
220bb795ae Merge branch 'master' into dist/envole/6/master 2020-06-24 12:04:55 +02:00
0699403a55 rename dicos 2020-06-24 12:04:18 +02:00
1877f101ee Merge branch 'master' into dist/envole/6/master 2020-06-24 11:41:37 +02:00
4dac861b9b ajout item eoe eop nineboard 2020-06-24 11:40:43 +02:00
02aa36a194 ajout icon eoe eop 2020-06-24 10:30:12 +02:00
50ae3ed4c4 Merge branch 'master' into dist/envole/6/master 2020-06-24 09:54:52 +02:00
d90d3039a2 pb reconf si non only 2020-06-24 09:48:57 +02:00