Merge branch '1.4' into add-visibility-to-constants

thedevdojo · Dec 17, 2020 · fe8a8d5 · fe8a8d5
2 parents 8c4ffb0 + d00aec1
commit fe8a8d5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.3, 7.4]
+        php: [7.3, 7.4, 8.0]
         laravel: ['6.*', '7.*', '8.*']
 
     name: 'PHP ${{ matrix.php }} / ${{ matrix.laravel }}'

diff --git a/docs/bread/formfields/tinymce.md b/docs/bread/formfields/tinymce.md
@@ -1,6 +1,6 @@
 # TinyMCE
 
-If you want to customize TinyMCE within Voyager, you can do so by adding a [additional JS file](additional-css-js.md) to your config.
+If you want to customize TinyMCE within Voyager, you can do so by adding a [additional JS file](../../customization/additional-css-js.md) to your config.
 
 In this file you have to define a function like
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/publishable/lang/es/generic.php b/publishable/lang/es/generic.php
@@ -44,6 +44,7 @@
     'exception'              => 'Excepción',
     'featured'               => 'Destacados',
     'field_does_not_exist'   => 'El campo no existe',
+    'find_by_place'          => 'Buscar por lugar',
     'home'                   => 'Página de Inicio',
     'how_to_use'             => 'Cómo utilizar',
     'index'                  => 'Índice',
@@ -52,10 +53,12 @@
     'keep_sidebar_open'      => '¡Yarr! ¡Suelta las anclas! (Y mantén la barra lateral abierta) ',
     'key'                    => 'Clave',
     'last_modified'          => 'Última modificación',
+    'latitude'               => 'Latitud',
     'length'                 => 'Longitud',
     'locale'                 => 'Idioma',
     'login'                  => 'Iniciar sesión',
     'logout'                 => 'Cerrar sesión',
+    'longitude'              => 'Longitud',
     'media'                  => 'Medios',
     'menu_builder'           => 'Constructor de menús',
     'mimetype_not_allowed'   => 'Tipo de contenido no permitido',