merge from develop

commit 6a05e05bf97e4e8f5bd30b81c192f0854f7746a8
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 12:22:53 2017 +0100

    update nginx docker listening port

commit 4f9b143d9d7de5fd303bd178014e54765c473fe1
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 11:54:25 2017 +0100

    gitignore env files

commit 7a03258d039f1d778b651485d57418173cf02534
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 11:54:16 2017 +0100

    remove unwanted env files

commit 9608afbd6068c114de14d08cb9505d0b72f2ed98
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 11:54:03 2017 +0100

    update production store database credential

commit 1ca654b460b85d6a198df72ad2863bc8e943235a
Author: Sébastien STOLZ <sebastien@e-declic.com>
Date:   Thu Dec 21 09:44:18 2017 +0100

    merge feature refactor docker

    commit 644eec0e84
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 17:16:19 2017 +0100

        gitignore backup folder

    commit 851ca86cb7
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 17:16:11 2017 +0100

        add mongo backup/restore

    commit a01e857b72
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:35:33 2017 +0100

        move store to right location :)

    commit 1363060c07
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:06:42 2017 +0100

        symfony conf update

    commit c781458763
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:06:22 2017 +0100

        nginx conf update

    commit aa60d39522
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:06:07 2017 +0100

        docker conf refactoring

    commit 3ddc3bbd00
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:05:33 2017 +0100

        remove mlocate package on containers

    commit f2a0b27418
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 16:05:05 2017 +0100

        add volume to gitignore

    commit b638c63812
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 10:08:55 2017 +0100

        first docker struct

    commit 71c6f90685
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:51:30 2017 +0100

        rename nginx config file

    commit d667905f07
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:38:27 2017 +0100

        add store to repo

    commit 3ef1d29081
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:28:27 2017 +0100

        move website gitignore patterns to new location

    commit 03604e29ff
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:28:03 2017 +0100

        move website files to new folder

    commit 722db3bb55
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:27:19 2017 +0100

        gitignore

    commit d5eb5b2f86
    Author: Sébastien STOLZ <sebastien@e-declic.com>
    Date:   Wed Dec 20 09:27:06 2017 +0100

        remove gitsubmodule config file

    commit ff5ca40f3f
    Author: Sébastien STOLZ <sstolz@zaxxon.local>
    Date:   Wed Dec 20 09:21:41 2017 +0100

        remove store submodule

commit deec5da92f9b430e60b97b5145f44dce33c6a508
Merge: d32c00c2 5c805db6
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Wed Dec 20 14:29:31 2017 +0100

    Merge remote-tracking branch 'origin/develop' into develop

commit d32c00c2a3e8c9d63d9859c7cd9340e190df3fde
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 15:57:49 2017 +0100

    Feat : modif call stat

commit 5c805db64e2f68f5b3e774cd64401122fdb7cfce
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Wed Dec 20 10:08:27 2017 +0100

    Fix: dashboard territory

commit 65b4ec05b9
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 16:56:19 2017 +0100

    Fix : date

commit 188e40fda4
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 16:53:30 2017 +0100

    Fix : probleme heure pour jour complet  #5737 @0h15

commit 0b1af02535
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 16:33:30 2017 +0100

    Fix : bug stats array

commit d277462d40
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 15:57:49 2017 +0100

    Feat : modif call stat

commit 7f7678737c
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 15:08:11 2017 +0100

    Feat : ajout du chevron #5737 @0h15

commit 46aef95e61
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 14:33:07 2017 +0100

    Fix : date js

commit 1b8dbdf0b6
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 11:41:36 2017 +0100

    Fix : no stats

commit 4409b75edf
Merge: 5652cbf9 b630d2fb
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 11:23:43 2017 +0100

    Merge branch 'develop' of https://git.e-declic.net/talents-tube/website into develop

commit 5652cbf9d1
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 11:23:31 2017 +0100

    Fix : calcul #5737 @0h30

commit b630d2fb4e
Merge: bac003c3 58ac0b9e
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Tue Dec 19 11:11:48 2017 +0100

    Merge remote-tracking branch 'origin/develop' into develop

commit bac003c30d
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Tue Dec 19 11:11:44 2017 +0100

    Fix : Display full lastname

    #5739

commit 58ac0b9e91
Merge: 1e9df9ce 73eb2761
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 10:41:12 2017 +0100

    Merge branch 'feat/stats_ajax' into develop

commit 73eb2761c6
Author: Thomas MONCHICOURT <thomas@e-declic.com>
Date:   Tue Dec 19 10:38:32 2017 +0100

    Feat : Modification des stats en ajax #5737  @4h30

commit 1e9df9ce55
Author: Maxime Thévenot <mthevenot.perso@gmail.com>
Date:   Tue Dec 19 09:31:22 2017 +0100

    Fix : missing typo in ad meta description

    #5746

.gitignore

@@ -5,4 +5,5 @@
 /volume/*
 !/volume/www
 /volume/www/**/conf/nginx.conf
-/backup
+/backup
+/conf/env/*.env

conf/docker-compose.dev.yml

@@ -3,6 +3,8 @@ version: '3'
 services:
 
   nginx:
+    ports:
+      - "8080:80"
     volumes:
       - ../volume/www:/home/www:cached
     restart: "no"

conf/docker-compose.yml

@@ -9,8 +9,6 @@ services:
     build: build/nginx
     container_name: ${CLIENT}.nginx.${ENV}
     hostname: nginx
-    ports:
-      - "80:80"
     volumes:
       - ../volume/nginx/etc.nginx.sites-enabled:/etc/nginx/sites-enabled
       - ../volume/www:/home/www

conf/env/postgres.env

@@ -1,3 +0,0 @@
-POSTGRES_DB=database
-POSTGRES_USER=user
-POSTGRES_PASSWORD=edcl56

conf/env/store-mysql.env

@@ -1,4 +0,0 @@
-MYSQL_ROOT_PASSWORD=n1O060}8S<()+G;X
-MYSQL_DATABASE=db
-MYSQL_USER=dbuser
-MYSQL_PASSWORD=|;YR1,rf-E}ICoh5

volume/www/website/store/config/settings-prod.inc.php

@@ -2,7 +2,7 @@
 define('_DB_SERVER_', 'tt-website.store-php.prod');
 define('_DB_NAME_', 'database');
 define('_DB_USER_', 'user');
-define('_DB_PASSWD_', '|;YR1,rf-E}ICoh5');
+define('_DB_PASSWD_', 'O}lk|45&J,kT+DDM{uk[');
 define('_DB_PREFIX_', '');
 define('_MYSQL_ENGINE_', 'InnoDB');
 define('_PS_CACHING_SYSTEM_', 'CacheFs');