Selaa lähdekoodia

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

Daniel Libonati 6 vuotta sitten
vanhempi
commit
5603c34126

+ 2 - 1
.drone.yml

@@ -27,7 +27,8 @@ pipeline:
       CLIENT: fd3
       MYSQL_ROOT_PASSWORD: ""
       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

+ 2 - 0
app/config/config.yml

@@ -70,6 +70,8 @@ twig:
         checked_is_user_logged_in: '%app.checked_is_user_logged_in%'
         navbar_menu: '%navbar_menu%'
         active_menu: '%active_menu%'
+        fd3_modules_install: '%fd3_modules_install%'
+
 # Doctrine Configuration
 doctrine:
     dbal:

+ 1 - 0
app/config/parameters.yml.dist

@@ -44,3 +44,4 @@ parameters:
 
     # App Dummy URL
     env(HOST_DUMMY): http://www.flowdat.com/
+    fd3_modules_install: '%env(MODULES_INSTALL)%,base,configuracion'

+ 1 - 0
app/config/parameters.yml.docker

@@ -43,3 +43,4 @@ parameters:
 
     # nombre del servicio del nginx
     nginx_name: nginx-proxy
+    fd3_modules_install: '%env(MODULES_INSTALL)%,base,configuracion'

+ 1 - 0
app/config/security.yml

@@ -38,6 +38,7 @@ security:
                 target: /
                 success_handler: base_admin.security.logout.handler
             anonymous: true
+            access_denied_handler: kernel.handler.access_denied_handler
             # HWIOAuthBundle + BaseOAuthBundle Configuration
             oauth:
                 login_path: /login

+ 2 - 2
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",