mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-04 05:28:59 +01:00 
			
		
		
		
	Revision history: two fixes (#7544)
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				Checks / main (push) Waiting to run
				
			
		
			
				
	
				CodeQL Advanced / Analyze (actions) (push) Waiting to run
				
			
		
			
				
	
				CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run
				
			
		
			
				
	
				Dev / Test development (push) Waiting to run
				
			
		
			
				
	
				Dev / Build Docker image (push) Blocked by required conditions
				
			
		
			
				
	
				Dev / Check Docker build (Dockerfile) (push) Blocked by required conditions
				
			
		
			
				
	
				Dev / Check Docker build (Dockerfile.alpine) (push) Blocked by required conditions
				
			
		
			
				
	
				/ Check Docker build (Dockerfile) (push) Waiting to run
				
			
		
			
				
	
				/ Check Docker build (Dockerfile.alpine) (push) Waiting to run
				
			
		
			
				
	
				/ Build Docker images (Dockerfile, ubuntu-24.04-arm, linux/arm/v7) (push) Blocked by required conditions
				
			
		
			
				
	
				/ Build Docker images (Dockerfile, ubuntu-24.04-arm, linux/arm/v8) (push) Blocked by required conditions
				
			
		
			
				
	
				/ Build Docker images (Dockerfile, ubuntu-24.04-arm, linux/arm64) (push) Blocked by required conditions
				
			
		
			
				
	
				/ Build Docker images (Dockerfile.alpine, ubuntu-latest, linux/amd64) (push) Blocked by required conditions
				
			
		
			
				
	
				/ Merge manifest lists (push) Blocked by required conditions
				
			
		
			
				
	
				playwright / main (push) Waiting to run
				
			
		
			
				
	
				Deploy MkDocs Documentation / Build and Deploy MkDocs (push) Has been cancelled
				
			
		
			
				
	
				Deploy website / Build & deploy website (push) Has been cancelled
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	Checks / main (push) Waiting to run
				
			CodeQL Advanced / Analyze (actions) (push) Waiting to run
				
			CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run
				
			Dev / Test development (push) Waiting to run
				
			Dev / Build Docker image (push) Blocked by required conditions
				
			Dev / Check Docker build (Dockerfile) (push) Blocked by required conditions
				
			Dev / Check Docker build (Dockerfile.alpine) (push) Blocked by required conditions
				
			/ Check Docker build (Dockerfile) (push) Waiting to run
				
			/ Check Docker build (Dockerfile.alpine) (push) Waiting to run
				
			/ Build Docker images (Dockerfile, ubuntu-24.04-arm, linux/arm/v7) (push) Blocked by required conditions
				
			/ Build Docker images (Dockerfile, ubuntu-24.04-arm, linux/arm/v8) (push) Blocked by required conditions
				
			/ Build Docker images (Dockerfile, ubuntu-24.04-arm, linux/arm64) (push) Blocked by required conditions
				
			/ Build Docker images (Dockerfile.alpine, ubuntu-latest, linux/amd64) (push) Blocked by required conditions
				
			/ Merge manifest lists (push) Blocked by required conditions
				
			playwright / main (push) Waiting to run
				
			Deploy MkDocs Documentation / Build and Deploy MkDocs (push) Has been cancelled
				
			Deploy website / Build & deploy website (push) Has been cancelled
				
			This commit is contained in:
		
						commit
						5b7e9d4c12
					
				@ -259,7 +259,6 @@
 | 
			
		||||
    "delete_all_revisions": "删除此笔记的所有修订版本",
 | 
			
		||||
    "delete_all_button": "删除所有修订版本",
 | 
			
		||||
    "help_title": "关于笔记修订版本的帮助",
 | 
			
		||||
    "revision_last_edited": "此修订版本上次编辑于 {{date}}",
 | 
			
		||||
    "confirm_delete_all": "您是否要删除此笔记的所有修订版本?",
 | 
			
		||||
    "no_revisions": "此笔记暂无修订版本...",
 | 
			
		||||
    "restore_button": "恢复",
 | 
			
		||||
 | 
			
		||||
@ -260,7 +260,6 @@
 | 
			
		||||
    "delete_all_revisions": "Lösche alle Revisionen dieser Notiz",
 | 
			
		||||
    "delete_all_button": "Alle Revisionen löschen",
 | 
			
		||||
    "help_title": "Hilfe zu Notizrevisionen",
 | 
			
		||||
    "revision_last_edited": "Diese Revision wurde zuletzt am {{date}} bearbeitet",
 | 
			
		||||
    "confirm_delete_all": "Möchtest du alle Revisionen dieser Notiz löschen?",
 | 
			
		||||
    "no_revisions": "Für diese Notiz gibt es noch keine Revisionen...",
 | 
			
		||||
    "confirm_restore": "Möchtest du diese Revision wiederherstellen? Dadurch werden der aktuelle Titel und Inhalt der Notiz mit dieser Revision überschrieben.",
 | 
			
		||||
 | 
			
		||||
@ -261,7 +261,6 @@
 | 
			
		||||
    "delete_all_revisions": "Delete all revisions of this note",
 | 
			
		||||
    "delete_all_button": "Delete all revisions",
 | 
			
		||||
    "help_title": "Help on Note Revisions",
 | 
			
		||||
    "revision_last_edited": "This revision was last edited on {{date}}",
 | 
			
		||||
    "confirm_delete_all": "Do you want to delete all revisions of this note?",
 | 
			
		||||
    "no_revisions": "No revisions for this note yet...",
 | 
			
		||||
    "restore_button": "Restore",
 | 
			
		||||
 | 
			
		||||
@ -259,7 +259,6 @@
 | 
			
		||||
    "delete_all_revisions": "Eliminar todas las revisiones de esta nota",
 | 
			
		||||
    "delete_all_button": "Eliminar todas las revisiones",
 | 
			
		||||
    "help_title": "Ayuda sobre revisiones de notas",
 | 
			
		||||
    "revision_last_edited": "Esta revisión se editó por última vez en {{date}}",
 | 
			
		||||
    "confirm_delete_all": "¿Quiere eliminar todas las revisiones de esta nota?",
 | 
			
		||||
    "no_revisions": "Aún no hay revisiones para esta nota...",
 | 
			
		||||
    "restore_button": "Restaurar",
 | 
			
		||||
 | 
			
		||||
@ -260,7 +260,6 @@
 | 
			
		||||
    "delete_all_revisions": "Supprimer toutes les versions de cette note",
 | 
			
		||||
    "delete_all_button": "Supprimer toutes les versions",
 | 
			
		||||
    "help_title": "Aide sur les versions de notes",
 | 
			
		||||
    "revision_last_edited": "Cette version a été modifiée pour la dernière fois le {{date}}",
 | 
			
		||||
    "confirm_delete_all": "Voulez-vous supprimer toutes les versions de cette note ?",
 | 
			
		||||
    "no_revisions": "Aucune version pour cette note pour l'instant...",
 | 
			
		||||
    "confirm_restore": "Voulez-vous restaurer cette version ? Le titre et le contenu actuels de la note seront écrasés par cette version.",
 | 
			
		||||
 | 
			
		||||
@ -867,7 +867,6 @@
 | 
			
		||||
    "delete_all_revisions": "Elimina tutte le revisioni di questa nota",
 | 
			
		||||
    "delete_all_button": "Elimina tutte le revisioni",
 | 
			
		||||
    "help_title": "Aiuto sulle revisioni delle note",
 | 
			
		||||
    "revision_last_edited": "Questa revisione è stata modificata l'ultima volta il {{date}}",
 | 
			
		||||
    "confirm_delete_all": "Vuoi eliminare tutte le revisioni di questa nota?",
 | 
			
		||||
    "no_revisions": "Ancora nessuna revisione per questa nota...",
 | 
			
		||||
    "restore_button": "Ripristina",
 | 
			
		||||
 | 
			
		||||
@ -610,7 +610,6 @@
 | 
			
		||||
    "delete_all_revisions": "このノートの変更履歴をすべて削除",
 | 
			
		||||
    "delete_all_button": "変更履歴をすべて削除",
 | 
			
		||||
    "help_title": "変更履歴のヘルプ",
 | 
			
		||||
    "revision_last_edited": "この変更は{{date}}に行われました",
 | 
			
		||||
    "confirm_delete_all": "このノートのすべての変更履歴を削除しますか?",
 | 
			
		||||
    "no_revisions": "このノートに変更履歴はまだありません...",
 | 
			
		||||
    "restore_button": "復元",
 | 
			
		||||
 | 
			
		||||
@ -912,7 +912,6 @@
 | 
			
		||||
    "delete_all_revisions": "Usuń wszystkie wersje tej notatki",
 | 
			
		||||
    "delete_all_button": "Usuń wszystkie wersje",
 | 
			
		||||
    "help_title": "Pomoc dotycząca wersji notatki",
 | 
			
		||||
    "revision_last_edited": "Ta wersja była ostatnio edytowana {{date}}",
 | 
			
		||||
    "confirm_delete_all": "Czy chcesz usunąć wszystkie wersje tej notatki?",
 | 
			
		||||
    "no_revisions": "Brak wersji dla tej notatki...",
 | 
			
		||||
    "restore_button": "Przywróć",
 | 
			
		||||
 | 
			
		||||
@ -259,7 +259,6 @@
 | 
			
		||||
    "delete_all_revisions": "Apagar todas as versões desta nota",
 | 
			
		||||
    "delete_all_button": "Apagar todas as versões",
 | 
			
		||||
    "help_title": "Ajuda sobre as versões da nota",
 | 
			
		||||
    "revision_last_edited": "Esta versão foi editada pela última vez em {{date}}",
 | 
			
		||||
    "confirm_delete_all": "Quer apagar todas as versões desta nota?",
 | 
			
		||||
    "no_revisions": "Ainda não há versões para esta nota...",
 | 
			
		||||
    "restore_button": "Recuperar",
 | 
			
		||||
 | 
			
		||||
@ -415,7 +415,6 @@
 | 
			
		||||
    "delete_all_revisions": "Excluir todas as versões desta nota",
 | 
			
		||||
    "delete_all_button": "Excluir todas as versões",
 | 
			
		||||
    "help_title": "Ajuda sobre as versões da nota",
 | 
			
		||||
    "revision_last_edited": "Esta versão foi editada pela última vez em {{date}}",
 | 
			
		||||
    "confirm_delete_all": "Você quer excluir todas as versões desta nota?",
 | 
			
		||||
    "no_revisions": "Ainda não há versões para esta nota...",
 | 
			
		||||
    "restore_button": "Recuperar",
 | 
			
		||||
 | 
			
		||||
@ -1090,7 +1090,6 @@
 | 
			
		||||
    "preview_not_available": "Nu este disponibilă o previzualizare pentru acest tip de notiță.",
 | 
			
		||||
    "restore_button": "Restaurează",
 | 
			
		||||
    "revision_deleted": "Revizia notiței a fost ștearsă.",
 | 
			
		||||
    "revision_last_edited": "Revizia a fost ultima oară modificată pe {{date}}",
 | 
			
		||||
    "revision_restored": "Revizia notiței a fost restaurată.",
 | 
			
		||||
    "revisions_deleted": "Notița reviziei a fost ștearsă.",
 | 
			
		||||
    "maximum_revisions": "Numărul maxim de revizii pentru notița curentă: {{number}}.",
 | 
			
		||||
 | 
			
		||||
@ -366,7 +366,6 @@
 | 
			
		||||
    "delete_all_button": "Удалить все версии",
 | 
			
		||||
    "help_title": "Помощь по версиям заметок",
 | 
			
		||||
    "confirm_delete_all": "Вы хотите удалить все версии этой заметки?",
 | 
			
		||||
    "revision_last_edited": "Эта версия последний раз редактировалась {{date}}",
 | 
			
		||||
    "confirm_restore": "Хотите восстановить эту версию? Текущее название и содержание заметки будут перезаписаны этой версией.",
 | 
			
		||||
    "confirm_delete": "Вы хотите удалить эту версию?",
 | 
			
		||||
    "revisions_deleted": "Версии заметки были удалены.",
 | 
			
		||||
 | 
			
		||||
@ -256,7 +256,6 @@
 | 
			
		||||
        "delete_all_revisions": "Obriši sve revizije ove beleške",
 | 
			
		||||
        "delete_all_button": "Obriši sve revizije",
 | 
			
		||||
        "help_title": "Pomoć za Revizije beleški",
 | 
			
		||||
        "revision_last_edited": "Ova revizija je poslednji put izmenjena {{date}}",
 | 
			
		||||
        "confirm_delete_all": "Da li želite da obrišete sve revizije ove beleške?",
 | 
			
		||||
        "no_revisions": "Još uvek nema revizija za ovu belešku...",
 | 
			
		||||
        "restore_button": "Vrati",
 | 
			
		||||
 | 
			
		||||
@ -260,7 +260,6 @@
 | 
			
		||||
    "delete_all_revisions": "刪除此筆記的所有歷史版本",
 | 
			
		||||
    "delete_all_button": "刪除所有歷史版本",
 | 
			
		||||
    "help_title": "關於筆記歷史版本的說明",
 | 
			
		||||
    "revision_last_edited": "此歷史版本上次於 {{date}} 編輯",
 | 
			
		||||
    "confirm_delete_all": "您是否要刪除此筆記的所有歷史版本?",
 | 
			
		||||
    "no_revisions": "此筆記暫無歷史版本…",
 | 
			
		||||
    "confirm_restore": "您是否要還原此歷史版本?這將使用此歷史版本覆寫筆記的目前標題和內容。",
 | 
			
		||||
 | 
			
		||||
@ -309,7 +309,6 @@
 | 
			
		||||
    "delete_all_revisions": "Видалити всі версії цієї нотатки",
 | 
			
		||||
    "delete_all_button": "Видалити всі версії",
 | 
			
		||||
    "help_title": "Довідка щодо Версій нотаток",
 | 
			
		||||
    "revision_last_edited": "Цю версію востаннє редагували {{date}}",
 | 
			
		||||
    "confirm_delete_all": "Ви хочете видалити всі версії цієї нотатки?",
 | 
			
		||||
    "no_revisions": "Поки що немає версій цієї нотатки...",
 | 
			
		||||
    "restore_button": "Відновити",
 | 
			
		||||
 | 
			
		||||
@ -140,11 +140,10 @@ function RevisionsList({ revisions, onSelect, currentRevision }: { revisions: Re
 | 
			
		||||
        <FormList onSelect={onSelect} fullHeight>
 | 
			
		||||
            {revisions.map((item) =>
 | 
			
		||||
                <FormListItem
 | 
			
		||||
                    title={t("revisions.revision_last_edited", { date: item.dateLastEdited })}
 | 
			
		||||
                    value={item.revisionId}
 | 
			
		||||
                    active={currentRevision && item.revisionId === currentRevision.revisionId}
 | 
			
		||||
                >
 | 
			
		||||
                    {item.dateLastEdited && item.dateLastEdited.substr(0, 16)} ({item.contentLength && utils.formatSize(item.contentLength)})
 | 
			
		||||
                    {item.dateCreated && item.dateCreated.substr(0, 16)} ({item.contentLength && utils.formatSize(item.contentLength)})
 | 
			
		||||
                </FormListItem>
 | 
			
		||||
            )}
 | 
			
		||||
        </FormList>);
 | 
			
		||||
 | 
			
		||||
@ -162,7 +162,7 @@ function getEditedNotesOnDate(req: Request) {
 | 
			
		||||
                    AND (noteId NOT LIKE '_%')
 | 
			
		||||
            UNION ALL
 | 
			
		||||
                SELECT noteId FROM revisions
 | 
			
		||||
                WHERE revisions.dateLastEdited LIKE :date
 | 
			
		||||
                WHERE revisions.dateCreated LIKE :date
 | 
			
		||||
        )
 | 
			
		||||
        ORDER BY isDeleted
 | 
			
		||||
        LIMIT 50`,
 | 
			
		||||
 | 
			
		||||
@ -29,7 +29,7 @@ export interface DeleteNotesPreview {
 | 
			
		||||
export interface RevisionItem {
 | 
			
		||||
    noteId: string;
 | 
			
		||||
    revisionId?: string;
 | 
			
		||||
    dateLastEdited?: string;
 | 
			
		||||
    dateCreated?: string;
 | 
			
		||||
    contentLength?: number;
 | 
			
		||||
    type: NoteType;
 | 
			
		||||
    title: string;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user