Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,4 @@ Desktop.ini
!.gitignore
!/.github
!/.dockerignore
/tmp/
5 changes: 4 additions & 1 deletion core/functions/session_proxy.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ public static function disabled(): bool
}

/**
* Drops the session middleware from a front-end group while sessions are disabled.
* Drops the session middleware from a front-end group while sessions are disabled,
* and with it what reads the store: ShareErrorsFromSession would throw
* "Session store not set on request" on every routed front-end request.
* @param string[] $middleware
* @return string[]
*/
Expand All @@ -46,6 +48,7 @@ public static function filterMiddleware(array $middleware): array
return array_values(array_filter($middleware, static fn ($m) => !in_array($m, [
\Illuminate\Session\Middleware\StartSession::class,
\EvolutionCMS\Middleware\SessionProxy::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
], true)));
}

Expand Down
1 change: 1 addition & 0 deletions core/lang/az/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@
$_lang["resource_parent"] = 'Ana resurs';
$_lang["resource_parent_help"] = 'Ana resursu təyin etmək üçün ikona klikləyin, sonra Sayt Ağacında bir resurs seçərək yeni ana resurs təyin edin.';
$_lang["resource_permissions_error"] = 'Bu resursu, daxil ola bildiyiniz ən azı bir resurs qrupuna təyin edin.';
$_lang["resource_save_unconfirmed"] = 'Yadda saxlama təsdiqlənmədi. Redaktor saxlanılmış vəziyyəti göstərmək üçün yenidən yüklənəcək.';
$_lang["resource_setting"] = 'Resurs ayarı';
$_lang["resource_summary"] = 'Qısa məzmun (giriş mətni)';
$_lang["resource_summary_help"] = 'Resurs üçün qısa xülasə daxil edin';
Expand Down
1 change: 1 addition & 0 deletions core/lang/be/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@
$_lang["resource_parent"] = 'Бацькоўскі рэсурс';
$_lang["resource_parent_help"] = 'Націсніце значок, каб выбраць бацькоўскі рэсурс для гэтага рэсурсу.';
$_lang["resource_permissions_error"] = 'Для гэтага рэсурсу патрэбныя дазволы. Калі ласка, патрабуйце дазволы ад адміністратара сайта.';
$_lang["resource_save_unconfirmed"] = 'Захаванне не пацверджана. Рэдактар будзе перазагружаны, каб паказаць захаваны стан.';
$_lang["resource_setting"] = 'Налады рэсурсу';
$_lang["resource_summary"] = 'Кароткі змест';
$_lang["resource_summary_help"] = 'Увядзіце кароткае апісанне ці змест гэтага рэсурсу.';
Expand Down
1 change: 1 addition & 0 deletions core/lang/bg/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,7 @@
$_lang["resource_parent"] = 'Родител на Документа';
$_lang["resource_parent_help"] = 'Щракнете на горната икона, за да разрешите (или забраните) избирането на родителя на този документ. След това, щракнете върху документ от дървото, за да укажете неговия нов родителски документ.';
$_lang["resource_permissions_error"] = 'Assign this Resource to at least one Resource Group to which you have access.';
$_lang["resource_save_unconfirmed"] = 'Записът не беше потвърден. Редакторът ще се презареди, за да покаже съхраненото състояние.';
$_lang["resource_setting"] = 'Настройки на Документа';
$_lang["resource_summary"] = 'Резюме (introtext)';
$_lang["resource_summary_help"] = 'Въведете кратко резюме за документа';
Expand Down
1 change: 1 addition & 0 deletions core/lang/cs/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,7 @@
$_lang["resource_parent"] = 'Umístění dokumentu';
$_lang["resource_parent_help"] = 'Klikněte v adresářovém stromě na ikonku složky pro jeho otevření (zavření), a potom na dokument v stromu, který chcete nastavit jako umístění dokumentu.';
$_lang["resource_permissions_error"] = 'Přiřaďte tento dokument alespoň do jedné skupiny dokumentů, kterou můžete používat.';
$_lang["resource_save_unconfirmed"] = 'Uložení se nepodařilo potvrdit. Editor se znovu načte a zobrazí uložený stav.';
$_lang["resource_setting"] = 'Nastavení dokumentu';
$_lang["resource_summary"] = 'Souhrn (introtext)';
$_lang["resource_summary_help"] = 'Model stručného souhrnu dokumentu';
Expand Down
1 change: 1 addition & 0 deletions core/lang/da/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,7 @@
$_lang["resource_parent"] = 'Ovenstående ressource';
$_lang["resource_parent_help"] = 'Klik på ikonet for at aktivere funktionen. Klik derefter på den ressource i website træet som denne ressource fremover skal være under.';
$_lang["resource_permissions_error"] = 'Tilføj denne ressource til mindst én ressource gruppe du selv har rettigheder til.';
$_lang["resource_save_unconfirmed"] = 'Gemningen kunne ikke bekræftes. Editoren genindlæses for at vise den gemte tilstand.';
$_lang["resource_setting"] = 'Ressource redigering';
$_lang["resource_summary"] = 'Introduktion';
$_lang["resource_summary_help"] = 'Indtast et kort resume for denne ressource';
Expand Down
1 change: 1 addition & 0 deletions core/lang/de/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,7 @@
$_lang["resource_parent"] = 'Container';
$_lang["resource_parent_help"] = 'Klicken Sie auf eine Ressource im Baum, um diese als übergeordnete Ressource zu wählen.';
$_lang["resource_permissions_error"] = 'Weisen Sie diese Ressource mindestens einer Ressourcen-Gruppe zu, zu der Sie Zugriff haben.';
$_lang["resource_save_unconfirmed"] = 'Das Speichern konnte nicht bestätigt werden. Der Editor wird neu geladen und zeigt den gespeicherten Stand.';
$_lang["resource_setting"] = 'Ressourcen-Eigenschaften';
$_lang["resource_summary"] = 'Zusammenfassung';
$_lang["resource_summary_help"] = 'Geben Sie eine kurze inhaltliche Zusammenfassung der Ressource ein.';
Expand Down
1 change: 1 addition & 0 deletions core/lang/en/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,7 @@
$_lang["resource_parent"] = 'Resource parent';
$_lang["resource_parent_help"] = 'Click the icon to enable setting a Resource parent, then click a Resource in the Site Tree to set a new parent.';
$_lang["resource_permissions_error"] = 'Assign this Resource to at least one Resource Group to which you have access.';
$_lang["resource_save_unconfirmed"] = 'The save could not be confirmed. The editor reloads to show the stored state.';
$_lang["resource_setting"] = 'Resource setting';
$_lang["resource_summary"] = 'Summary (introtext)';
$_lang["resource_summary_help"] = 'Type a brief summary of the Resource';
Expand Down
1 change: 1 addition & 0 deletions core/lang/es/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,7 @@
$_lang["resource_parent"] = 'Padre del documento';
$_lang["resource_parent_help"] = 'Haz clic en el icono de arriba para habilitar (o deshabilitar) seleccionar el padre de este documento. Luego, haz clic en un documento del árbol para seleccionar su nuevo padre.';
$_lang["resource_permissions_error"] = 'Asigna este Documento a por lo menos un Grupo de Documentos al que puedas acceder.';
$_lang["resource_save_unconfirmed"] = 'No se pudo confirmar el guardado. El editor se recargará para mostrar el estado almacenado.';
$_lang["resource_setting"] = 'Configuración de documento';
$_lang["resource_summary"] = 'Resumen (introtext)';
$_lang["resource_summary_help"] = 'Escribe un resumen corto del documento';
Expand Down
1 change: 1 addition & 0 deletions core/lang/fa/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,7 @@
$_lang["resource_parent"] = 'سرگروه پرونده';
$_lang["resource_parent_help"] = 'برای انتخاب یا مشخص کردن سرگروه این پرونده روی نماد یا آیکون بالا کلیک کنید سپس از طریق درختی روی پرونده کلیک کنید تا سرگروه جدید آنرا تعیین کنید';
$_lang["resource_permissions_error"] = 'Assign this Resource to at least one Resource Group to which you have access.';
$_lang["resource_save_unconfirmed"] = 'ذخیره‌سازی تأیید نشد. ویرایشگر برای نمایش وضعیت ذخیره‌شده دوباره بارگذاری می‌شود.';
$_lang["resource_setting"] = 'تنظیمات پرونده';
$_lang["resource_summary"] = 'خلاصه یا مقدمه ی کوتاه مطلب';
$_lang["resource_summary_help"] = 'خلاصه ای مختصر از پرونده را در اینجا ذکر کنید.';
Expand Down
1 change: 1 addition & 0 deletions core/lang/fi/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,7 @@
$_lang["resource_parent"] = 'Sivun paikka';
$_lang["resource_parent_help"] = 'Napsauta ensin yllä olevaa kansiokuvaketta ja sitten sivukartasta sitä sivua, jonka alle tämä sivu sijoitetaan.';
$_lang["resource_permissions_error"] = 'Sijoita tämä sivu vähintään yhteen sivuryhmään, johon myös itselläsi on käyttöoikeudet.';
$_lang["resource_save_unconfirmed"] = 'Tallennusta ei voitu vahvistaa. Editori ladataan uudelleen tallennetun tilan näyttämiseksi.';
$_lang["resource_setting"] = 'Sivun asetukset';
$_lang["resource_summary"] = 'Yhteenveto';
$_lang["resource_summary_help"] = 'Sivun yhteenveto.';
Expand Down
1 change: 1 addition & 0 deletions core/lang/fr/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,7 @@
$_lang["resource_parent"] = 'Ressource parente';
$_lang["resource_parent_help"] = 'Cliquez sur l\'icône ci-dessus pour activer (ou désactiver) la sélection d\'une Ressource parente. Cliquez ensuite sur une Ressource dans l\'Arbre du Site pour la choisir comme parente.';
$_lang["resource_permissions_error"] = 'Assignez cette Ressource à au moins un Groupe de Ressources auquel vous avez accès.';
$_lang["resource_save_unconfirmed"] = 'L\'enregistrement n\'a pas pu être confirmé. L\'éditeur se recharge pour afficher l\'état enregistré.';
$_lang["resource_setting"] = 'Propriétés de la Ressource';
$_lang["resource_summary"] = 'Résumé';
$_lang["resource_summary_help"] = 'Rédigez un bref résumé de la Ressource';
Expand Down
1 change: 1 addition & 0 deletions core/lang/he/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,7 @@
$_lang["resource_parent"] = 'אב המסמך';
$_lang["resource_parent_help"] = 'Click on the icon above to enable (or disable) selecting this document\'s parent. Next, click a document in the tree to set its new parent.';
$_lang["resource_permissions_error"] = 'Assign this Document to at least one Document Group which you can access.';
$_lang["resource_save_unconfirmed"] = 'לא ניתן היה לאשר את השמירה. העורך ייטען מחדש כדי להציג את המצב השמור.';
$_lang["resource_setting"] = 'הגדרות מסמך';
$_lang["resource_summary"] = 'סיכום (introtext)';
$_lang["resource_summary_help"] = 'Type a brief summary of the document';
Expand Down
1 change: 1 addition & 0 deletions core/lang/it/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,7 @@
$_lang["resource_parent"] = 'Risorsa genitore';
$_lang["resource_parent_help"] = 'Selezionate una Risorsa nella struttura ad albero per impostarla come genitore di questa Risorsa.';
$_lang["resource_permissions_error"] = 'Assegnate questa Risorsa ad almeno un Gruppo Risorse al quale avete accesso.';
$_lang["resource_save_unconfirmed"] = 'Il salvataggio non è stato confermato. L\'editor verrà ricaricato per mostrare lo stato memorizzato.';
$_lang["resource_setting"] = 'Impostazioni Risorsa';
$_lang["resource_summary"] = 'Sommario';
$_lang["resource_summary_help"] = 'Inserire un breve sommario della Risorsa';
Expand Down
1 change: 1 addition & 0 deletions core/lang/ja/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,7 @@
$_lang["resource_parent"] = '親リソース';
$_lang["resource_parent_help"] = 'コンテナアイコンをクリックすると、このリソースの親(コンテナ)を変更できる状態になります。アイコンが変化している状態で、親にしたいリソースをリソースツリー上でクリックしてください。もう一度クリックすると元に戻ります。';
$_lang["resource_permissions_error"] = 'このリソースを、少なくともアクセス可能な一つ以上のリソースグループへ割り当ててください。';
$_lang["resource_save_unconfirmed"] = '保存を確認できませんでした。保存済みの状態を表示するためエディターを再読み込みします。';
$_lang["resource_setting"] = 'リソース設定';
$_lang["resource_summary"] = '要約(序説)';
$_lang["resource_summary_help"] = 'リソースの要約を入力します。リソース変数:[*introtext*]';
Expand Down
1 change: 1 addition & 0 deletions core/lang/nl/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,7 @@
$_lang["resource_parent"] = 'Hoofdpagina';
$_lang["resource_parent_help"] = 'Selecteer een Pagina in de Website boomstructuur om het als Hoofdpagina van deze Pagina in te stellen.';
$_lang["resource_permissions_error"] = 'Koppel deze Pagina aan tenminste 1 Paginagroep waar u toegang tot heeft.';
$_lang["resource_save_unconfirmed"] = 'Het opslaan kon niet worden bevestigd. De editor wordt opnieuw geladen om de opgeslagen staat te tonen.';
$_lang["resource_setting"] = 'Pagina instellingen';
$_lang["resource_summary"] = 'Samenvatting (introductietekst)';
$_lang["resource_summary_help"] = 'Typ een korte beschrijving van de Pagina.';
Expand Down
1 change: 1 addition & 0 deletions core/lang/nn/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,7 @@
$_lang["resource_parent"] = 'Dokumenteier';
$_lang["resource_parent_help"] = 'Klikk på det ovenstående mappeikonet for å sette (eller fjerne) eiervalg. Klikk deretter på et dokument i dokumenttreet for å sette det som eier til dette dokumententet.';
$_lang["resource_permissions_error"] = 'Assign this Resource to at least one Resource Group to which you have access.';
$_lang["resource_save_unconfirmed"] = 'Lagringen kunne ikke bekreftes. Editoren lastes på nytt for å vise den lagrede tilstanden.';
$_lang["resource_setting"] = 'Dokumentinnstillinger';
$_lang["resource_summary"] = 'Sammendrag';
$_lang["resource_summary_help"] = 'Skriv et kort sammendrag av dokumentet';
Expand Down
1 change: 1 addition & 0 deletions core/lang/pl/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,7 @@
$_lang["resource_parent"] = 'Dokument nadrzędny';
$_lang["resource_parent_help"] = 'Kliknij na powyższej ikonie folderu aby włączyć (lub wyłączyć) wybór dokumentu nadrzędnego, a następnie kliknij na dokumencie w drzewie, żeby ustawić go jako nadrzędny dla tego dokumentu.';
$_lang["resource_permissions_error"] = 'Przypisz ten zasób przynajmniej do jednej grupy zasobów do której masz dostęp.';
$_lang["resource_save_unconfirmed"] = 'Nie udało się potwierdzić zapisu. Edytor zostanie przeładowany, aby pokazać zapisany stan.';
$_lang["resource_setting"] = 'Ustawienia dokumentu';
$_lang["resource_summary"] = 'Wstęp';
$_lang["resource_summary_help"] = 'Wpisz krótki wstęp dla dokumentu';
Expand Down
1 change: 1 addition & 0 deletions core/lang/pt/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,7 @@
$_lang["resource_parent"] = 'Document pai';
$_lang["resource_parent_help"] = 'Clique no ícone acima para activar (ou desactivar) a selecção do \'pai\' deste documento. Em seguida clique num documento da árvore para atribuir-lhe parentesco.';
$_lang["resource_permissions_error"] = 'Assign this Resource to at least one Resource Group to which you have access.';
$_lang["resource_save_unconfirmed"] = 'Não foi possível confirmar a gravação. O editor será recarregado para mostrar o estado guardado.';
$_lang["resource_setting"] = 'Configurações do documento';
$_lang["resource_summary"] = 'Introdução';
$_lang["resource_summary_help"] = 'Escreva um breve resumo do conteúdo do documento.';
Expand Down
1 change: 1 addition & 0 deletions core/lang/sk/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@
$_lang["resource_parent"] = 'Priečinok';
$_lang["resource_parent_help"] = 'Kliknite na ikonu kontajnera hore pre zapnutie (vypnutie) režimu výberu rodičovského zdroja, potom ho vyberte v strome webu vľavo.';
$_lang["resource_permissions_error"] = 'Prepojte tento zdroj aspoň s jednou skupinou zdrojov, ku ktorej máte prístup.';
$_lang["resource_save_unconfirmed"] = 'Uloženie sa nepodarilo potvrdiť. Editor sa znova načíta a zobrazí uložený stav.';
$_lang["resource_setting"] = 'Nastavenia zdroja';
$_lang["resource_summary"] = 'Anotácia (úvod)';
$_lang["resource_summary_help"] = 'Zadajte krátky popis zdroja';
Expand Down
1 change: 1 addition & 0 deletions core/lang/sv/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,7 @@
$_lang["resource_parent"] = 'Resursförälder';
$_lang["resource_parent_help"] = 'Klicka på ikonen för att aktivera val av förälder för denna resurs. Klicka sedan på en resurs i webbplatsträdet för att ange den som ny förälder.';
$_lang["resource_permissions_error"] = 'Tilldela denna resurs till minst en resursgrupp som du kan komma åt.';
$_lang["resource_save_unconfirmed"] = 'Sparningen kunde inte bekräftas. Redigeraren laddas om för att visa det sparade läget.';
$_lang["resource_setting"] = 'Resursinställningar';
$_lang["resource_summary"] = 'Sammanfattning';
$_lang["resource_summary_help"] = 'Skriv en kort sammanfattning av resursen';
Expand Down
1 change: 1 addition & 0 deletions core/lang/uk/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,7 @@
$_lang["resource_parent"] = 'Папка';
$_lang["resource_parent_help"] = 'Клацніть мишею на значку контейнера вгорі, щоб включити (виключити) режим вибору батьківського ресурсу, потім виберіть його в дереві сайту зліва.';
$_lang["resource_permissions_error"] = 'Зв\'яжіть цей ресурс принаймні з однією групою ресурсів, до якої у Вас є доступ.';
$_lang["resource_save_unconfirmed"] = 'Збереження не підтверджено. Редактор перезавантажиться, щоб показати збережений стан.';
$_lang["resource_setting"] = 'Налаштування ресурса';
$_lang["resource_summary"] = 'Анотація (введення)';
$_lang["resource_summary_help"] = 'Введіть короткий опис ресурсу';
Expand Down
1 change: 1 addition & 0 deletions core/lang/zh/global.php
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,7 @@
$_lang["resource_parent"] = '文档之父本。';
$_lang["resource_parent_help"] = '点上面文件夹的图标来激活或禁止父本的选择,当激活的时候,你可以从文档树中选择一文档作为本文档的父本。';
$_lang["resource_permissions_error"] = 'Assign this Resource to at least one Resource Group to which you have access.';
$_lang["resource_save_unconfirmed"] = '无法确认保存。编辑器将重新加载以显示已保存的状态。';
$_lang["resource_setting"] = '文档设置';
$_lang["resource_summary"] = '摘要 (介绍)';
$_lang["resource_summary_help"] = '输入文档的大纲';
Expand Down
Loading
Loading