Merge branch 'master' into dist/envole/6/master

svg
suppression notion eportail dans dicos (fixes #25 )
2019-11-21 10:42:56 +01:00 · 2019-11-21 10:40:15 +01:00 · 2019-11-20 10:52:03 +01:00 · 2019-11-20 10:02:37 +01:00 · 2019-11-20 09:45:12 +01:00 · 2019-11-20 09:41:44 +01:00
229 changed files with 2257 additions and 592 deletions
--- a/debian/control
+++ b/debian/control
@ -15,10 +15,10 @@ Description: Filtre SSO pour ninegate "EOLE".

 Package: eole-ninegate
 Architecture: all
-Depends: ${misc:Depends}, eole-web (>= 2.6.1), ninegate-sso, eole-db, eole-client-annuaire, eole-sondepiwik, eole-posh-profil, eole-envole-themes
+Depends: ${misc:Depends}, eole-web (>= 2.6.1), ninegate-sso, eole-envole-dependances
 Description: Eolisation de l'application ninegate.

 Package: ninegate-apps
 Architecture: all
-Depends: ${misc:Depends}, eole-web-pkg (>= 2.6.1), eole-client-annuaire-pkg, sondepiwik-apps, posh-profil-apps, composer, php-zip, php-mbstring
+Depends: ${misc:Depends}, eole-web-pkg (>= 2.6.1), envole-dependances-apps
 Description: Sources pour ninegate "EOLE".
--- a/dicos/90_ninegate.xml
+++ b/dicos/90_ninegate.xml
@ -2,11 +2,12 @@
 <creole>
    <files>
        <file filelist='ninegate' name='/etc/eole/eole-db.d/ninegate-db.yml' rm='True' mkdir='True'/>
-        <file filelist='ninegate' name='/usr/share/eole/posttemplate/90-ninegate' source="ninegate-posttemplate.sh" rm='True' mkdir='True' mode="700"/>
    </files>

    <containers>
        <container name='web'>
+            <package>ninegate-apps</package>
+
            <file filelist='ninegate' name='/etc/apache2/sites-available/ninegate' source='ninegate-apache.conf' rm="True"/>
            <file filelist="ninegate" name="/var/www/html/ninegate/app/config/parameters.yml" source="ninegate-parameters.yml" rm="True"/>
            <file filelist="ninegate" name="/var/www/html/ninegate/app/config/template.yml" source="ninegate-template.yml" rm="True"/>
@ -25,7 +26,6 @@

    <variables>
        <family name='Ninegate'>
-            <variable name="activer_eportail" type="oui/non" description="Activer ePortail" hidden='True' exists='False'><value>non</value></variable>
            <variable name="activer_limesurvey" type="oui/non" description="Activer Limesurvey" hidden='True' exists='False'><value>non</value></variable>
            <variable name="activer_moodle" type="oui/non" description="Activer Moodle" hidden='True' exists='False'><value>non</value></variable>
            <variable name="activer_nextcloud" type="oui/non" description="Activer Nextcloud" hidden='True' exists='False'><value>non</value></variable>
@ -52,7 +52,6 @@
            <variable type='string' name='ninegate_api_key' description="Clé d'accès API" mandatory='True'><value>APIKeyNinegate</value></variable>

            <variable type='oui/non' name='ninegate_syncldap' description="Synchroniser Ninegate vers votre annuaire"><value>non</value></variable>
-            <variable type='oui/non' name='ninegate_synceportail' description="Synchroniser Ninegate vers ePortail"><value>non</value></variable>
            <variable type='string' name='ninegate_ldaptemplate' description="Modèle d'annuaire"><value>scribe</value></variable>

            <variable type='string' name='ninegate_pwdadmin' description="Mot de passe du compte admin durant l'instance (idem valeur Cadoles ldap)" mandatory='True'><value>cadoles</value></variable>
@ -222,11 +221,6 @@
            <target type='variable'>activer_ninegate</target>
        </condition>

-        <condition name='hidden_if_in' source='activer_eportail'>
-            <param>non</param>
-            <target type='variable'>ninegate_synceportail</target>
-        </condition>
-
        <condition name='hidden_if_in' source='activer_ninegate'>
            <param>non</param>

@ -236,7 +230,6 @@


            <target type='variable'>ninegate_syncldap</target>
-            <target type='variable'>ninegate_synceportail</target>
            <target type='variable'>ninegate_ldaptemplate</target>

            <target type='variable'>ninegate_pwdadmin</target>
@ -294,7 +287,6 @@
            <param>SSO</param>

            <target type='variable'>ninegate_syncldap</target>
-            <target type='variable'>ninegate_synceportail</target>
            <target type='variable'>ninegate_moderegistration</target>
            <target type='variable'>ninegate_keyterm</target>            
        </condition>  
--- a/src/ninegate-1.0/.gitignore
+++ b/src/ninegate-1.0/.gitignore
@ -1,5 +1,6 @@
 /.web-server-pid
 /app/config/parameters.yml
+/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
 /build/
 /phpunit.xml
 /var/*
--- a/src/ninegate-1.0/app/config/config.yml
+++ b/src/ninegate-1.0/app/config/config.yml
@ -137,6 +137,7 @@ gos_web_socket:
    server:
        port: %websocket_port%    #The port the socket server will listen on
        host: %websocket_host%    #The host ip to bind to
+
        router:
            resources:
                - "@CadolesWebsocketBundle/Resources/config/topic.yml" 
@ -154,7 +155,7 @@ ivory_ck_editor:
            language: fr
            toolbar: "my_toolbar_1"
            uiColor: "#ffffff"
-            extraPlugins: ["html5video"]
+            extraPlugins: ["html5video","pastebase64"]
        light_config:
            language: fr
            toolbar: "my_toolbar_2"
--- a/src/ninegate-1.0/composer.json
+++ b/src/ninegate-1.0/composer.json
@ -40,6 +40,7 @@
        "symfony/symfony": "3.4.*",
        "tetranz/select2entity-bundle": "2.*",
        "thecsea/simple-caldav-client": "^0.1.10",
+        "mashape/unirest-php": "3.*",        
        "twig/twig": "^1.0||^2.0"
    },
    "require-dev": {
--- a/src/ninegate-1.0/composer.lock
+++ b/src/ninegate-1.0/composer.lock
@ -4,8 +4,8 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "hash": "0430b523c39e2d254cfe1fb91666119b",
-    "content-hash": "36178f772c0f0ff6bd5ac90edd474c25",
+    "hash": "e008822a96a469e24963e22d66f34c98",
+    "content-hash": "589f314a10ca56596cf580254885bd7c",
    "packages": [
        {
            "name": "cboden/ratchet",
@ -62,25 +62,25 @@
        },
        {
            "name": "composer/ca-bundle",
-            "version": "1.1.4",
+            "version": "1.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d"
+                "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
-                "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/10bb96592168a0f8e8f6dcde3532d9fa50b0b527",
+                "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527",
                "shasum": ""
            },
            "require": {
                "ext-openssl": "*",
                "ext-pcre": "*",
-                "php": "^5.3.2 || ^7.0"
+                "php": "^5.3.2 || ^7.0 || ^8.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8",
                "psr/log": "^1.0",
                "symfony/process": "^2.5 || ^3.0 || ^4.0"
            },
@ -114,7 +114,7 @@
                "ssl",
                "tls"
            ],
-            "time": "2019-01-28 09:30:10"
+            "time": "2019-08-30 08:44:50"
        },
        {
            "name": "debril/feed-io",
@ -1822,27 +1822,28 @@
        },
        {
            "name": "guzzlehttp/guzzle",
-            "version": "6.3.3",
+            "version": "6.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+                "reference": "0895c932405407fd3a7368b6910c09a24d26db11"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
+                "reference": "0895c932405407fd3a7368b6910c09a24d26db11",
                "shasum": ""
            },
            "require": {
+                "ext-json": "*",
                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.4",
+                "guzzlehttp/psr7": "^1.6.1",
                "php": ">=5.5"
            },
            "require-dev": {
                "ext-curl": "*",
                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.0"
+                "psr/log": "^1.1"
            },
            "suggest": {
                "psr/log": "Required for using the Log middleware"
@ -1854,12 +1855,12 @@
                }
            },
            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                "psr-4": {
                    "GuzzleHttp\\": "src/"
-                }
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@ -1883,7 +1884,7 @@
                "rest",
                "web service"
            ],
-            "time": "2018-04-22 15:46:56"
+            "time": "2019-10-23 15:58:00"
        },
        {
            "name": "guzzlehttp/promises",
@ -2060,16 +2061,16 @@
        },
        {
            "name": "jasig/phpcas",
-            "version": "1.3.7",
+            "version": "1.3.8",
            "source": {
                "type": "git",
                "url": "https://github.com/apereo/phpCAS.git",
-                "reference": "b5b29102c3a42f570c4a3e852f3cf67cae6d6082"
+                "reference": "40c0769ce05a30c8172b36ceab11124375c8366e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/apereo/phpCAS/zipball/b5b29102c3a42f570c4a3e852f3cf67cae6d6082",
-                "reference": "b5b29102c3a42f570c4a3e852f3cf67cae6d6082",
+                "url": "https://api.github.com/repos/apereo/phpCAS/zipball/40c0769ce05a30c8172b36ceab11124375c8366e",
+                "reference": "40c0769ce05a30c8172b36ceab11124375c8366e",
                "shasum": ""
            },
            "require": {
@ -2111,7 +2112,7 @@
                "cas",
                "jasig"
            ],
-            "time": "2019-04-22 19:48:16"
+            "time": "2019-08-18 20:01:55"
        },
        {
            "name": "jdorn/sql-formatter",
@ -2407,17 +2408,63 @@
            "time": "2018-05-23 08:11:59"
        },
        {
-            "name": "monolog/monolog",
-            "version": "1.24.0",
+            "name": "mashape/unirest-php",
+            "version": "v3.0.4",
            "source": {
                "type": "git",
-                "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
+                "url": "https://github.com/Mashape/unirest-php.git",
+                "reference": "842c0f242dfaaf85f16b72e217bf7f7c19ab12cb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
-                "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
+                "url": "https://api.github.com/repos/Mashape/unirest-php/zipball/842c0f242dfaaf85f16b72e217bf7f7c19ab12cb",
+                "reference": "842c0f242dfaaf85f16b72e217bf7f7c19ab12cb",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "codeclimate/php-test-reporter": "0.1.*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "suggest": {
+                "ext-json": "Allows using JSON Bodies for sending and parsing requests"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Unirest\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Unirest PHP",
+            "homepage": "https://github.com/Mashape/unirest-php",
+            "keywords": [
+                "client",
+                "curl",
+                "http",
+                "https",
+                "rest"
+            ],
+            "time": "2016-08-11 17:49:21"
+        },
+        {
+            "name": "monolog/monolog",
+            "version": "1.25.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/monolog.git",
+                "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d5e2fb341cb44f7e2ab639d12a1e5901091ec287",
+                "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287",
                "shasum": ""
            },
            "require": {
@ -2482,7 +2529,7 @@
                "logging",
                "psr-3"
            ],
-            "time": "2018-11-05 09:00:11"
+            "time": "2019-11-13 10:00:05"
        },
        {
            "name": "ocramius/proxy-manager",
@ -2867,16 +2914,16 @@
        },
        {
            "name": "psr/log",
-            "version": "1.1.0",
+            "version": "1.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/log.git",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
-                "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
                "shasum": ""
            },
            "require": {
@ -2885,7 +2932,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                }
            },
            "autoload": {
@ -2910,7 +2957,7 @@
                "psr",
                "psr-3"
            ],
-            "time": "2018-11-20 15:27:04"
+            "time": "2019-11-01 11:05:21"
        },
        {
            "name": "psr/simple-cache",
@ -3173,23 +3220,23 @@
        },
        {
            "name": "react/dns",
-            "version": "v1.1.0",
+            "version": "v1.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/reactphp/dns.git",
-                "reference": "a04f6f23ee40afec2e5814ddfbdf71b9e88bbc1f"
+                "reference": "a214d90c2884dac18d0cac6176202f247b66d762"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/dns/zipball/a04f6f23ee40afec2e5814ddfbdf71b9e88bbc1f",
-                "reference": "a04f6f23ee40afec2e5814ddfbdf71b9e88bbc1f",
+                "url": "https://api.github.com/repos/reactphp/dns/zipball/a214d90c2884dac18d0cac6176202f247b66d762",
+                "reference": "a214d90c2884dac18d0cac6176202f247b66d762",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.0",
                "react/cache": "^1.0 || ^0.6 || ^0.5",
-                "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5",
-                "react/promise": "^2.1 || ^1.2.1",
+                "react/event-loop": "^1.0 || ^0.5",
+                "react/promise": "^2.7 || ^1.2.1",
                "react/promise-timer": "^1.2"
            },
            "require-dev": {
@ -3213,7 +3260,7 @@
                "dns-resolver",
                "reactphp"
            ],
-            "time": "2019-07-18 09:47:47"
+            "time": "2019-08-15 09:06:31"
        },
        {
            "name": "react/event-loop",
@ -3450,16 +3497,16 @@
        },
        {
            "name": "robrichards/xmlseclibs",
-            "version": "3.0.3",
+            "version": "3.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/robrichards/xmlseclibs.git",
-                "reference": "406c68ac9124db033d079284b719958b829cb830"
+                "reference": "0a53d3c3aa87564910cae4ed01416441d3ae0db5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/406c68ac9124db033d079284b719958b829cb830",
-                "reference": "406c68ac9124db033d079284b719958b829cb830",
+                "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/0a53d3c3aa87564910cae4ed01416441d3ae0db5",
+                "reference": "0a53d3c3aa87564910cae4ed01416441d3ae0db5",
                "shasum": ""
            },
            "require": {
@ -3484,7 +3531,7 @@
                "xml",
                "xmldsig"
            ],
-            "time": "2018-11-15 11:59:02"
+            "time": "2019-11-05 11:44:22"
        },
        {
            "name": "sensio/distribution-bundle",
@ -3781,30 +3828,30 @@
        },
        {
            "name": "symfony/monolog-bundle",
-            "version": "v3.4.0",
+            "version": "v3.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/monolog-bundle.git",
-                "reference": "7fbecb371c1c614642c93c6b2cbcdf723ae8809d"
+                "reference": "dd80460fcfe1fa2050a7103ad818e9d0686ce6fd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7fbecb371c1c614642c93c6b2cbcdf723ae8809d",
-                "reference": "7fbecb371c1c614642c93c6b2cbcdf723ae8809d",
+                "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/dd80460fcfe1fa2050a7103ad818e9d0686ce6fd",
+                "reference": "dd80460fcfe1fa2050a7103ad818e9d0686ce6fd",
                "shasum": ""
            },
            "require": {
-                "monolog/monolog": "~1.22",
+                "monolog/monolog": "~1.22 || ~2.0",
                "php": ">=5.6",
-                "symfony/config": "~3.4|~4.0",
-                "symfony/dependency-injection": "~3.4.10|^4.0.10",
-                "symfony/http-kernel": "~3.4|~4.0",
-                "symfony/monolog-bridge": "~3.4|~4.0"
+                "symfony/config": "~3.4 || ~4.0 || ^5.0",
+                "symfony/dependency-injection": "~3.4.10 || ^4.0.10 || ^5.0",
+                "symfony/http-kernel": "~3.4 || ~4.0 || ^5.0",
+                "symfony/monolog-bridge": "~3.4 || ~4.0 || ^5.0"
            },
            "require-dev": {
-                "symfony/console": "~3.4|~4.0",
-                "symfony/phpunit-bridge": "^3.4.19|^4.0",
-                "symfony/yaml": "~3.4|~4.0"
+                "symfony/console": "~3.4 || ~4.0 || ^5.0",
+                "symfony/phpunit-bridge": "^3.4.19 || ^4.0 || ^5.0",
+                "symfony/yaml": "~3.4 || ~4.0 || ^5.0"
            },
            "type": "symfony-bundle",
            "extra": {
@ -3825,13 +3872,13 @@
                "MIT"
            ],
            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                {
                    "name": "Fabien Potencier",
                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
                }
            ],
            "description": "Symfony MonologBundle",
@ -3840,24 +3887,24 @@
                "log",
                "logging"
            ],
-            "time": "2019-06-20 12:18:19"
+            "time": "2019-11-13 13:11:14"
        },
        {
            "name": "symfony/orm-pack",
-            "version": "v1.0.6",
+            "version": "v1.0.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/orm-pack.git",
-                "reference": "36c2a928482dc5f05c5c1c1b947242ae03ff1335"
+                "reference": "c57f5e05232ca40626eb9fa52a32bc8565e9231c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/orm-pack/zipball/36c2a928482dc5f05c5c1c1b947242ae03ff1335",
-                "reference": "36c2a928482dc5f05c5c1c1b947242ae03ff1335",
+                "url": "https://api.github.com/repos/symfony/orm-pack/zipball/c57f5e05232ca40626eb9fa52a32bc8565e9231c",
+                "reference": "c57f5e05232ca40626eb9fa52a32bc8565e9231c",
                "shasum": ""
            },
            "require": {
-                "doctrine/doctrine-bundle": "^1.6.10",
+                "doctrine/doctrine-bundle": "^1.6.10|^2.0",
                "doctrine/doctrine-migrations-bundle": "^1.3|^2.0",
                "doctrine/orm": "^2.5.11",
                "php": "^7.0"
@ -3868,20 +3915,20 @@
                "MIT"
            ],
            "description": "A pack for the Doctrine ORM",
-            "time": "2019-01-16 09:49:15"
+            "time": "2019-10-18 05:41:09"
        },
        {
            "name": "symfony/polyfill-apcu",
-            "version": "v1.11.0",
+            "version": "v1.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-apcu.git",
-                "reference": "a502face1da6a53289480166f24de2c3c68e5c3c"
+                "reference": "71ce80635d5dcd67772b4dda00b86068595f64d5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/a502face1da6a53289480166f24de2c3c68e5c3c",
-                "reference": "a502face1da6a53289480166f24de2c3c68e5c3c",
+                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/71ce80635d5dcd67772b4dda00b86068595f64d5",
+                "reference": "71ce80635d5dcd67772b4dda00b86068595f64d5",
                "shasum": ""
            },
            "require": {
@ -3890,7 +3937,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                }
            },
            "autoload": {
@ -3924,20 +3971,20 @@
                "portable",
                "shim"
            ],
-            "time": "2019-02-06 07:57:58"
+            "time": "2019-08-06 08:03:45"
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.11.0",
+            "version": "v1.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "82ebae02209c21113908c229e9883c419720738a"
+                "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
-                "reference": "82ebae02209c21113908c229e9883c419720738a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
+                "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
                "shasum": ""
            },
            "require": {
@ -3949,7 +3996,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                }
            },
            "autoload": {
@ -3966,12 +4013,12 @@
            ],
            "authors": [
                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
                },
                {
-                    "name": "Gert de Pagter",
-                    "email": "backendtea@gmail.com"
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                }
            ],
            "description": "Symfony polyfill for ctype functions",
@ -3982,25 +4029,25 @@
                "polyfill",
                "portable"
            ],
-            "time": "2019-02-06 07:57:58"
+            "time": "2019-08-06 08:03:45"
        },
        {
            "name": "symfony/polyfill-intl-icu",
-            "version": "v1.11.0",
+            "version": "v1.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-icu.git",
-                "reference": "999878a3a09d73cae157b0cf89bb6fb2cc073057"
+                "reference": "66810b9d6eb4af54d543867909d65ab9af654d7e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/999878a3a09d73cae157b0cf89bb6fb2cc073057",
-                "reference": "999878a3a09d73cae157b0cf89bb6fb2cc073057",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/66810b9d6eb4af54d543867909d65ab9af654d7e",
+                "reference": "66810b9d6eb4af54d543867909d65ab9af654d7e",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.3",
-                "symfony/intl": "~2.3|~3.0|~4.0"
+                "symfony/intl": "~2.3|~3.0|~4.0|~5.0"
            },
            "suggest": {
                "ext-intl": "For best performance"
@ -4008,7 +4055,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.12-dev"
                }
            },
            "autoload": {
@ -4040,20 +4087,20 @@
                "portable",
                "shim"
            ],
-            "time": "2019-01-07 19:39:47"
+            "time": "2019-08-06 08:03:45"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.11.0",
+            "version": "v1.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
+                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
-                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+                "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
                "shasum": ""
            },
            "require": {
@ -4065,7 +4112,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                }
            },
            "autoload": {
@ -4099,20 +4146,20 @@
                "portable",
                "shim"
            ],
-            "time": "2019-02-06 07:57:58"
+            "time": "2019-08-06 08:03:45"
        },
        {
            "name": "symfony/polyfill-php56",
-            "version": "v1.11.0",
+            "version": "v1.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php56.git",
-                "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42"
+                "reference": "0e3b212e96a51338639d8ce175c046d7729c3403"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
-                "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
+                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/0e3b212e96a51338639d8ce175c046d7729c3403",
+                "reference": "0e3b212e96a51338639d8ce175c046d7729c3403",
                "shasum": ""
            },
            "require": {
@ -4122,7 +4169,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                }
            },
            "autoload": {
@ -4155,20 +4202,20 @@
                "portable",
                "shim"
            ],
-            "time": "2019-02-06 07:57:58"
+            "time": "2019-08-06 08:03:45"
        },
        {
            "name": "symfony/polyfill-php70",
-            "version": "v1.11.0",
+            "version": "v1.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "bc4858fb611bda58719124ca079baff854149c89"
+                "reference": "54b4c428a0054e254223797d2713c31e08610831"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89",
-                "reference": "bc4858fb611bda58719124ca079baff854149c89",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/54b4c428a0054e254223797d2713c31e08610831",
+                "reference": "54b4c428a0054e254223797d2713c31e08610831",
                "shasum": ""
            },
            "require": {
@ -4178,7 +4225,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                }
            },
            "autoload": {
@ -4214,20 +4261,20 @@
                "portable",
                "shim"
            ],
-            "time": "2019-02-06 07:57:58"
+            "time": "2019-08-06 08:03:45"
        },
        {
            "name": "symfony/polyfill-util",
-            "version": "v1.11.0",
+            "version": "v1.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-util.git",
-                "reference": "b46c6cae28a3106735323f00a0c38eccf2328897"
+                "reference": "4317de1386717b4c22caed7725350a8887ab205c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/b46c6cae28a3106735323f00a0c38eccf2328897",
-                "reference": "b46c6cae28a3106735323f00a0c38eccf2328897",
+                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4317de1386717b4c22caed7725350a8887ab205c",
+                "reference": "4317de1386717b4c22caed7725350a8887ab205c",
                "shasum": ""
            },
            "require": {
@ -4236,7 +4283,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                }
            },
            "autoload": {
@ -4266,7 +4313,7 @@
                "polyfill",
                "shim"
            ],
-            "time": "2019-02-08 14:16:39"
+            "time": "2019-08-06 08:03:45"
        },
        {
            "name": "symfony/swiftmailer-bundle",
@ -4329,16 +4376,16 @@
        },
        {
            "name": "symfony/symfony",
-            "version": "v3.4.29",
+            "version": "v3.4.35",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/symfony.git",
-                "reference": "4c9b6d7d898457ae2189efdfaca58712269fc994"
+                "reference": "2adc85d49cbe14e346068fa7e9c2e1f08ab31de6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/4c9b6d7d898457ae2189efdfaca58712269fc994",
-                "reference": "4c9b6d7d898457ae2189efdfaca58712269fc994",
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/2adc85d49cbe14e346068fa7e9c2e1f08ab31de6",
+                "reference": "2adc85d49cbe14e346068fa7e9c2e1f08ab31de6",
                "shasum": ""
            },
            "require": {
@ -4357,7 +4404,7 @@
                "symfony/polyfill-mbstring": "~1.0",
                "symfony/polyfill-php56": "~1.0",
                "symfony/polyfill-php70": "~1.6",
-                "twig/twig": "^1.40|^2.9"
+                "twig/twig": "^1.41|^2.10"
            },
            "conflict": {
                "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
@ -4436,7 +4483,7 @@
                "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
                "phpdocumentor/reflection-docblock": "^3.0|^4.0",
                "predis/predis": "~1.0",
-                "symfony/phpunit-bridge": "~3.4|~4.0|~5.0",
+                "symfony/phpunit-bridge": "^3.4.31|^4.3.4|~5.0",
                "symfony/security-acl": "~2.8|~3.0"
            },
            "type": "library",
@ -4480,20 +4527,20 @@
            "keywords": [
                "framework"
            ],
-            "time": "2019-06-26 13:56:55"
+            "time": "2019-11-13 08:45:05"
        },
        {
            "name": "tetranz/select2entity-bundle",
-            "version": "v2.10.0",
+            "version": "v2.10.1",
            "source": {
                "type": "git",
                "url": "https://github.com/tetranz/select2entity-bundle.git",
-                "reference": "67b61be1a23228bc4e77a2e59ba5fff8fd9fffab"
+                "reference": "1d4b184e41bdb76a61d7462b748d9cf0ecade47a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/tetranz/select2entity-bundle/zipball/67b61be1a23228bc4e77a2e59ba5fff8fd9fffab",
-                "reference": "67b61be1a23228bc4e77a2e59ba5fff8fd9fffab",
+                "url": "https://api.github.com/repos/tetranz/select2entity-bundle/zipball/1d4b184e41bdb76a61d7462b748d9cf0ecade47a",
+                "reference": "1d4b184e41bdb76a61d7462b748d9cf0ecade47a",
                "shasum": ""
            },
            "require": {
@ -4527,7 +4574,7 @@
                "symfony",
                "typeahead"
            ],
-            "time": "2019-07-07 23:00:30"
+            "time": "2019-07-14 02:30:34"
        },
        {
            "name": "thecsea/simple-caldav-client",
@ -4574,16 +4621,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v2.11.3",
+            "version": "v2.12.2",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "699ed2342557c88789a15402de5eb834dedd6792"
+                "reference": "d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/699ed2342557c88789a15402de5eb834dedd6792",
-                "reference": "699ed2342557c88789a15402de5eb834dedd6792",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed",
+                "reference": "d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed",
                "shasum": ""
            },
            "require": {
@ -4593,13 +4640,13 @@
            },
            "require-dev": {
                "psr/container": "^1.0",
-                "symfony/debug": "^2.7",
-                "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0"
+                "symfony/debug": "^3.4|^4.2",
+                "symfony/phpunit-bridge": "^4.4@dev|^5.0"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.11-dev"
+                    "dev-master": "2.12-dev"
                }
            },
            "autoload": {
@ -4621,15 +4668,15 @@
                    "homepage": "http://fabien.potencier.org",
                    "role": "Lead Developer"
                },
-                {
-                    "name": "Armin Ronacher",
-                    "email": "armin.ronacher@active-4.com",
-                    "role": "Project Founder"
-                },
                {
                    "name": "Twig Team",
                    "homepage": "https://twig.symfony.com/contributors",
                    "role": "Contributors"
+                },
+                {
+                    "name": "Armin Ronacher",
+                    "email": "armin.ronacher@active-4.com",
+                    "role": "Project Founder"
                }
            ],
            "description": "Twig, the flexible, fast, and secure template language for PHP",
@ -4637,7 +4684,7 @@
            "keywords": [
                "templating"
            ],
-            "time": "2019-06-18 15:37:11"
+            "time": "2019-11-11 16:52:09"
        },
        {
            "name": "zendframework/zend-code",
@ -4749,16 +4796,16 @@
    "packages-dev": [
        {
            "name": "nikic/php-parser",
-            "version": "v4.2.2",
+            "version": "v4.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420"
+                "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
-                "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc",
+                "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc",
                "shasum": ""
            },
            "require": {
@ -4766,7 +4813,8 @@
                "php": ">=7.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^6.5 || ^7.0"
+                "ircmaxell/php-yacc": "0.0.5",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
            },
            "bin": [
                "bin/php-parse"
@ -4774,7 +4822,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "4.2-dev"
+                    "dev-master": "4.3-dev"
                }
            },
            "autoload": {
@ -4796,7 +4844,7 @@
                "parser",
                "php"
            ],
-            "time": "2019-05-25 20:07:01"
+            "time": "2019-11-08 13:50:10"
        },
        {
            "name": "sensio/generator-bundle",
@ -4854,40 +4902,40 @@
        },
        {
            "name": "symfony/maker-bundle",
-            "version": "v1.12.0",
+            "version": "v1.14.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/maker-bundle.git",
-                "reference": "201d0e050dca336c44f93657ce1f34f3b3868432"
+                "reference": "c864e7f9b8d1e1f5f60acc3beda11299f637aded"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/201d0e050dca336c44f93657ce1f34f3b3868432",
-                "reference": "201d0e050dca336c44f93657ce1f34f3b3868432",
+                "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/c864e7f9b8d1e1f5f60acc3beda11299f637aded",
+                "reference": "c864e7f9b8d1e1f5f60acc3beda11299f637aded",
                "shasum": ""
            },
            "require": {
                "doctrine/inflector": "^1.2",
                "nikic/php-parser": "^4.0",
                "php": "^7.0.8",
-                "symfony/config": "^3.4|^4.0",
-                "symfony/console": "^3.4|^4.0",
-                "symfony/dependency-injection": "^3.4|^4.0",
-                "symfony/filesystem": "^3.4|^4.0",
-                "symfony/finder": "^3.4|^4.0",
-                "symfony/framework-bundle": "^3.4|^4.0",
-                "symfony/http-kernel": "^3.4|^4.0"
+                "symfony/config": "^3.4|^4.0|^5.0",
+                "symfony/console": "^3.4|^4.0|^5.0",
+                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
+                "symfony/filesystem": "^3.4|^4.0|^5.0",
+                "symfony/finder": "^3.4|^4.0|^5.0",
+                "symfony/framework-bundle": "^3.4|^4.0|^5.0",
+                "symfony/http-kernel": "^3.4|^4.0|^5.0"
            },
            "require-dev": {
-                "doctrine/doctrine-bundle": "^1.8",
+                "doctrine/doctrine-bundle": "^1.8|^2.0",
                "doctrine/orm": "^2.3",
                "friendsofphp/php-cs-fixer": "^2.8",
                "friendsoftwig/twigcs": "^3.1.2",
-                "symfony/http-client": "^4.3",
-                "symfony/phpunit-bridge": "^3.4.19|^4.0",
-                "symfony/process": "^3.4|^4.0",
-                "symfony/security-core": "^3.4|^4.0",
-                "symfony/yaml": "^3.4|^4.0"
+                "symfony/http-client": "^4.3|^5.0",
+                "symfony/phpunit-bridge": "^4.3|^5.0",
+                "symfony/process": "^3.4|^4.0|^5.0",
+                "symfony/security-core": "^3.4|^4.0|^5.0",
+                "symfony/yaml": "^3.4|^4.0|^5.0"
            },
            "type": "symfony-bundle",
            "extra": {
@ -4918,20 +4966,20 @@
                "scaffold",
                "scaffolding"
            ],
-            "time": "2019-07-09 22:19:18"
+            "time": "2019-11-07 00:56:03"
        },
        {
            "name": "symfony/phpunit-bridge",
-            "version": "v3.4.29",
+            "version": "v3.4.35",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "521489968e58dcdb8df153436cc18349737e49e3"
+                "reference": "cbea8818e9f34e4e9d780bd22bdda21b57d4d5c7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/521489968e58dcdb8df153436cc18349737e49e3",
-                "reference": "521489968e58dcdb8df153436cc18349737e49e3",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/cbea8818e9f34e4e9d780bd22bdda21b57d4d5c7",
+                "reference": "cbea8818e9f34e4e9d780bd22bdda21b57d4d5c7",
                "shasum": ""
            },
            "require": {
@ -4983,7 +5031,7 @@
            ],
            "description": "Symfony PHPUnit Bridge",
            "homepage": "https://symfony.com",
-            "time": "2019-06-26 10:03:25"
+            "time": "2019-09-30 20:33:19"
        }
    ],
    "aliases": [],
--- a/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php
+++ b/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php
@ -105,7 +105,7 @@ class SecurityController extends Controller
                $em->flush();

                // On calcule les groupes de l'utilisateur
-                $user=$groups=$em->getRepository('CadolesCoreBundle:Group')->calculateGroup($user,$attributes);                
+                $groups=$em->getRepository('CadolesCoreBundle:Group')->calculateGroup($user,$attributes);                
            }
        }
        else {
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/InitDataCommand.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/InitDataCommand.php
@ -38,6 +38,7 @@ class InitDataCommand extends ContainerAwareCommand

        $em = $this->getContainer()->get('doctrine')->getEntityManager();
        $masteridentity=$this->getContainer()->getParameter('masteridentity');
+        $ldap_template = $this->getContainer()->getParameter('ldap_template');

 		$finder = new Finder();
    	$finder->in('src/Cadoles/CoreBundle/Command/data');
@ -138,7 +139,12 @@ class InitDataCommand extends ContainerAwareCommand
            if(!$niveau01) {
                // Si ce n'est pas le cas on positionne un filtre ultra large sur le niveau01 de base
                $niveau01=$group=$em->getRepository('CadolesCoreBundle:Niveau01')->find(-100);
-                $niveau01->setLdapfilter("(uid=*)");
+
+                if($ldap_template=="scribe")
+                    $niveau01->setLdapfilter("(&(uid=*)(objectclass=inetOrgPerson)(!(description=Computer)))");
+                else
+                    $niveau01->setLdapfilter("(uid=*)");
+                
                $em->persist($niveau01);
                $em->flush();             
            }
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/OnlyCommand.php
@ -0,0 +1,181 @@
+<?php
+namespace Cadoles\CoreBundle\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Finder\Finder;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\HttpFoundation\Response;
+use Doctrine\DBAL\Connection as DBALConnection;
+use Doctrine\ORM\EntityManager;
+
+use Cadoles\CoreBundle\Entity\Niveau01;
+use Cadoles\CoreBundle\Entity\Niveau02;
+use Cadoles\CoreBundle\Entity\User;
+use Cadoles\CoreBundle\Entity\Group;
+use Cadoles\CoreBundle\Entity\UserGroup;
+use Cadoles\PortalBundle\Entity\Calendar;
+use Cadoles\PortalBundle\Entity\Blog;
+
+use Unirest\Request;
+
+global $bdd01;
+global $config;
+
+
+class OnlyCommand extends Command
+{
+    private $container;
+    private $em;
+    private $em2;
+    private $output;
+    private $filesystem;
+    private $rootlog;
+    private $only_sync;
+    private $only_url;
+    private $only_user;
+    private $only_password;
+
+    protected function configure()
+    {
+        $this
+            ->setName('Core:Only')
+            ->setDescription('Synchronisation Only Office')
+            ->setHelp('This command Synchro Only Office for Core')
+            ->addArgument('simulate', InputArgument::OPTIONAL, 'true to simulate / false to run')            
+            ->addArgument('cronid', InputArgument::OPTIONAL, 'ID Cron Job') 
+            ->addArgument('lastchance', InputArgument::OPTIONAL, 'Lastchance to run the cron')              
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->container    = $this->getApplication()->getKernel()->getContainer();
+        $this->em           = $this->container->get('doctrine')->getEntityManager();
+        $this->output       = $output;
+        $this->filesystem   = new Filesystem();
+        $this->rootlog      = $this->container->get('kernel')->getRootDir()."/../var/logs/";
+
+        $this->writelnred('');
+        $this->writelnred('== Core:Only');        
+        $this->writelnred('==========================================================================================================');
+
+        setlocale( LC_CTYPE, 'fr_FR' );
+
+        $simulate = $input->getArgument('simulate');
+        if($simulate=="") $simulate="true";
+        
+        if($simulate!="true"&&$simulate!="false") {
+            $this->writeln('Paramétre incorrect');
+            return;
+        }
+        $simulate=($simulate=="true");
+        
+        $this->writeln('');
+        if($simulate) $this->writeln('** SIMULATION');
+        else $this->writeln('** REEL');
+
+        $this->writeln('');
+        $this->writeln('=====================================================');
+        $this->writeln('== SYNCHONISATION ONLY OFFICE =======================');
+        $this->writeln('=====================================================');
+
+        $this->only_sync        = true;
+        $this->only_url         = "https://transnum.oo.pp.ac-dijon.fr"."/api/2.0/";
+        $this->only_url         = "https://transnum.oo.ac-dijon.fr"."/api/2.0/";
+        $this->only_user        = "admin";
+        $this->only_password    = "brigitte89!";
+
+        if($this->only_sync) {
+
+            //$client= new curl();
+
+            // Only Office est-il dans le domaine 
+            if(stripos($this->only_url,"/")===0)
+                $this->only_url="https://".$this->container->getParameter("weburl").$this->only_url;
+            $indomaine = (stripos($this->only_url,$this->container->getParameter("weburl"))!==false);
+
+            // Si hors domaine on utilise le proxy si proxy il y a 
+            
+            if(!$indomaine) {
+                $PROXYactivate = $this->em->getRepository("CadolesCoreBundle:Config")->find("PROXYactivate")->getValue();
+                if($PROXYactivate) {
+                    $PROXYserver    = $this->em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue();
+                    $PROXYport      = $this->em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue();                    
+                    \Unirest\Request::proxy($PROXYserver, $PROXYport, CURLPROXY_HTTP, true);
+                }
+            }
+            
+
+            // Authentification à onlyoffice
+            $this->writeln('');
+            $this->writeln('== AUTHENTIFICATION =================================');
+            \Unirest\Request::verifyPeer(false);
+            \Unirest\Request::verifyHost(false);
+            $headers    = ['Host' => 'transnum.oo.ac-dijon.fr', 'Accept' => 'application/json','Content-Type'=>'application/json'];
+            $query      = array('userName' => $this->only_user, 'password' => $this->only_password);
+            $body       = \Unirest\Request\Body::json($query);
+            
+            $response   = \Unirest\Request::post($this->only_url.'/authentication',$headers,$body);
+            if($this->koresponse($response)) return 0;
+            $token=$response->body->response->token;
+            $headers["Authorization"]=$token;
+            
+            // Synchronisation des utilisateur Only sur l'annuaire
+            $this->writeln('');
+            $this->writeln('== SYNCHRONISATION ONLY==============================');
+            //$response   = \Unirest\Request::get($this->only_url.'/settings/ldap/sync',$headers);
+            //if($this->koresponse($response)) return 0;
+
+            // Controler les utilisateur only
+            $this->writeln('');
+            $this->writeln('== CONTROLE USER ONLY================================');
+            $response   = \Unirest\Request::get($this->only_url.'/people',$headers);
+            if($this->koresponse($response)) return 0;
+
+            foreach($response->body->response as $onlyuser) {
+                $user=$this->em->getRepository("CadolesCoreBundle:User")->findBy(["username"=>$onlyuser->userName]);
+                if(!$user) {
+                    $this->writelnred("ERREUR ".$onlyuser->userName." existe dans OnlyOffice mais pas dans Ninegate");
+                }
+            }
+
+            // Controler les utilisateurs ninegate
+            $this->writeln('');
+            $this->writeln('== CONTROLE USER NINEGATE============================');            
+            $users=$this->em->getRepository("CadolesCoreBundle:User")->findAll();
+            foreach($users as $user) {
+                $response   = \Unirest\Request::get($this->only_url.'/people/'.$user->getUsername(),$headers);
+                if($this->koresponse($response)) {
+                    $this->writelnred("ERREUR ".$user->getUsername()." existe dans Ninegate mais pas dans OnlyOffice");
+                }
+            }
+        }
+
+        $this->writeln('');
+        return 1;
+    }
+
+    function koresponse($response) {
+        if($response->code>=Response::HTTP_BAD_REQUEST) {
+            $this->writelnred("ERREUR ".$response->code);
+            if(property_exists($response,"body") && property_exists($response->body,"error")) $this->writelnred("ERREUR ".$response->body->error->message);;
+            return true;
+        }
+
+        return false;
+    }    
+    private function writelnred($string) { 
+        $this->output->writeln('<fg=red>'.$string.'</>');
+        $this->filesystem->appendToFile($this->rootlog.'cron.log', $string."\n");
+    }
+    private function writeln($string) { 
+        $this->output->writeln($string);
+        $this->filesystem->appendToFile($this->rootlog.'cron.log', $string."\n");
+    }   
+
+
+}
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php
@ -132,6 +132,7 @@ class SynchroCommand extends Command
                    $this->writeln("    - $label");
                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,true);

+                    // Classes
                    $this->writeln('');
                    $this->writeln('== CLASSES ==========================================');
                    $results = $this->ldap->search("type=Classe", ['cn','description','gidNumber'], $this->ldap_basedn);
@ -143,6 +144,32 @@ class SynchroCommand extends Command
                        $this->writeln("    - $label");
                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,true);                        
                    }
+
+                    // Options
+                    $this->writeln('');
+                    $this->writeln('== OPTIONS ==========================================');
+                    $results = $this->ldap->search("type=Option", ['cn','description','gidNumber'], $this->ldap_basedn);
+                    foreach($results as $result) {
+                        $cn=$result["cn"];
+                        $ldapfilter="(|(&(type=Option)(cn=$cn))(&(type=Equipe)(cn=profs-$cn))(&(ENTPersonProfils=Administratif)(divcod=$cn)))";
+
+                        $label="OPTION = ".$result["cn"];
+                        $this->writeln("    - $label");
+                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,true);                        
+                    }
+
+                    // Groupes
+                    $this->writeln('');
+                    $this->writeln('== GROUPES ==========================================');
+                    $results = $this->ldap->search("type=Groupe", ['cn','description','gidNumber'], $this->ldap_basedn);
+                    foreach($results as $result) {
+                        $cn=$result["cn"];
+                        $ldapfilter="(&(type=Groupe)(cn=$cn))";
+
+                        $label="GROUPE = ".$result["cn"];
+                        $this->writeln("    - $label");
+                        if(!$simulate) $this->addmodGroup($label,$ldapfilter,true);                        
+                    }
                }

                $this->writeln('');
@ -620,7 +647,7 @@ class SynchroCommand extends Command

            $criteria = '(cn=*)';
            $subbranch=$baseGroup;
-            $results = $this->search($criteria, array('cn'), $subbranch);
+            $results = $this->ldap->search($criteria, array('cn'), $subbranch);
            foreach($results as $result) { 
                $data = $this->em->getRepository('CadolesCoreBundle:Group')->findBy(array('label' => $result["cn"]));
                if($data) $this->writeln('    - Existe dans bundle         >> '.$result["cn"]);
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
@ -5,14 +5,13 @@ SET foreign_key_checks = 0;
 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';

 INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES
-(-100, 'DRAAF', '130007107');
+(-100, 'Interne', 'SIREN');

 INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES
-(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}kiCU5m1uSvZhdgI1Ga9gdq/8HUBjSIpX
+(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}lq8Ffm9MG+azcCnLde4qj0KU0j3XFO8/
 ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');


-
 TRUNCATE TABLE sidebar;
 INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `fonticon`, `permission`, `appactivate`) VALUES
 (1000,	NULL,	1000,	'CONFIGURATION',	    NULL,	                                'fa-gear',	            'ROLE_ADMIN,ROLE_MODO', ''),
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/ConfigController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/ConfigController.php
@ -317,6 +317,9 @@ class ConfigController extends Controller

            $fields["role"]["perm"]=1;
            $fields["role"]["label"]="Rôles";
+
+            $fields["telephonenumber"]["perm"]=1;
+            $fields["telephonenumber"]["label"]="Téléphone";            
        }
        else {
            $fields=json_decode($fields, true);
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php
@ -57,6 +57,8 @@ class CoreController extends Controller
            if($user) {
                $notices=$em->getRepository("CadolesPortalBundle:Notice")->getNoticeToRead($user);
                if(! $notices->isEmpty()) {
+                    $notices=$em->getRepository("CadolesPortalBundle:Notice")->getNoticeUser($user,false);
+                    
                    return $this->render('CadolesPortalBundle:Notice:mustread.html.twig',[
                        'useheader'     => true,
                        'usemenu'       => false,
@ -76,6 +78,7 @@ class CoreController extends Controller
                    foreach($fields as $key => $field) {
                        // Si champs obligatoire
                        if($field["perm"]==2) {
+                            dump($key);
                            switch($key) {
                                case "firstname": if($user->getFirstname()=="") $toprofil=true; break;
                                case "visible": if($user->getVisible()=="") $toprofil=true; break;
@ -93,12 +96,13 @@ class CoreController extends Controller
                                case "birthcountry": if($user->getBirthcountry()=="") $toprofil=true; break;
                                case "birthplace": if($user->getBirthplace()=="") $toprofil=true; break;
                            }
+                            dump($toprofil);
                        }
                    }
                }

                if($toprofil) {
-                    return $this->redirect($this->generateUrl('cadoles_core_profil',array("info"=>"Merci de compléter votre profil")));                    
+                    return $this->redirect($this->generateUrl('cadoles_core_user',array("info"=>"Merci de compléter votre profil")));                    
                }
            }

--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
@ -188,7 +188,7 @@ class GroupController extends Controller

            $userinfo="";
            if($data->getOwner()) {
-                $userinfo.="<img src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getOwner()->getAvatar()."' class='avatar' style='margin:0px 5px 0px 0px;display:inline-block;'>";
+                $userinfo.="<img style='cursor:pointer' onClick='seeUser(".$data->getOwner()->getId().")' src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getOwner()->getAvatar()."' class='avatar' style='margin:0px 5px 0px 0px;display:inline-block;'>";
                $userinfo.=$data->getOwner()->getUsername();
            }

@ -331,7 +331,7 @@ class GroupController extends Controller
            $fgmanager="<input type='checkbox' class='switch' onChange='switchManager(".$data->getId().");'>";

            // Avatar
-            $avatar="<img src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;'>";
+            $avatar="<img onClick='seeUser(".$data->getId().")' src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;cursor:pointer;'>";

            array_push($output["data"],array("DT_RowId"=>"user".$data->getId(),$action,$avatar,$data->getUsername(),$data->getEmail(),$fgmanager));
        }
@ -463,7 +463,7 @@ class GroupController extends Controller
                $action.="<a style='cursor:pointer' onClick='delUsers(".$data->getId().")'><i class='fa fa-minus fa-fw'></i></a>";

            // Avatar
-            $avatar="<img src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;'>";
+            $avatar="<img onClick='seeUser(".$data->getId().")' src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;cursor:pointer'>";
            
            // Flag manager
            $fgmanager="";
@ -565,7 +565,7 @@ class GroupController extends Controller

        // Notification mail auprès des managers
        if($group->getFgcanshare()) {
-            $text=$user->getUsername()." a été désinscrit dugroupe de travail : ".$group->getLabel();
+            $text=$user->getUsername()." a été désinscrit du groupe de travail : ".$group->getLabel();
            $template="template";
            $mail_params=array(
                "subject" => $this->get('session')->get('appname')." : ".$user->getUsername()." = Désinscription au groupe de travail ".$group->getLabel()."\n\n".$group->getDescription(),
@ -608,7 +608,7 @@ class GroupController extends Controller

        // Notification mail auprès des managers
        if($group->getFgcanshare()) {
-            $text=$user->getUsername()." a été désinscrit dugroupe de travail : ".$group->getLabel();
+            $text=$user->getUsername()." a été désinscrit du groupe de travail : ".$group->getLabel();
            $template="template";
            $mail_params=array(
                "subject" => $this->get('session')->get('appname')." : ".$user->getUsername()." = Désinscription au groupe de travail ".$group->getLabel()."\n\n".$group->getDescription(),
@ -662,7 +662,7 @@ class GroupController extends Controller

        // Permission
        $permgroup=$this->get('session')->get('permgroup');
-        if($access="user") {
+        if($access=="user") {
            if($permgroup=="NO_BODY") throw $this->createNotFoundException('Permission denied');
            if($permgroup=="ROLE_ANIM" && $this->isGranted('ROLE_USER')) throw $this->createNotFoundException('Permission denied');
        }
@ -849,6 +849,36 @@ class GroupController extends Controller
                
        // Sur validation
        if ($form->get('submit')->isClicked() && $form->isValid()) {
+            // Si le groupe est un groupe de travail
+            if($data->getFgcanshare()) {
+                // Sur l'ensemble des pages liés
+                $pages=$data->getPages();
+                foreach($pages as $page) {
+                    $groups=$page->getGroups();
+                    // si la page est lié qu'à un seul group on peut la supprimer
+                    if($groups->count()==1)
+                        $em->remove($page);
+                }
+
+                // Sur l'ensemble des calendar liés
+                $calendars=$data->getCalendars();
+                foreach($calendars as $calendar) {
+                    $groups=$calendar->getGroups();
+                    // si la page est lié qu'à un seul group on peut la supprimer
+                    if($groups->count()==1)
+                        $em->remove($calendar);
+                }                
+
+                // Sur l'ensemble des blog liés
+                $blogs=$data->getBlogs();
+                foreach($blogs as $blog) {
+                    $groups=$blog->getGroups();
+                    // si la page est lié qu'à un seul group on peut la supprimer
+                    if($groups->count()==1)
+                        $em->remove($blog);
+                }                 
+            }
+
            $em->remove($data);
            $em->flush();
            
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/RestController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/RestController.php
@ -54,6 +54,7 @@ class RestController extends Controller
        $output["bookmarks"]        = [];
        $output["items"]            = [];
        $output["itemcategorys"]    = [];
+        $output["groups"]           = [];
        
        $bookmarks=null;
        $items=null;
@ -61,6 +62,7 @@ class RestController extends Controller
        $weburl="https://".$this->getParameter("weburl")."/".$this->getParameter("alias")."/";

        $em->getRepository("CadolesPortalBundle:Item")->getUserItems($user,$bookmarks,$items,$itemcategorys,null,3);
+        $this->getDoctrine()->getRepository("CadolesPortalBundle:Page")->getPagesUser($user,null,$entity,$pagesuser,$pagesadmin,$groupsshared);

        // Construction de la réponse
        $output["user"]["firstname"]    = $user->getFirstname();
@ -69,6 +71,7 @@ class RestController extends Controller
        $output["user"]["avatar"]       = $weburl."uploads/avatar/".$user->getAvatar();
        $output["user"]["niveau01"]     = $user->getNiveau01()->getLabel();
        $output["user"]["niveau02"]     = ($user->getNiveau02()?$user->getNiveau02()->getLabel():null);
+        $output["user"]["role"]         = $user->getRole();

        if($bookmarks) {
            foreach($bookmarks as $bookmark) {
@ -114,6 +117,16 @@ class RestController extends Controller
            }
        }

+        if($groupsshared) {
+            foreach($groupsshared as $groupshared) {
+                $tmp=[];
+                $tmp["id"]          = $groupshared->getId();
+                $tmp["title"]       = $groupshared->getLabel();
+ 
+                array_push($output["groups"],$tmp);
+            }
+        }
+


        // Retour
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php
@ -65,71 +65,92 @@ class UserController extends Controller
        $draw= $request->query->get('draw');
        $order= $request->query->get('order');
        $viewniveau02=$this->getParameter('viewniveau02');
+        $fields=$this->getDefaultDatauser();
+        $fgusevisible=!($fields["visible"]["perm"]==0);

        // Nombre total d'enregistrement
-        if($this->isGranted('ROLE_ADMIN')||$access=="user")        
-            $total = $em->createQueryBuilder()->select('COUNT(user)')->from($this->labelentity,'user')->getQuery()->getSingleScalarResult();
-        elseif($this->isGranted('ROLE_MODO')) {
-            $usermodo=$this->get('security.token_storage')->getToken()->getUser()->getId();
-            $total = $em->createQueryBuilder()
-                        ->select('COUNT(user)')
-                        ->from($this->labelentity,'user')
-                        ->from("CadolesCoreBundle:UserModo",'usermodo')
-                        ->where("usermodo.niveau01 = user.niveau01")
-                        ->andWhere("usermodo.user = :userid")
-                        ->setParameter("userid", $usermodo)
-                        ->getQuery()->getSingleScalarResult();            
+        if($access=="config") {
+            if($this->isGranted('ROLE_ADMIN')) {
+                $total = $em->createQueryBuilder()->select('COUNT(user)')->from($this->labelentity,'user')->getQuery()->getSingleScalarResult();
+            }
+            elseif($this->isGranted('ROLE_MODO')) {
+                $usermodo=$this->get('security.token_storage')->getToken()->getUser()->getId();
+                $total = $em->createQueryBuilder()
+                            ->select('COUNT(user)')
+                            ->from($this->labelentity,'user')
+                            ->from("CadolesCoreBundle:UserModo",'usermodo')
+                            ->where("usermodo.niveau01 = user.niveau01")
+                            ->andWhere("usermodo.user = :userid")
+                            ->setParameter("userid", $usermodo)
+                            ->getQuery()->getSingleScalarResult(); 
+            }
+        }
+        else {
+            if($fgusevisible) {
+                $total = $em->createQueryBuilder()->select('COUNT(user)')->from($this->labelentity,'user')->where('user.visible=true')->getQuery()->getSingleScalarResult();
+            }
+            else {
+                $total = $em->createQueryBuilder()->select('COUNT(user)')->from($this->labelentity,'user')->getQuery()->getSingleScalarResult();
+            }
        }
-        elseif($this->isGranted('ROLE_ANIM')||$this->isGranted('ROLE_USER')) {
-            $niveau01=$this->get('security.token_storage')->getToken()->getUser()->getNiveau01();
-            $total = $em->createQueryBuilder()
-                        ->select('COUNT(user)')
-                        ->from($this->labelentity,'user')
-                        ->where("user.niveau01 = :niveau01")
-                        ->setParameter("niveau01", $niveau01)
-                        ->getQuery()->getSingleScalarResult();            
-        }        

        // Nombre d'enregistrement filtré
        if($search["value"]=="")
            $totalf = $total;
        else {
-            if($this->isGranted('ROLE_ADMIN')||$access=="user")
-                $totalf= $em->createQueryBuilder()
-                            ->select('COUNT(user)')
-                            ->from('CadolesCoreBundle:User','user')
-                            ->from('CadolesCoreBundle:Niveau01', 'niveau01')
-                            ->where('user.niveau01=niveau01.id')
-                            ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value')
-                            ->setParameter("value", "%".$search["value"]."%")
-                            ->getQuery()
-                            ->getSingleScalarResult();
-            elseif($this->isGranted('ROLE_MODO')) 
-                $totalf= $em->createQueryBuilder()
-                            ->select('COUNT(user)')
-                            ->from('CadolesCoreBundle:User','user')
-                            ->from('CadolesCoreBundle:Niveau01', 'niveau01')
-                            ->from('CadolesCoreBundle:UserModo', 'usermodo')
-                            ->where('user.niveau01=niveau01.id')
-                            ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value')
-                            ->andwhere("usermodo.niveau01 = user.niveau01")
-                            ->andWhere("usermodo.user = :userid")
-                            ->setParameter("userid", $usermodo)                            
-                            ->setParameter("value", "%".$search["value"]."%")
-                            ->getQuery()
-                            ->getSingleScalarResult();
-            elseif($this->isGranted('ROLE_ANIM')||$this->isGranted('ROLE_USER')) 
-                $totalf= $em->createQueryBuilder()
-                            ->select('COUNT(user)')
-                            ->from('CadolesCoreBundle:User','user')
-                            ->from('CadolesCoreBundle:Niveau01', 'niveau01')
-                            ->where('user.niveau01=niveau01.id')
-                            ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value')
-                            ->andWhere("user.niveau01 = :niveau01")
-                            ->setParameter("niveau01", $niveau01)                            
-                            ->setParameter("value", "%".$search["value"]."%")
-                            ->getQuery()
-                            ->getSingleScalarResult();                        
+            if($access=="config") {
+                if($this->isGranted('ROLE_ADMIN')) {
+                    $totalf= $em->createQueryBuilder()
+                                ->select('COUNT(user)')
+                                ->from('CadolesCoreBundle:User','user')
+                                ->from('CadolesCoreBundle:Niveau01', 'niveau01')
+                                ->where('user.niveau01=niveau01.id')
+                                ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value')
+                                ->setParameter("value", "%".$search["value"]."%")
+                                ->getQuery()
+                                ->getSingleScalarResult();
+                }
+                elseif($this->isGranted('ROLE_MODO')) {
+                    $totalf= $em->createQueryBuilder()
+                                ->select('COUNT(user)')
+                                ->from('CadolesCoreBundle:User','user')
+                                ->from('CadolesCoreBundle:Niveau01', 'niveau01')
+                                ->from('CadolesCoreBundle:UserModo', 'usermodo')
+                                ->where('user.niveau01=niveau01.id')
+                                ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value')
+                                ->andwhere("usermodo.niveau01 = user.niveau01")
+                                ->andWhere("usermodo.user = :userid")
+                                ->setParameter("userid", $usermodo)                            
+                                ->setParameter("value", "%".$search["value"]."%")
+                                ->getQuery()
+                                ->getSingleScalarResult();
+                }
+            }
+            else {
+                if($fgusevisible) {
+                    $totalf= $em->createQueryBuilder()
+                                ->select('COUNT(user)')
+                                ->from('CadolesCoreBundle:User','user')
+                                ->from('CadolesCoreBundle:Niveau01', 'niveau01')
+                                ->where('user.niveau01=niveau01.id')
+                                ->andWhere('user.visible=true')
+                                ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value')
+                                ->setParameter("value", "%".$search["value"]."%")
+                                ->getQuery()
+                                ->getSingleScalarResult();
+                }
+                else {
+                    $totalf= $em->createQueryBuilder()
+                                ->select('COUNT(user)')
+                                ->from('CadolesCoreBundle:User','user')
+                                ->from('CadolesCoreBundle:Niveau01', 'niveau01')
+                                ->where('user.niveau01=niveau01.id')
+                                ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value')
+                                ->setParameter("value", "%".$search["value"]."%")
+                                ->getQuery()
+                                ->getSingleScalarResult();
+                }
+            }
        }

        // Construction du tableau de retour
@ -142,23 +163,24 @@ class UserController extends Controller

        // Parcours des Enregistrement
        $qb = $em->createQueryBuilder();
-        if($this->isGranted('ROLE_ADMIN')||$access=="user") {
+        if($access=="config") {
+            if($this->isGranted('ROLE_ADMIN')) {
+                $qb->select('user')->from($this->labelentity,'user')->from('CadolesCoreBundle:Niveau01','niveau01');
+                $qb->where('user.niveau01=niveau01.id');
+            }
+            elseif($this->isGranted('ROLE_MODO')) {
+                $qb->select('user')->from($this->labelentity,'user')->from('CadolesCoreBundle:Niveau01','niveau01')->from('CadolesCoreBundle:UserModo', 'usermodo');
+                $qb->where('user.niveau01=niveau01.id')
+                ->andwhere("usermodo.niveau01 = user.niveau01")
+                ->andWhere("usermodo.user = :userid")
+                ->setParameter("userid", $usermodo);
+            }
+        }
+        else {
            $qb->select('user')->from($this->labelentity,'user')->from('CadolesCoreBundle:Niveau01','niveau01');
            $qb->where('user.niveau01=niveau01.id');
+            if($fgusevisible) $qb->andWhere('user.visible=true');
        }
-        elseif($this->isGranted('ROLE_MODO')) {
-            $qb->select('user')->from($this->labelentity,'user')->from('CadolesCoreBundle:Niveau01','niveau01')->from('CadolesCoreBundle:UserModo', 'usermodo');
-            $qb->where('user.niveau01=niveau01.id')
-               ->andwhere("usermodo.niveau01 = user.niveau01")
-               ->andWhere("usermodo.user = :userid")
-               ->setParameter("userid", $usermodo);
-        }
-        elseif($this->isGranted('ROLE_ANIM')||$this->isGranted('ROLE_USER')) {
-            $qb->select('user')->from($this->labelentity,'user')->from('CadolesCoreBundle:Niveau01','niveau01');
-            $qb->where('user.niveau01=niveau01.id')
-               ->andwhere("user.niveau01 = :niveau01")
-               ->setParameter("niveau01", $niveau01);            
-        }        
        
        if($search["value"]!="") {
            $qb ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value')
@ -184,10 +206,14 @@ class UserController extends Controller
                break;

                case 6 : 
+                $qb->orderBy('user.telephonenumber',$order[0]["dir"]);
+                break;
+
+                case 7 : 
                $qb->orderBy('niveau01.label',$order[0]["dir"]);
                break;

-                case 9 : 
+                case 10 : 
                $qb->orderBy('user.role',$order[0]["dir"]);
                break;
            }
@ -211,10 +237,14 @@ class UserController extends Controller
                break;

                case 5 : 
+                $qb->orderBy('user.telephonenumber',$order[0]["dir"]);
+                break;
+
+                case 6 : 
                $qb->orderBy('niveau01.label',$order[0]["dir"]);
                break;

-                case 7 : 
+                case 8 : 
                $qb->orderBy('user.role',$order[0]["dir"]);
                break;
            }
@ -240,11 +270,12 @@ class UserController extends Controller

            $tmp=array();
            if($access=="config") array_push($tmp,$action);
-            array_push($tmp,"<img src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getAvatar()."' class='avatar' style='margin:auto;display:block;'>");
+            array_push($tmp,"<img style='cursor:pointer' onClick='seeUser(".$data->getId().")' src='/".$this->container->getParameter('alias')."/uploads/avatar/".$data->getAvatar()."' class='avatar' style='margin:auto;display:block;'>");
            array_push($tmp,$data->getUsername());
            array_push($tmp,$data->getLastname());
            array_push($tmp,$data->getFirstname());
            array_push($tmp,"<a href='mailto:".$data->getEmail()."'>".$data->getEmail()."</a>");
+            array_push($tmp,$data->getTelephonenumber());
            array_push($tmp,$data->getNiveau01()->getLabel());
            if($viewniveau02) array_push($tmp,($data->getNiveau02()!==null?$data->getNiveau02()->getLabel():""));
            array_push($tmp,$groups);
@ -533,7 +564,7 @@ class UserController extends Controller

                    // Notification mail auprès des managers
                    if($group->getFgcanshare()) {
-                        $text=$data->getUsername()." a été désinscrit dugroupe de travail : ".$group->getLabel();
+                        $text=$data->getUsername()." a été désinscrit du groupe de travail : ".$group->getLabel();
                        $template="template";
                        $mail_params=array(
                            "subject" => $this->get('session')->get('appname')." : ".$data->getUsername()." = Désinscription au groupe de travail ".$group->getLabel()."\n\n".$group->getDescription(),
@ -704,7 +735,17 @@ class UserController extends Controller
        return $this->updateAction($user->getId(),"user",$request);
    }

+    public function viewAction($id, Request $request) 
+    {
+        $user=$this->getData($id);

+        return $this->render('CadolesCoreBundle:User:view.html.twig', [
+            'useheader'         => false,
+            'usemenu'           => false,
+            'usesidebar'        => false,               
+            "user"              => $user
+        ]);        
+    }

    public function importuserAction(Request $request) {
        if($this->GetParameter("masteridentity")!="SQL")
@ -921,6 +962,31 @@ class UserController extends Controller
        return $response;         
    }

+    public function viewcalendarAction (Request $request)
+    {
+        // S'assurer que c'est un appel ajax
+        if (!$request->isXmlHttpRequest()) {
+            return new JsonResponse(array('message' => 'Interdit'), 400);
+        }
+        
+        $user=$this->getUser();
+        if($user) {
+            $em = $this->getDoctrine()->getManager();
+            
+            $view=$request->request->get('view');
+            $idview=1;
+            if($view=="month") $idview=1;
+            if($view=="agendaWeek") $idview=2;
+            if($view=="agendaDay") $idview=3;
+
+            $user->setViewcalendar($idview);
+            $em->persist($user);
+            $em->flush();            
+        }
+
+        return new Response();
+    }
+
    protected function getDatas()
    {
        $em = $this->getDoctrine()->getManager();
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Entity/User.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Entity/User.php
@ -147,6 +147,11 @@ class User implements UserInterface, \Serializable
     */
    private $belongingpopulation;    

+    /**
+     * @ORM\Column(type="integer", nullable=true)
+     */
+    private $viewcalendar;   
+
    /**
     * @ORM\ManyToOne(targetEntity="Country", inversedBy="users")
     * @ORM\JoinColumn(nullable=true)
@ -888,6 +893,30 @@ class User implements UserInterface, \Serializable
        return $this->belongingpopulation;
    }

+    /**
+     * Set viewcalendar
+     *
+     * @param integer $viewcalendar
+     *
+     * @return User
+     */
+    public function setViewcalendar($viewcalendar)
+    {
+        $this->viewcalendar = $viewcalendar;
+
+        return $this;
+    }
+
+    /**
+     * Get viewcalendar
+     *
+     * @return integer
+     */
+    public function getViewcalendar()
+    {
+        return $this->viewcalendar;
+    }    
+
    /**
     * Set birthcountry
     *
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/uploadListener.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/uploadListener.php
@ -115,6 +115,19 @@ class uploadListener
                    $this->resizeImage($pathname."/".$directory."/thumb/".$filename,$width,$height,$scale);
                }

+
+                if (in_array(strtolower($file->GetExtension()), array('pdf'))) {
+                    $im = new \Imagick();
+                    $im->setResolution(350, 350);
+                    $im->readImage($pathname."/".$directory."/".$filename."[0]");
+                    $im->setImageBackgroundColor('#ffffff');
+                    $im = $im->flattenImages();
+                    $im->setImageFormat('jpeg');
+                    $fs->mkdir($pathname."/".$directory."/thumb");
+                    $im->writeImage($pathname."/".$directory."/thumb/".$filename.".jpg");
+                    $fs->rename($pathname."/".$directory."/thumb/".$filename.".jpg", $pathname."/".$directory."/thumb/".$filename);
+                }
+
                if (strpos($directory, 'widget') === 0) {
                    $tmp=explode("-",$directory);
                    $widgetid=$tmp[1];
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml
@ -265,6 +265,13 @@ cadoles_core_user_users:
    path: /user/users
    defaults: { _controller: CadolesCoreBundle:User:list, access: user }

+cadoles_core_user_view:
+    path: /user/view/{id}
+    defaults: { _controller: CadolesCoreBundle:User:view }    
+
+cadoles_core_user_viewcalendar:
+    path: /user/viewcalendar
+    defaults: { _controller: CadolesCoreBundle:User:viewcalendar }      

 #== Niveau01 =============================================================================================================
 cadoles_core_config_niveau01:
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/services.yml
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/services.yml
@ -127,4 +127,7 @@ services:

    cadoles.saml_attribute_mapper:
        public: true
-        class: Cadoles\CoreBundle\Service\samlAttributeMapperService
+        class: Cadoles\CoreBundle\Service\samlAttributeMapperService
+
+
+           
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
@ -204,9 +204,9 @@ span.item-drag {

 .grid {
    list-style-type: none;
-    margin: 0px;
+    margin: 0 auto;
    padding: 0;
-    width: 100%;
+    /*width: 100%;*/
    min-height: 30px;
    background: transparent;
 }
@ -232,6 +232,10 @@ span.item-drag {
    display: block;
 }

+.grid-item .grid-item-content {
+    height: 100%;
+}
+
 .grid-item .grid-item-content:hover {
    opacity: 0.8;
 }
@ -304,8 +308,9 @@ span.item-drag {
 a.item-preview {
    display: none;
    position: absolute;
-    right: 5px;
+    right: 0px;
    top: 2px;
+    width:20px;
    z-index: 1000;
 }

@ -603,6 +608,7 @@ a.item-heart {
    position: absolute;
    margin-left:50px;
    cursor: pointer;
+    font-size: 1.5vw;
 }

 .widgetheader iframe,
@ -619,6 +625,12 @@ a.item-heart {
    height:100%;
 }

+@media (max-width: 991px) {
+    .widgetheader .title {
+        font-size: 25px;
+    }
+}
+
 /*== FEED ===============================================================================================================================================*/

 .cat-list-feed {
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/3gp.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/3gp.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/7z.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/7z.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/aac.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/aac.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/ace.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/ace.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/ai.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/ai.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/aicf.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/aicf.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/aif.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/aif.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/amr.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/amr.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/asf.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/asf.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/asp.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/asp.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/asx.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/asx.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/aut.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/aut.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/avi.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/avi.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/bat.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/bat.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/bin.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/bin.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/blend.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/blend.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/bmp.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/bmp.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/bup.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/bup.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cab.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cab.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cad.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cad.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cbr.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cbr.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cda.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cda.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cdl.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cdl.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cdr.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cdr.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/chm.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/chm.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/com.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/com.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cs.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/cs.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/css.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/css.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/csv.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/csv.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/db.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/db.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/divx.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/divx.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/dll.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/dll.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/dmg.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/dmg.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/doc.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/doc.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/docx.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/docx.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/dss.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/dss.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/dvf.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/dvf.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/dwf.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/dwf.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/dwg.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/dwg.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/eml.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/eml.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/eps.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/eps.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/epub.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/epub.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/exe.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/exe.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/fla.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/fla.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/flac.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/flac.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/gif.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/gif.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/gz.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/gz.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/hlp.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/hlp.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/hqx.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/hqx.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/htm.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/htm.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/html.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/html.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/ico.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/ico.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/ifo.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/ifo.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/indd.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/indd.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/ini.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/ini.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/ink.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/ink.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/iso.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/iso.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/jar.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/jar.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/java.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/java.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/jpeg.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/jpeg.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/jpg.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/jpg.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/js.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/js.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/lnk.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/lnk.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/log.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/log.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/m4b.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/m4b.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/m4p.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/m4p.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/m4v.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/m4v.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mcd.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mcd.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mdb.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mdb.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mkv.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mkv.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mov.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mov.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mp2.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mp2.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mp3.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mp3.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mp4.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mp4.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mpeg.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mpeg.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mpg.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/mpg.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/msi.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/msi.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/net.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/net.png
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/odb.png
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/images/files/odb.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Arnaud Fornerot	0c099b0784	Merge branch 'master' into dist/envole/6/master	2019-11-21 10:42:56 +01:00
afornerot	2d640dc09a	svg	2019-11-21 10:40:15 +01:00
afornerot	4b83534c09	suppression notion eportail dans dicos (fixes #25 )	2019-11-20 10:52:03 +01:00
Arnaud Fornerot	99f29975d8	resoulion merge	2019-11-20 10:02:37 +01:00
afornerot	ac8d60f5db	svg	2019-11-20 09:45:12 +01:00
afornerot	d540b9f815	svg	2019-11-20 09:41:44 +01:00
afornerot	0b6684044e	svg	2019-11-19 14:14:40 +01:00
afornerot	b82b6296d0	svg	2019-11-19 11:21:45 +01:00
Arnaud Fornerot	f141b15e48	dep	2019-11-19 11:00:44 +01:00
Arnaud Fornerot	7416dfaa3e	Merge branch 'master' into dist/envole/6/master	2019-11-19 10:28:59 +01:00
afornerot	f4fa7c9bfc	dep sur envole-dependances	2019-11-19 10:28:17 +01:00
Arnaud Fornerot	03e0a1dc7c	Merge branch 'master' into dist/envole/6/master	2019-11-19 10:26:14 +01:00
Arnaud Fornerot	fb5e3c72ee	dependance sur envole-dependances	2019-11-19 10:25:56 +01:00
afornerot	0fd29ec35f	svg	2019-11-19 10:24:45 +01:00
Arnaud Fornerot	a0bb903635	ajout php-imagick en dépendance	2019-11-18 16:34:51 +01:00
Arnaud Fornerot	6ad1eb5569	résolution conflit	2019-11-15 11:45:54 +01:00
afornerot	c2412b504c	prise en compte de la couleur des groupes (ref #38 )	2019-11-15 11:17:25 +01:00
afornerot	7f23665454	indiquer en sous titre le groupe emetteur du message avec lien qui permet d'y accéder (fixes #33 )	2019-11-08 16:31:32 +01:00
afornerot	e553a9fdeb	ne notifier que sur les messages des groupes de travail et non sur les groupes fonctionnels (fixes #34 )	2019-11-08 16:21:08 +01:00
afornerot	3b0ac28df9	correctif sur gestion des groupes via console admin (fixes #35 )	2019-11-08 16:09:10 +01:00
afornerot	8d1b8db3f4	afficher l'ensemble des notices liés au profil lors de la signature (fixes #36 )	2019-11-08 16:02:21 +01:00
afornerot	69b9f27040	ajout icone app	2019-11-05 17:00:54 +01:00
afornerot	bcb284efca	ajout icon grr	2019-11-05 15:36:56 +01:00
afornerot	e58e6cf9c8	correction orthographe (fixes #30 )	2019-11-05 09:37:15 +01:00
afornerot	5b369002b5	possiblite de fit les grid	2019-11-04 12:03:02 +01:00
afornerot	9cbcdd28b9	déclaration du proxy en http et non plus en tcp (ref #29 )	2019-10-29 16:16:41 +01:00
Arnaud Fornerot	2b1625b5f8	Merge branch 'master' into dist/envole/6/master	2019-10-29 09:45:34 +01:00
afornerot	bdb38dd301	notification du nombre de message non lu (fixes #6 )	2019-10-28 16:55:36 +01:00
afornerot	04c061b7f6	indicateur des messages non lus en gras (fixes #7 )	2019-10-28 15:57:57 +01:00
afornerot	6d89671acf	découpage des tour par frame (fixes #24 )	2019-10-28 15:07:23 +01:00
afornerot	5d877dd8ca	indicateur user online sur le chat (fixes #5 )	2019-10-28 11:39:08 +01:00
afornerot	7265099724	ajout core-init-01.sql dans le gitignore	2019-10-28 11:37:50 +01:00
afornerot	87ce3767fa	svg	2019-10-23 10:45:06 +02:00
Arnaud Fornerot	28e9c37e48	Merge branch 'master' into dist/envole/6/master	2019-10-23 10:44:18 +02:00
afornerot	02a8b475f7	svg	2019-10-21 17:23:25 +02:00
afornerot	ce5552e610	ajustement onboarding + affiche fiche utilisateur sur clique avatar	2019-10-21 17:12:03 +02:00
afornerot	52ad21060b	ajustement onboarding + affiche fiche utilisateur sur clique avatar	2019-10-21 17:08:46 +02:00
afornerot	7ce296fd29	gestion visible et ajout colonne telephone (fixes #15 #16 )	2019-10-21 14:09:24 +02:00
afornerot	198ebd14f5	titre widget responsiv (fixes #20 )	2019-10-21 12:16:18 +02:00
afornerot	4f3efd5776	replacement mot clé #login# par username (fixes #21 )	2019-10-21 11:46:36 +02:00
afornerot	c08719deda	ajout description évènement en survol de l'event (fixes #22 )	2019-10-21 10:48:57 +02:00
afornerot	7c50db02fd	passage à une demi seconde de temps de reconexion (ref #23 )	2019-10-18 14:10:48 +02:00
Arnaud Fornerot	2262bebcda	Merge branch 'master' into dist/envole/6/master	2019-10-18 14:10:19 +02:00
afornerot	33f0d05fb6	gérer la deconnexion au websocket (ref #23 )	2019-10-18 13:56:25 +02:00
Arnaud Fornerot	f0ae7eb4f4	Merge branch 'master' into dist/envole/6/master	2019-10-18 13:56:17 +02:00
afornerot	b29ce57c6e	essai reco websocket	2019-10-17 13:37:39 +02:00
afornerot	2e34d65cbf	svg	2019-10-16 16:17:56 +02:00
Arnaud Fornerot	df29e2ca71	Merge branch 'master' into dist/envole/6/master	2019-10-16 13:55:20 +02:00
afornerot	abd323163e	svg modele scribe	2019-10-15 10:02:33 +02:00
afornerot	e9b2f694fa	svg	2019-10-14 13:30:50 +02:00
afornerot	210b669909	mise à jour pour rest	2019-10-09 17:01:41 +02:00
Arnaud Fornerot	ef0d452bc2	Merge branch 'master' into dist/envole/6/master	2019-10-09 13:49:02 +02:00
afornerot	1cd1174c79	adaptation theme transnum	2019-10-09 13:48:38 +02:00