US 420,412,421,414

volume/www/website/www/app/Resources/views/admin/base_dashboard.html.twig

@@ -76,14 +76,14 @@
     <!-- END PAGE CONTENT WRAPPER -->
   </div>
   <!-- END PAGE CONTAINER -->
-  {% block javascripts %}
+    {% block javascripts %}
   <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDYV8IJGtIoWLfXJQQvIuDQ88n2aEuRgpg&libraries=places">
   </script>
   {% javascripts
     '@vendors'
     '@global'
     '@company'
-    output='assetic/company.js' filter='?uglifyjs2' %}
+    output='assetic/main.dash.company.js' filter='?uglifyjs2' %}
   <script src="{{ asset_url }}"></script>
   {% endjavascripts %}
 
@@ -93,6 +93,7 @@
   <script src="{{ asset('dashboard/plugins/pace/pace.min.js') }}" type="text/javascript"></script>
   <!--  A polyfill for browsers that don't support ligatures: remove liga.js if not needed-->
   <script src="{{ asset('dashboard/plugins/liga.js') }}" type="text/javascript"></script>
+  
 <script src="{{ asset('dashboard/plugins/modernizr.custom.js') }}" type="text/javascript"></script>
   <script src="{{ asset('dashboard/plugins/jquery-ui/jquery-ui.min.js') }}" type="text/javascript"></script>
   <script src="{{ asset('dashboard/plugins/popper/umd/popper.min.js') }}" type="text/javascript"></script>
@@ -117,12 +118,12 @@
   <script src="{{ asset('dashboard/plugins/mapplic/js/hammer.min.js') }}"></script>
   <script src="{{ asset('dashboard/plugins/mapplic/js/jquery.mousewheel.js') }}"></script>
   <script src="{{ asset('dashboard/plugins/mapplic/js/mapplic.js') }}"></script>
-  {# <script src="{{ asset('dashboard/plugins/rickshaw/rickshaw.min.js') }}"></script> #}
+  <script src="{{ asset('dashboard/plugins/rickshaw/rickshaw.min.js') }}"></script>
   <script src="{{ asset('dashboard/plugins/jquery-sparkline/jquery.sparkline.min.js') }}" type="text/javascript">
   </script>
     
   <script src="{{ asset('dashboard/plugins/skycons/skycons.js') }}" type="text/javascript"></script>
-  {# <script src="{{ asset('dashboard/plugins/quill/quill.min.js') }}" type="text/javascript"></script> #}
+  <script src="{{ asset('dashboard/plugins/quill/quill.min.js') }}" type="text/javascript"></script>
   <!-- END VENDOR JS -->
   <!-- BEGIN CORE TEMPLATE JS -->
   <!-- BEGIN CORE TEMPLATE JS -->

volume/www/website/www/app/Resources/views/basev2.html.twig

@@ -15,7 +15,7 @@
 
   <!-- Required Meta Tags Always Come First -->
   <meta charset="utf-8">
-  {# <meta name="robots" content="noindex,nofollow"> #}
+  <meta name="robots" content="noindex,nofollow">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   {% block meta %}
   {% endblock %}

volume/www/website/www/src/AppBundle/Entity/Ad.php

@@ -148,7 +148,7 @@ class Ad
      * @var array
      *
      * @ORM\Column(name="competences", type="json_document", nullable=true, options={"jsonb":true})
-     * 
+     * @Groups({"ad_detail", "ad_list", "answer_detail", "company_detail"})
      */
     private $competences;