Merge branch 'develop'

Feat : Update js with assetic
Conf : update parameters preprod according to server
2018-10-31 14:14:30 +01:00 · 2018-10-31 14:13:19 +01:00 · 2018-10-31 14:10:58 +01:00 · 2018-10-31 14:05:55 +01:00
5 changed files with 6 additions and 5 deletions
@@ -8,7 +8,8 @@ parameters:
    database_port: '5432'
    database_name: database
    database_user: user
-    database_password: 7C|Uk2B[.>"6{QO{
+    #database_password: 7C|Uk2B[.>"6{QO{
+    database_password: b|RN:iR<g,TNMqM6
 #Mongo
    mongodb_server: "mongodb://tt-website.mongo.preprod:27017"
 #Prestashop
@@ -194,7 +194,7 @@ $(document).ready(function () {
            margin: marginValue,
            // stagePadding: paddingValue,
            nav: true,
-            loop: true,
+            loop: $('.territory-carousel > .item').length <= 2 ? false : true,
            center:true,
            navText: ['<span class="left-arrow"></span>', '<span class="right-arrow"></span>']
        });
Author	SHA1	Message	Date
Maxime Thévenot	e8f7cce07b	Merge branch 'develop'	2018-10-31 14:14:30 +01:00
Author Name	d56dc27fe1	Feat : Update js with assetic	2018-10-31 14:13:19 +01:00
Maxime Thévenot	2ee49175ef	Conf : update parameters preprod according to server	2018-10-31 14:10:58 +01:00
Maxime Thévenot	6fc93372a7	Conf : update parameters preprod according to server	2018-10-31 14:05:55 +01:00