Skip to content

Commit 6617864

Browse files
iagocavalcanteiagocavalcante
committed
Merge remote-tracking branch 'upstream/main'
2 parents 30ab22f + de5f903 commit 6617864

84 files changed

Lines changed: 3959 additions & 1235 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
Open-source collaborative wiki and documentation software.
55
<br />
66
<a href="https://docmost.com"><strong>Website</strong></a> |
7-
<a href="https://docmost.com/docs"><strong>Documentation</strong></a>
7+
<a href="https://docmost.com/docs"><strong>Documentation</strong></a> |
8+
<a href="https://twitter.com/DocmostHQ"><strong>Twitter / X</strong></a>
89
</p>
910
</div>
1011
<br />
1112

1213
## Getting started
1314

14-
To get started with Docmost, please refer to our [documentation](https://docmost.com/docs).
15+
To get started with Docmost, please refer to our [documentation](https://docmost.com/docs) or try our [cloud version](https://docmost.com/pricing) .
1516

1617
## Features
1718

@@ -46,3 +47,16 @@ All files in the following directories are licensed under the Docmost Enterprise
4647
### Contributing
4748

4849
See the [development documentation](https://docmost.com/docs/self-hosting/development)
50+
51+
## Thanks
52+
Special thanks to;
53+
54+
<img width="100" alt="Crowdin" src="https://github.com/user-attachments/assets/a6c3d352-e41b-448d-b6cd-3fbca3109f07" />
55+
56+
[Crowdin](https://crowdin.com/) for providing access to their localization platform.
57+
58+
59+
<img width="48" alt="Algolia-mark-square-white" src="https://github.com/user-attachments/assets/6ccad04a-9589-4965-b6a1-d5cb1f4f9e94" />
60+
61+
[Algolia](https://www.algolia.com/) for providing full-text search to the docs.
62+

‎apps/client/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<title>Docmost</title>
9+
<!--meta-tags-->
910
</head>
1011
<body>
1112
<div id="root"></div>

‎apps/client/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "client",
33
"private": true,
4-
"version": "0.10.2",
4+
"version": "0.20.0",
55
"scripts": {
66
"dev": "vite",
77
"build": "tsc && vite build",
@@ -25,7 +25,7 @@
2525
"@tabler/icons-react": "^3.22.0",
2626
"@tanstack/react-query": "^5.61.4",
2727
"@tiptap/extension-character-count": "^2.11.5",
28-
"axios": "^1.7.9",
28+
"axios": "^1.8.4",
2929
"clsx": "^2.1.1",
3030
"emoji-mart": "^5.6.0",
3131
"file-saver": "^2.0.5",
@@ -63,7 +63,7 @@
6363
"@types/node": "22.10.0",
6464
"@types/react": "^18.3.12",
6565
"@types/react-dom": "^18.3.1",
66-
"@vitejs/plugin-react": "^4.3.4",
66+
"@vitejs/plugin-react": "^4.4.1",
6767
"eslint": "^9.15.0",
6868
"eslint-plugin-react": "^7.37.2",
6969
"eslint-plugin-react-hooks": "^5.1.0",
@@ -76,6 +76,6 @@
7676
"prettier": "^3.4.1",
7777
"typescript": "^5.7.2",
7878
"typescript-eslint": "^8.17.0",
79-
"vite": "^6.1.0"
79+
"vite": "^6.3.2"
8080
}
8181
}

‎apps/client/public/locales/de-DE/translation.json‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,5 +362,26 @@
362362
"Move page to a different space.": "Seite in einen anderen Bereich verschieben.",
363363
"Real-time editor connection lost. Retrying...": "Echtzeit-Editor-Verbindung verloren. Wiederholen...",
364364
"Table of contents": "Inhaltsverzeichnis",
365-
"Add headings (H1, H2, H3) to generate a table of contents.": "Fügen Sie Überschriften (H1, H2, H3) hinzu, um ein Inhaltsverzeichnis zu erstellen."
365+
"Add headings (H1, H2, H3) to generate a table of contents.": "Fügen Sie Überschriften (H1, H2, H3) hinzu, um ein Inhaltsverzeichnis zu erstellen.",
366+
"Share": "Teilen",
367+
"Public sharing": "Öffentliches Teilen",
368+
"Shared by": "Geteilt von",
369+
"Shared at": "Geteilt am",
370+
"Inherits public sharing from": "Erbt das öffentliche Teilen von",
371+
"Share to web": "Im Web teilen",
372+
"Shared to web": "Im Web geteilt",
373+
"Anyone with the link can view this page": "Jeder mit dem Link kann diese Seite ansehen",
374+
"Make this page publicly accessible": "Diese Seite öffentlich zugänglich machen",
375+
"Include sub-pages": "Unterseiten einbeziehen",
376+
"Make sub-pages public too": "Unterseiten auch öffentlich machen",
377+
"Allow search engines to index page": "Suchmaschinen erlauben, die Seite zu indexieren",
378+
"Open page": "Seite öffnen",
379+
"Page": "Seite",
380+
"Delete public share link": "Öffentlichen Freigabelink löschen",
381+
"Delete share": "Freigabe löschen",
382+
"Are you sure you want to delete this shared link?": "Möchten Sie diesen Freigabelink wirklich löschen?",
383+
"Publicly shared pages from spaces you are a member of will appear here": "Öffentlich geteilte Seiten aus Bereichen, in denen Sie Mitglied sind, erscheinen hier",
384+
"Share deleted successfully": "Freigabe erfolgreich gelöscht",
385+
"Share not found": "Freigabe nicht gefunden",
386+
"Failed to share page": "Fehler beim Teilen der Seite"
366387
}

‎apps/client/public/locales/en-US/translation.json‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,5 +362,26 @@
362362
"Move page to a different space.": "Move page to a different space.",
363363
"Real-time editor connection lost. Retrying...": "Real-time editor connection lost. Retrying...",
364364
"Table of contents": "Table of contents",
365-
"Add headings (H1, H2, H3) to generate a table of contents.": "Add headings (H1, H2, H3) to generate a table of contents."
365+
"Add headings (H1, H2, H3) to generate a table of contents.": "Add headings (H1, H2, H3) to generate a table of contents.",
366+
"Share": "Share",
367+
"Public sharing": "Public sharing",
368+
"Shared by": "Shared by",
369+
"Shared at": "Shared at",
370+
"Inherits public sharing from": "Inherits public sharing from",
371+
"Share to web": "Share to web",
372+
"Shared to web": "Shared to web",
373+
"Anyone with the link can view this page": "Anyone with the link can view this page",
374+
"Make this page publicly accessible": "Make this page publicly accessible",
375+
"Include sub-pages": "Include sub-pages",
376+
"Make sub-pages public too": "Make sub-pages public too",
377+
"Allow search engines to index page": "Allow search engines to index page",
378+
"Open page": "Open page",
379+
"Page": "Page",
380+
"Delete public share link": "Delete public share link",
381+
"Delete share": "Delete share",
382+
"Are you sure you want to delete this shared link?": "Are you sure you want to delete this shared link?",
383+
"Publicly shared pages from spaces you are a member of will appear here": "Publicly shared pages from spaces you are a member of will appear here",
384+
"Share deleted successfully": "Share deleted successfully",
385+
"Share not found": "Share not found",
386+
"Failed to share page": "Failed to share page"
366387
}

‎apps/client/public/locales/es-ES/translation.json‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
"Invited members will be granted access to spaces the groups can access": "Los miembros invitados recibirán acceso a los espacios a los que los grupos pueden acceder",
9595
"Join the workspace": "Unirse al espacio de trabajo",
9696
"Language": "Idioma",
97-
"Light": "Ligero",
97+
"Light": "Claro",
9898
"Link copied": "Enlace copiado",
9999
"Login": "Iniciar sesión",
100100
"Logout": "Cerrar sesión",
@@ -362,5 +362,26 @@
362362
"Move page to a different space.": "Mover página a un espacio diferente.",
363363
"Real-time editor connection lost. Retrying...": "Conexión del editor en tiempo real perdida. Reintentando...",
364364
"Table of contents": "Índice de contenidos",
365-
"Add headings (H1, H2, H3) to generate a table of contents.": "Añadir encabezados (H1, H2, H3) para generar un índice de contenidos."
365+
"Add headings (H1, H2, H3) to generate a table of contents.": "Añadir encabezados (H1, H2, H3) para generar un índice de contenidos.",
366+
"Share": "Compartir",
367+
"Public sharing": "Compartición pública",
368+
"Shared by": "Compartido por",
369+
"Shared at": "Compartido en",
370+
"Inherits public sharing from": "Hereda la compartición pública de",
371+
"Share to web": "Compartir en la web",
372+
"Shared to web": "Compartido en la web",
373+
"Anyone with the link can view this page": "Cualquiera con el enlace puede ver esta página",
374+
"Make this page publicly accessible": "Hacer esta página accesible públicamente",
375+
"Include sub-pages": "Incluir subpáginas",
376+
"Make sub-pages public too": "Hacer públicas también las subpáginas",
377+
"Allow search engines to index page": "Permitir a los motores de búsqueda indexar la página",
378+
"Open page": "Abrir página",
379+
"Page": "Página",
380+
"Delete public share link": "Eliminar enlace de compartición pública",
381+
"Delete share": "Eliminar compartición",
382+
"Are you sure you want to delete this shared link?": "¿Está seguro de que desea eliminar este enlace compartido?",
383+
"Publicly shared pages from spaces you are a member of will appear here": "Las páginas compartidas públicamente de los espacios a los que pertenece aparecerán aquí",
384+
"Share deleted successfully": "Compartición eliminada con éxito",
385+
"Share not found": "Compartición no encontrada",
386+
"Failed to share page": "Error al compartir la página"
366387
}

‎apps/client/public/locales/fr-FR/translation.json‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,5 +362,26 @@
362362
"Move page to a different space.": "Déplacer la page vers un autre espace.",
363363
"Real-time editor connection lost. Retrying...": "Connexion avec l'éditeur en temps réel perdue. Nouvelle tentative...",
364364
"Table of contents": "",
365-
"Add headings (H1, H2, H3) to generate a table of contents.": "Ajoutez des titres (H1, H2, H3) pour générer une table des matières."
365+
"Add headings (H1, H2, H3) to generate a table of contents.": "Ajoutez des titres (H1, H2, H3) pour générer une table des matières.",
366+
"Share": "Partager",
367+
"Public sharing": "Partage public",
368+
"Shared by": "Partagé par",
369+
"Shared at": "Partagé à",
370+
"Inherits public sharing from": "Hérite du partage public de",
371+
"Share to web": "Partager sur le web",
372+
"Shared to web": "Partagé sur le web",
373+
"Anyone with the link can view this page": "Toute personne avec le lien peut voir cette page",
374+
"Make this page publicly accessible": "Rendre cette page accessible au public",
375+
"Include sub-pages": "Inclure les sous-pages",
376+
"Make sub-pages public too": "Rendre également les sous-pages publiques",
377+
"Allow search engines to index page": "Autoriser les moteurs de recherche à indexer la page",
378+
"Open page": "Ouvrir la page",
379+
"Page": "Page",
380+
"Delete public share link": "Supprimer le lien de partage public",
381+
"Delete share": "Supprimer le partage",
382+
"Are you sure you want to delete this shared link?": "Êtes-vous sûr de vouloir supprimer ce lien partagé ?",
383+
"Publicly shared pages from spaces you are a member of will appear here": "Les pages partagées publiquement des espaces dont vous êtes membre apparaîtront ici",
384+
"Share deleted successfully": "Partage supprimé avec succès",
385+
"Share not found": "Partage non trouvé",
386+
"Failed to share page": "Échec du partage de la page"
366387
}

‎apps/client/public/locales/it-IT/translation.json‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,5 +362,26 @@
362362
"Move page to a different space.": "Sposta la pagina in un altro spazio.",
363363
"Real-time editor connection lost. Retrying...": "Connessione all'editor in tempo reale persa. Riprovo...",
364364
"Table of contents": "Indice dei contenuti",
365-
"Add headings (H1, H2, H3) to generate a table of contents.": "Aggiungi intestazioni (H1, H2, H3) per generare un sommario."
365+
"Add headings (H1, H2, H3) to generate a table of contents.": "Aggiungi intestazioni (H1, H2, H3) per generare un sommario.",
366+
"Share": "Condividi",
367+
"Public sharing": "Condivisione pubblica",
368+
"Shared by": "Condiviso da",
369+
"Shared at": "Condiviso il",
370+
"Inherits public sharing from": "Eredita la condivisione pubblica da",
371+
"Share to web": "Condividi su web",
372+
"Shared to web": "Condiviso su web",
373+
"Anyone with the link can view this page": "Chiunque abbia il link può visualizzare questa pagina",
374+
"Make this page publicly accessible": "Rendi questa pagina accessibile pubblicamente",
375+
"Include sub-pages": "Includi sotto-pagine",
376+
"Make sub-pages public too": "Rendi pubbliche anche le sotto-pagine",
377+
"Allow search engines to index page": "Permetti ai motori di ricerca di indicizzare la pagina",
378+
"Open page": "Apri pagina",
379+
"Page": "Pagina",
380+
"Delete public share link": "Elimina il link di condivisione pubblica",
381+
"Delete share": "Elimina condivisione",
382+
"Are you sure you want to delete this shared link?": "Sei sicuro di voler eliminare questo link condiviso?",
383+
"Publicly shared pages from spaces you are a member of will appear here": "Le pagine condivise pubblicamente dagli spazi di cui sei membro appariranno qui",
384+
"Share deleted successfully": "Condivisione eliminata con successo",
385+
"Share not found": "Condivisione non trovata",
386+
"Failed to share page": "Condivisione della pagina fallita"
366387
}

‎apps/client/public/locales/ja-JP/translation.json‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,5 +362,26 @@
362362
"Move page to a different space.": "ページを別のスペースに移動します。",
363363
"Real-time editor connection lost. Retrying...": "リアルタイムエディターの接続が失われました。再試行しています…",
364364
"Table of contents": "目次",
365-
"Add headings (H1, H2, H3) to generate a table of contents.": "見出し（H1、H2、H3）を追加して目次を生成します。"
365+
"Add headings (H1, H2, H3) to generate a table of contents.": "見出し（H1、H2、H3）を追加して目次を生成します。",
366+
"Share": "共有",
367+
"Public sharing": "公開共有",
368+
"Shared by": "共有者",
369+
"Shared at": "共有日時",
370+
"Inherits public sharing from": "から公開共有を継承する",
371+
"Share to web": "ウェブで共有",
372+
"Shared to web": "ウェブに共有済み",
373+
"Anyone with the link can view this page": "リンクを持っている人はこのページを閲覧できます",
374+
"Make this page publicly accessible": "このページを公開します",
375+
"Include sub-pages": "サブページを含む",
376+
"Make sub-pages public too": "サブページも公開する",
377+
"Allow search engines to index page": "検索エンジンにページのインデックス作成を許可する",
378+
"Open page": "ページを開く",
379+
"Page": "ページ",
380+
"Delete public share link": "公開リンクを削除",
381+
"Delete share": "共有を削除",
382+
"Are you sure you want to delete this shared link?": "この共有リンクを削除してもよろしいですか?",
383+
"Publicly shared pages from spaces you are a member of will appear here": "メンバーであるスペースからの公開ページがここに表示されます",
384+
"Share deleted successfully": "共有が正常に削除されました",
385+
"Share not found": "共有が見つかりません",
386+
"Failed to share page": "ページの共有に失敗しました"
366387
}

‎apps/client/public/locales/ko-KR/translation.json‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,5 +362,26 @@
362362
"Move page to a different space.": "페이지를 다른 공간으로 이동합니다.",
363363
"Real-time editor connection lost. Retrying...": "실시간 편집기 연결이 끊어졌습니다. 재시도 중...",
364364
"Table of contents": "목차",
365-
"Add headings (H1, H2, H3) to generate a table of contents.": "목차를 생성하려면 제목 (H1, H2, H3)을 추가하세요."
365+
"Add headings (H1, H2, H3) to generate a table of contents.": "목차를 생성하려면 제목 (H1, H2, H3)을 추가하세요.",
366+
"Share": "공유",
367+
"Public sharing": "공개 공유",
368+
"Shared by": "공유자",
369+
"Shared at": "공유 시간",
370+
"Inherits public sharing from": "로부터 공개 공유를 상속함",
371+
"Share to web": "웹에 공유",
372+
"Shared to web": "웹에 공유됨",
373+
"Anyone with the link can view this page": "링크가 있는 사람은 이 페이지를 볼 수 있습니다",
374+
"Make this page publicly accessible": "이 페이지를 공개적으로 접근 가능하게 만들기",
375+
"Include sub-pages": "하위 페이지 포함",
376+
"Make sub-pages public too": "하위 페이지도 공개로 설정",
377+
"Allow search engines to index page": "검색 엔진이 페이지를 색인할 수 있도록 허용",
378+
"Open page": "페이지 열기",
379+
"Page": "페이지",
380+
"Delete public share link": "공유 링크 삭제",
381+
"Delete share": "공유 삭제",
382+
"Are you sure you want to delete this shared link?": "이 공유 링크를 삭제하시겠습니까?",
383+
"Publicly shared pages from spaces you are a member of will appear here": "회원인 공간의 공개 공유된 페이지가 여기에 표시됩니다",
384+
"Share deleted successfully": "공유가 성공적으로 삭제되었습니다",
385+
"Share not found": "공유를 찾을 수 없습니다",
386+
"Failed to share page": "페이지 공유에 실패했습니다"
366387
}

0 commit comments

Comments
 (0)