Skip to content

Commit

Permalink
Merge branch 'bugfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
gharlan committed Sep 23, 2023
2 parents 31ee1ff + 0e243ee commit cdf5e8d
Show file tree
Hide file tree
Showing 124 changed files with 114 additions and 114 deletions.
Binary file modified .github/tests-visual/backup_export--dark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/backup_export.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/backup_import--dark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/backup_import.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/backup_import_server--dark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/backup_import_server.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/cronjob_cronjobs--dark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/cronjob_cronjobs.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/cronjob_cronjobs_add--dark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/cronjob_cronjobs_add.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/debug_clockwork--dark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/debug_clockwork.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/index--dark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/index.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/login--dark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/login.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/logout--dark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/logout.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/media_manager_settings--dark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/media_manager_settings.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/media_manager_types--dark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/media_manager_types.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/media_manager_types_add--dark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/media_manager_types_add.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/media_manager_types_edit--dark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/tests-visual/media_manager_types_edit.png
Binary file modified .github/tests-visual/mediapool_media--dark.png
Binary file modified .github/tests-visual/mediapool_media.png
Binary file modified .github/tests-visual/mediapool_media_file--dark.png
Binary file modified .github/tests-visual/mediapool_media_file.png
Binary file modified .github/tests-visual/mediapool_structure--dark.png
Binary file modified .github/tests-visual/mediapool_structure.png
Binary file modified .github/tests-visual/mediapool_sync--dark.png
Binary file modified .github/tests-visual/mediapool_sync.png
Binary file modified .github/tests-visual/mediapool_upload--dark.png
Binary file modified .github/tests-visual/mediapool_upload.png
Binary file modified .github/tests-visual/metainfo_articles--dark.png
Binary file modified .github/tests-visual/metainfo_articles.png
Binary file modified .github/tests-visual/metainfo_articles_add--dark.png
Binary file modified .github/tests-visual/metainfo_articles_add.png
Binary file modified .github/tests-visual/metainfo_categories--dark.png
Binary file modified .github/tests-visual/metainfo_categories.png
Binary file modified .github/tests-visual/metainfo_clangs--dark.png
Binary file modified .github/tests-visual/metainfo_clangs.png
Binary file modified .github/tests-visual/metainfo_media--dark.png
Binary file modified .github/tests-visual/metainfo_media.png
Binary file modified .github/tests-visual/modules_actions--dark.png
Binary file modified .github/tests-visual/modules_actions.png
Binary file modified .github/tests-visual/modules_actions_add--dark.png
Binary file modified .github/tests-visual/modules_actions_add.png
Binary file modified .github/tests-visual/modules_modules--dark.png
Binary file modified .github/tests-visual/modules_modules.png
Binary file modified .github/tests-visual/modules_modules_add--dark.png
Binary file modified .github/tests-visual/modules_modules_add.png
Binary file modified .github/tests-visual/packages--dark.png
Binary file modified .github/tests-visual/packages.png
Binary file modified .github/tests-visual/packages_customizer_installed--dark.png
Binary file modified .github/tests-visual/packages_customizer_installed.png
Binary file modified .github/tests-visual/packages_help--dark.png
Binary file modified .github/tests-visual/packages_help.png
Binary file modified .github/tests-visual/phpmailer_config--dark.png
Binary file modified .github/tests-visual/phpmailer_config.png
Binary file modified .github/tests-visual/setup--dark.png
Binary file modified .github/tests-visual/setup.png
Binary file modified .github/tests-visual/setup_2--dark.png
Binary file modified .github/tests-visual/setup_2.png
Binary file modified .github/tests-visual/setup_3--dark.png
Binary file modified .github/tests-visual/setup_3.png
Binary file modified .github/tests-visual/setup_4--dark.png
Binary file modified .github/tests-visual/setup_4.png
Binary file modified .github/tests-visual/setup_5--dark.png
Binary file modified .github/tests-visual/setup_5.png
Binary file modified .github/tests-visual/setup_6--dark.png
Binary file modified .github/tests-visual/setup_6.png
Binary file modified .github/tests-visual/structure_article_edit--dark.png
Binary file modified .github/tests-visual/structure_article_edit.png
Binary file modified .github/tests-visual/structure_article_functions--dark.png
Binary file modified .github/tests-visual/structure_article_functions.png
Binary file modified .github/tests-visual/structure_category_edit--dark.png
Binary file modified .github/tests-visual/structure_category_edit.png
Binary file modified .github/tests-visual/structure_slice_edit--dark.png
Binary file modified .github/tests-visual/structure_slice_edit.png
Binary file modified .github/tests-visual/system_customizer--dark.png
Binary file modified .github/tests-visual/system_customizer.png
Binary file modified .github/tests-visual/system_lang--dark.png
Binary file modified .github/tests-visual/system_lang.png
Binary file modified .github/tests-visual/system_log--dark.png
Binary file modified .github/tests-visual/system_log.png
Binary file modified .github/tests-visual/system_report--dark.png
Binary file modified .github/tests-visual/system_report.png
Binary file modified .github/tests-visual/system_settings--dark.png
Binary file modified .github/tests-visual/system_settings.png
Binary file modified .github/tests-visual/system_settings_safemode--dark.png
Binary file modified .github/tests-visual/system_settings_safemode.png
Binary file modified .github/tests-visual/templates--dark.png
Binary file modified .github/tests-visual/templates.png
Binary file modified .github/tests-visual/templates_add--dark.png
Binary file modified .github/tests-visual/templates_add.png
Binary file modified .github/tests-visual/templates_edit--dark.png
Binary file modified .github/tests-visual/templates_edit.png
Binary file modified .github/tests-visual/users_edit--dark.png
Binary file modified .github/tests-visual/users_edit.png
Binary file modified .github/tests-visual/users_role_add--dark.png
Binary file modified .github/tests-visual/users_role_add.png
Binary file modified .github/tests-visual/users_roles--dark.png
Binary file modified .github/tests-visual/users_roles.png
Binary file modified .github/tests-visual/users_users--dark.png
Binary file modified .github/tests-visual/users_users.png
2 changes: 1 addition & 1 deletion .github/tests-visual/visual-record.js
Expand Up @@ -208,7 +208,7 @@ async function goToUrlOrThrow(page, url, options) {
}

async function main() {
const options = { args: ['--no-sandbox', '--disable-setuid-sandbox'] };
const options = { args: ['--no-sandbox', '--disable-setuid-sandbox', '--font-render-hinting=none'] };

if (DEBUGGING) {
// see https://developers.google.com/web/tools/puppeteer/debugging
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/visual-tests.yml
Expand Up @@ -91,11 +91,11 @@ jobs:
- name: Setup nodejs
uses: actions/setup-node@v3
with:
node-version: 19
node-version: 20
- name: Setup Webserver
run: |
php -S localhost:8000 &
npm install puppeteer@6 pixelmatch pngjs fs mkdirp
npm install puppeteer@21 pixelmatch pngjs fs mkdirp
- name: Take screenshots (differential)
if: github.event_name != 'repository_dispatch'
Expand Down
1 change: 1 addition & 0 deletions redaxo/src/addons/structure/lang/de_de.lang
Expand Up @@ -31,6 +31,7 @@ change = ändern
article_add = Artikel hinzufügen
article_edit = Artikel editieren
article_save = Artikel speichern
article_show = Artikel anzeigen
article = Artikel
start_article = Startartikel
no_article_available = Kein Artikel vorhanden
Expand Down
1 change: 1 addition & 0 deletions redaxo/src/addons/structure/lang/en_gb.lang
Expand Up @@ -31,6 +31,7 @@ change = change
article_add = Add article
article_edit = Change article
article_save = Save article
article_show = Show article
article = Article
start_article = Start-article
no_article_available = No article available
Expand Down
1 change: 1 addition & 0 deletions redaxo/src/addons/structure/lang/es_es.lang
Expand Up @@ -31,6 +31,7 @@ change = cambio
article_add = Añadir artículo
article_edit = Cambiar artículo
article_save = Guardar artículo
article_show = Visualizar artículo
article = Artículo
start_article = Inicio-artículo
no_article_available = No hay artículo disponible
Expand Down
1 change: 1 addition & 0 deletions redaxo/src/addons/structure/lang/it_it.lang
Expand Up @@ -30,6 +30,7 @@ change = modificare
article_add = Aggiungere articolo
article_edit = Modificare articolo
article_save = Salvare articolo
article_show = Visualizza articolo
article = Articolo
start_article = Articolo di partenza
no_article_available = Nessun articolo disponibile
Expand Down
1 change: 1 addition & 0 deletions redaxo/src/addons/structure/lang/pt_br.lang
Expand Up @@ -30,6 +30,7 @@ change = Alterar
article_add = Adicionar produto
article_edit = Alterar produto
article_save = Salvar produto
article_show = Mostrar produto
article = Produto
start_article = Produto inicial
no_article_available = Sem produtos disponíveis
Expand Down
1 change: 1 addition & 0 deletions redaxo/src/addons/structure/lang/sv_se.lang
Expand Up @@ -31,6 +31,7 @@ change = ändra
article_add = Tillfoga artikel
article_edit = Bearbeta artikel
article_save = Spara artikel
article_show = Visa artikel
article = Artikel
start_article = Startartikel
no_article_available = Finns ingen artikel
Expand Down
Expand Up @@ -24,7 +24,6 @@ update_metadata = Metadaten aktualisieren
move_article = Artikel verschieben
copy_article = in Kategorie
no_rights_to_edit = Sie haben keine Editiererlaubnis!
show = anzeigen
slice_moved = Block wurde verschoben.
slice_moved_error = Block konnte nicht verschoben werden.
slice_deleted_error = Block konnte nicht gelöscht werden.
Expand Down
Expand Up @@ -24,7 +24,6 @@ update_metadata = update metadata
move_article = Move article
copy_article = to categorie
no_rights_to_edit = No editing permissions for this block!
show = Show
slice_moved = Slice moved.
slice_moved_error = Error. Slice not moved.
slice_deleted_error = Error. Slice not deleted.
Expand Down
Expand Up @@ -24,7 +24,6 @@ update_metadata = Actualización de los metadatos
move_article = Mover el artículo
copy_article = En la categoría
no_rights_to_edit = Usted no tiene permiso para editar!
show = [Visualizar]
slice_moved = Block ha sido pospuesto.
slice_moved_error = Bloque no se pudo mover.
slice_deleted_error = El bloque no se ha podido eliminar.
Expand Down
205 changes: 102 additions & 103 deletions redaxo/src/addons/structure/plugins/content/lang/it_it.lang
Expand Up @@ -14,7 +14,7 @@ module_not_found = Modulo non trovato
confirm_delete_block = Cancellare il blocco?
block_deleted = Blocco cancellato!
block_not_deleted = Blocco non cancellato
edit_mode =
edit_mode =
metafuncs = Funzioni
metadata_updated = Metadati aggiornati
name_description = Nome
Expand All @@ -23,11 +23,10 @@ update_metadata = Metadati aggiornati
move_article = Spostare l'articolo
copy_article = in categoria
no_rights_to_edit = Non ha diritti di modificazione!
show = visualizzare
slice_moved = Blocco spostato.
slice_moved_error = Non era possibile spostare il blocco.
slice_deleted_error = Non era possibile cancellare il blocco.
slice_saved_error =
slice_saved_error =
content_contentcopy = Contenuti copiati.
content_errorcopy = Non può copiare i contenuti nella stessa lingua.
content_contentoflang = da lingua
Expand All @@ -43,108 +42,108 @@ content_error_movecategory = Non era possibile spostare la categoria
content_submitmovecategory = Spostare la categoria
content_startarticle = Articolo di partenza
content_isstartarticle = Questo articolo è un articolo di partenza
content_tostartarticle =
content_nottostartarticle =
content_tostartarticle_failed =
content_tostartarticle_ok =
content_category =
content_tocategory =
content_tocategory_failed =
content_tocategory_ok =
content_article =
content_toarticle =
content_nottoarticle =
content_toarticle_failed =
content_toarticle_ok =
move_category =
category_moved =
content_types =
content_type =
content_tostartarticle =
content_nottostartarticle =
content_tostartarticle_failed =
content_tostartarticle_ok =
content_category =
content_tocategory =
content_tocategory_failed =
content_tocategory_ok =
content_article =
content_toarticle =
content_nottoarticle =
content_toarticle_failed =
content_toarticle_ok =
move_category =
category_moved =
content_types =
content_type =

perm_options_moveSlice[] =
perm_options_moveSlice[] =

templates =
templates =

templates_not_found =
title_templates =
cant_delete_template_because_its_in_use =
template_deleted =
template_added =
template_updated =
template_categories =
template_categories_all =
template_categories_custom =
edit_template =
create_template =
template_name =
checkbox_template_active =
checkbox_template_active_info =
save_template_and_quit =
save_template_and_continue =
header_template =
header_template_description =
header_template_active =
header_template_functions =
delete_template =
header_template_caption =
modules_available =
modules_available_all =
confirm_delete_template =
templates_not_found =
title_templates =
cant_delete_template_because_its_in_use =
template_deleted =
template_added =
template_updated =
template_categories =
template_categories_all =
template_categories_custom =
edit_template =
create_template =
template_name =
checkbox_template_active =
checkbox_template_active_info =
save_template_and_quit =
save_template_and_continue =
header_template =
header_template_description =
header_template_active =
header_template_functions =
delete_template =
header_template_caption =
modules_available =
modules_available_all =
confirm_delete_template =

modules =
module =
modules =
module =
module_not_found = Modulo non trovato
modules_not_found =
module_cannot_be_deleted =
module_deleted =
module_added =
module_updated =
module_caption =
articel_updated =
create_module =
input =
output =
module_name =
save_module_and_quit =
save_module_and_continue =
module_description =
module_functions =
delete_module =
module_edit =
action_taken =
action_deleted_from_modul =
action =
actions =
action_cannot_be_deleted =
action_deleted =
action_added =
action_updated =
action_create =
action_name =
save_action_and_quit =
save_action_and_continue =
action_functions =
action_event_all =
action_event_edit =
action_event_delete =
action_event_add =
action_event =
action_mode_preview =
action_mode_presave =
action_mode_postsave =
action_delete =
action_edit =
action_add =
action_hint =
action_caption =
actions_added_caption =
actions_not_found =
all_modules =
confirm_delete_module =
confirm_delete_action =
action_header_preview =
action_header_presave =
action_header_postsave =
action_heading_preview =
action_heading_presave =
action_heading_postsave =
modules_not_found =
module_cannot_be_deleted =
module_deleted =
module_added =
module_updated =
module_caption =
articel_updated =
create_module =
input =
output =
module_name =
save_module_and_quit =
save_module_and_continue =
module_description =
module_functions =
delete_module =
module_edit =
action_taken =
action_deleted_from_modul =
action =
actions =
action_cannot_be_deleted =
action_deleted =
action_added =
action_updated =
action_create =
action_name =
save_action_and_quit =
save_action_and_continue =
action_functions =
action_event_all =
action_event_edit =
action_event_delete =
action_event_add =
action_event =
action_mode_preview =
action_mode_presave =
action_mode_postsave =
action_delete =
action_edit =
action_add =
action_hint =
action_caption =
actions_added_caption =
actions_not_found =
all_modules =
confirm_delete_module =
confirm_delete_action =
action_header_preview =
action_header_presave =
action_header_postsave =
action_heading_preview =
action_heading_presave =
action_heading_postsave =
Expand Up @@ -23,7 +23,6 @@ update_metadata = Atualizar metadados
move_article = Mover artigo
copy_article = Para a categoria
no_rights_to_edit = Sem permissão para editar este bloco!
show = Exibir
slice_moved = Bloco movido
slice_moved_error = Erro. Bloco não foi movido.
slice_deleted_error = Erro. Bloco não deletado.
Expand Down
Expand Up @@ -24,7 +24,6 @@ update_metadata = Aktualisera metadata
move_article = Flytta artikeln
copy_article = till kategorien
no_rights_to_edit = Du inga redigeringsrättigheter!
show = visa
slice_moved = Avsnittet flyttades.
slice_moved_error = Avsnittet kunde inte flyttas.
slice_deleted_error = Avsnittet kunde inte raderas.
Expand Down
Expand Up @@ -384,7 +384,7 @@
$navigation = current($blocks);
$contentNaviRight = $navigation['navigation'];

$contentNaviRight[] = ['title' => '<a href="' . rex_getUrl($articleId, $clang) . '" onclick="window.open(this.href); return false;">' . rex_i18n::msg('article') . ' ' . rex_i18n::msg('show') . ' <i class="rex-icon rex-icon-external-link"></i></a>'];
$contentNaviRight[] = ['title' => '<a href="' . rex_getUrl($articleId, $clang) . '" onclick="window.open(this.href); return false;">' . rex_i18n::msg('article_show') . ' <i class="rex-icon rex-icon-external-link"></i></a>'];

$fragment = new rex_fragment();
$fragment->setVar('id', 'rex-js-structure-content-nav', false);
Expand Down
4 changes: 2 additions & 2 deletions redaxo/src/core/lib/var_dumper.php
Expand Up @@ -91,13 +91,13 @@ public static function dump($var)

$dumper->setDisplayOptions([
'fileLinkFormat' => new class() {
public function format(string $file, string $line): ?string
public function format(string $file, string $line): string|false
{
/** @var rex_editor|null $editor */
static $editor;
$editor ??= rex_editor::factory();

return $editor->getUrl($file, $line);
return $editor->getUrl($file, $line) ?? false;
}
},
]);
Expand Down

0 comments on commit cdf5e8d

Please sign in to comment.