Bläddra i källkod

Merge branch 'master' of https://bitbucket.org/ikflowdat/ftth into FD3-93

Maximiliano Schvindt 8 år sedan
förälder
incheckning
cd875f35fb
2 ändrade filer med 11 tillägg och 11 borttagningar
  1. 10 10
      composer.lock
  2. 1 1
      src/FTTHBundle/Resources/views/ONU/show_log.html.twig

+ 10 - 10
composer.lock

@@ -1397,7 +1397,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "562c7a82d0359af5bd327eba50ba2a5eb814f4a6"
+                "reference": "b6ad2dfffe165ea3965973074fc78735770f2f9d"
             },
             "type": "library",
             "autoload": {
@@ -1412,7 +1412,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-07-27 15:18:46"
+            "time": "2017-08-01 17:52:58"
         },
         {
             "name": "ik/device-bundle",
@@ -1420,7 +1420,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "5af388f4abfdc6cdc8bf03f669574b511cf23398"
+                "reference": "f801d9002000c0804b5e8436dc1f4ac6a0143514"
             },
             "type": "library",
             "autoload": {
@@ -1435,7 +1435,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-07-25 15:32:04"
+            "time": "2017-08-01 18:49:14"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1466,7 +1466,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@bitbucket.org/ikflowdat/migrations.git",
-                "reference": "69350a183ceefabf8867e57926398f95dc57e8dc"
+                "reference": "d4b78fbdf5a79e09635f0f2c4f8e7d33157b5ce5"
             },
             "type": "library",
             "autoload": {
@@ -1481,7 +1481,7 @@
                 "bundle",
                 "migrations"
             ],
-            "time": "2017-07-31 13:19:36"
+            "time": "2017-08-01 12:51:23"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1565,7 +1565,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "9f6a6ee18df666f0f85846573f894ab76b65fea5"
+                "reference": "657599a288990dc1c2505567376bb12c522d1750"
             },
             "require": {
                 "ext-curl": "*",
@@ -1578,7 +1578,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-07-25 15:31:35"
+            "time": "2017-08-01 17:54:58"
         },
         {
             "name": "ik/workflow-bundle",
@@ -1586,7 +1586,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "eca39932f0a9fa6d565e4af9841ef6df3baa78ea"
+                "reference": "c1b4a025c48ba2141b6934b912e8a5f189b4850e"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1616,7 +1616,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-07-19 11:55:22"
+            "time": "2017-08-01 18:48:35"
         },
         {
             "name": "incenteev/composer-parameter-handler",

+ 1 - 1
src/FTTHBundle/Resources/views/ONU/show_log.html.twig

@@ -1,5 +1,5 @@
 {% extends 'SonataAdminBundle:CRUD:base_show_field.html.twig' %}
 
 {% block field %}
-    <pre style="font-size: 10px;">{{object.getLog()}}</pre>
+    <pre class="log">{{object.getLog()}}</pre>
 {% endblock %}