Merge remote-tracking branch 'remotes/origin/master' into HEAD

.drone.yml

@@ -25,6 +25,7 @@ pipeline:
       AMQP_KEY: ""
       CLIENT: fd3
       DOMAIN: flowdat.com
+      MODULES_INSTALL: "base,ftth,etc"
     commands:
       - command -v mysqladmin >/dev/null 2>&1 || { echo "I require mysqladmin but it's not installed.  Aborting." >&2; exit 1; }
       - while ! mysqladmin ping -h mysql --silent; do :; done

app/config/config.yml

@@ -79,6 +79,7 @@ twig:
         checked_is_user_logged_in: '%app.checked_is_user_logged_in%'
         active_menu: '%active_menu%'
         navbar_menu: '%navbar_menu%'
+        fd3_modules_install: '%fd3_modules_install%'
 
 # Doctrine Configuration
 doctrine:

app/config/parameters.yml.dist

@@ -46,3 +46,4 @@ parameters:
 
     # Database de kea
     database_name_kea: kea
+    fd3_modules_install: '%env(MODULES_INSTALL)%,base,configuracion'

app/config/parameters.yml.docker

@@ -42,3 +42,4 @@ parameters:
 
     # Database de kea
     database_name_kea: kea
+    fd3_modules_install: '%env(MODULES_INSTALL)%,base,configuracion'

composer.lock

@@ -1458,7 +1458,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "0cd43a77d46a11f26708d738751313eb5f3940a4"
+                "reference": "27ff6fd446c6d78d3f2b72e9724fb1a8aea46ab4"
             },
             "type": "library",
             "autoload": {
@@ -1473,7 +1473,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-10-01T14:56:00+00:00"
+            "time": "2018-10-05T13:54:13+00:00"
         },
         {
             "name": "ik/device-bundle",