Merge branch '2.x' into feature/update_npm_dependencies_and_use_mix
This commit is contained in:
commit
5aa8b85dd8
21 changed files with 45 additions and 2 deletions
|
@ -158,6 +158,11 @@ $.when( $.ready ).then(function() {
|
|||
$('.tooltip', this).removeClass('active');
|
||||
})
|
||||
|
||||
$('.searchform > form').on('submit', function (event) {
|
||||
if ($('#search-container select[name=provider]').val() === 'tiles') {
|
||||
event.preventDefault();
|
||||
}
|
||||
});
|
||||
|
||||
$('#search-container').on('input', 'input[name=q]', function () {
|
||||
const search = this.value
|
||||
|
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Uživatel úspěšně aktualizován',
|
||||
'alert.success.user_deleted' => 'Uživatel úspěšně smazán',
|
||||
'alert.success.user_restored' => 'Uživatel úspěšně obnoven',
|
||||
'dashboard.reorder' => 'Změňte pořadí a připněte položky',
|
||||
'dashboard.settings' => 'Nastavení',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Bruger opdateret med succes',
|
||||
'alert.success.user_deleted' => 'Bruger slettet med succes',
|
||||
'alert.success.user_restored' => 'Bruger genskabt med succes',
|
||||
'dashboard.reorder' => 'Genbestil og fastgør varer',
|
||||
'dashboard.settings' => 'Indstillinger',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Nutzer erfolgreich aktualisiert',
|
||||
'alert.success.user_deleted' => 'Nutzer erfolgreich gelöscht',
|
||||
'alert.success.user_restored' => 'Nutzer erfolgreich wiederhergestellt',
|
||||
'dashboard.reorder' => 'Elemente neu anordnen und anheften',
|
||||
'dashboard.settings' => 'Einstellungen',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Ο χρήστης ενημερώθηκε επιτυχώς',
|
||||
'alert.success.user_deleted' => 'Ο χρήστης διαγράφηκε επιτυχώς',
|
||||
'alert.success.user_restored' => 'Ο χρήστης επαναφέρθηκε επιτυχώς',
|
||||
'dashboard.reorder' => 'Παραγγείλετε ξανά και καρφιτσώστε αντικείμενα',
|
||||
'dashboard.settings' => 'Ρυθμίσεις',
|
||||
);
|
|
@ -1,8 +1,6 @@
|
|||
<?php
|
||||
|
||||
return array (
|
||||
'dashboard.reorder' => 'Reorder and pin items',
|
||||
'dashboard.settings' => 'Settings',
|
||||
'settings.system' => 'System',
|
||||
'settings.appearance' => 'Appearance',
|
||||
'settings.miscellaneous' => 'Miscellaneous',
|
||||
|
@ -103,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'User updated successfully',
|
||||
'alert.success.user_deleted' => 'User deleted successfully',
|
||||
'alert.success.user_restored' => 'User restored successfully',
|
||||
'dashboard.reorder' => 'Reorder and pin items',
|
||||
'dashboard.settings' => 'Settings',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Usuario actualizado exitósamente',
|
||||
'alert.success.user_deleted' => 'Usuario eliminado exitósamente',
|
||||
'alert.success.user_restored' => 'Usuario restaurado exitósamente',
|
||||
'dashboard.reorder' => 'Reordenar y anclar elementos',
|
||||
'dashboard.settings' => 'Ajustes',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Käyttäjä päivitetty onnistuneesti',
|
||||
'alert.success.user_deleted' => 'Käyttäjä poistettu onnistuneesti',
|
||||
'alert.success.user_restored' => 'Käyttäjä palautettu onnistuneesti',
|
||||
'dashboard.reorder' => 'Järjestä ja kiinnitä kohteita uudelleen',
|
||||
'dashboard.settings' => 'asetukset',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Utilisateur mis à jour avec succès',
|
||||
'alert.success.user_deleted' => 'Utilisateur supprimé avec succès',
|
||||
'alert.success.user_restored' => 'Utilisateur restoré avec succès',
|
||||
'dashboard.reorder' => 'Réorganiser et épingler les éléments',
|
||||
'dashboard.settings' => 'Réglages',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Felhasználó sikeresen frissítve',
|
||||
'alert.success.user_deleted' => 'Felhasználó sikeresen törölve',
|
||||
'alert.success.user_restored' => 'Felhasználó sikeresen visszaállítva',
|
||||
'dashboard.reorder' => 'Elemek átrendezése és rögzítése',
|
||||
'dashboard.settings' => 'Beállítások',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Utente aggiornato con successo',
|
||||
'alert.success.user_deleted' => 'Utente eliminato con successo',
|
||||
'alert.success.user_restored' => 'Utente ripristinato con successo',
|
||||
'dashboard.reorder' => 'Riordina e fissa gli elementi',
|
||||
'dashboard.settings' => 'Impostazioni',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => '사용자를 성공적으로 업데이트했습니다',
|
||||
'alert.success.user_deleted' => '사용자를 성공적으로 제거했습니다',
|
||||
'alert.success.user_restored' => '사용자를 성공적으로 복원했습니다',
|
||||
'dashboard.reorder' => '항목 재정렬 및 고정',
|
||||
'dashboard.settings' => '설정',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Gebruiker met succes bewerkt',
|
||||
'alert.success.user_deleted' => 'Gebruiker met succes verwijderd',
|
||||
'alert.success.user_restored' => 'Gebruiker met succes hersteld',
|
||||
'dashboard.reorder' => 'Items opnieuw ordenen en vastzetten',
|
||||
'dashboard.settings' => 'Instellingen',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Brukeren er oppdatert',
|
||||
'alert.success.user_deleted' => 'Brukeren ble slettet',
|
||||
'alert.success.user_restored' => 'Brukeren ble gjenopprettet',
|
||||
'dashboard.reorder' => 'Ombestill og fest varer',
|
||||
'dashboard.settings' => 'Innstillinger',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Użytkownik został pomyślnie zaktualizowany',
|
||||
'alert.success.user_deleted' => 'Użytkownik został pomyślnie usunięty',
|
||||
'alert.success.user_restored' => 'Pomyślnie przywrócono użytkownika',
|
||||
'dashboard.reorder' => 'Zmień kolejność i przypnij elementy',
|
||||
'dashboard.settings' => 'Ustawienia',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Utilizador atualizada com sucesso',
|
||||
'alert.success.user_deleted' => 'Utilizador apagada com sucesso',
|
||||
'alert.success.user_restored' => 'Utilizador restaurada com sucesso',
|
||||
'dashboard.reorder' => 'Reordenar e fixar itens',
|
||||
'dashboard.settings' => 'Definições',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Пользователь обновлен успешно',
|
||||
'alert.success.user_deleted' => 'Пользователь удален успешно',
|
||||
'alert.success.user_restored' => 'Пользователь восстановлен успешно',
|
||||
'dashboard.reorder' => 'Изменить порядок и закрепить элементы',
|
||||
'dashboard.settings' => 'Настройки',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Uporabnik uspešno posodobljen',
|
||||
'alert.success.user_deleted' => 'Uporabnik uspešno izbrisan',
|
||||
'alert.success.user_restored' => 'Uporabnik uspešno obnovljen',
|
||||
'dashboard.reorder' => 'Preuredite in pripnite elemente',
|
||||
'dashboard.settings' => 'nastavitve',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Anvädare uppdaterad',
|
||||
'alert.success.user_deleted' => 'Användare borttagen',
|
||||
'alert.success.user_restored' => 'Användare återställd',
|
||||
'dashboard.reorder' => 'Ordna om och fäst föremål',
|
||||
'dashboard.settings' => 'inställningar',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => 'Kullanıcı başarıyla güncellendi',
|
||||
'alert.success.user_deleted' => 'Kullanıcı başarıyla silindi',
|
||||
'alert.success.user_restored' => 'Kullanıcı başarıyla geri yüklendi',
|
||||
'dashboard.reorder' => 'Öğeleri yeniden sırala ve sabitle',
|
||||
'dashboard.settings' => 'Ayarlar',
|
||||
);
|
|
@ -101,4 +101,6 @@ return array (
|
|||
'alert.success.user_updated' => '用户修改成功',
|
||||
'alert.success.user_deleted' => '用户移除成功',
|
||||
'alert.success.user_restored' => '用户恢复成功',
|
||||
'dashboard.reorder' => '重新排序和固定項目',
|
||||
'dashboard.settings' => '設置',
|
||||
);
|
Loading…
Reference in a new issue