Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 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: 0 additions & 1 deletion .devcontainer/app/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"vscode": {
"extensions": [
"dbaeumer.vscode-eslint",
"biomejs.biome",
"mhutchie.git-graph",
"eamodio.gitlens",
"github.vscode-pull-request-github",
Expand Down
3 changes: 0 additions & 3 deletions .devcontainer/app/postCreateCommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ mkdir -p /tmp/page-bulk-export
sudo chown -R vscode:vscode /tmp/page-bulk-export
sudo chmod 700 /tmp/page-bulk-export

# Install uv
curl -LsSf https://astral.sh/uv/install.sh | sh

# Setup pnpm
SHELL=bash pnpm setup
eval "$(cat /home/vscode/.bashrc)"
Expand Down
1 change: 0 additions & 1 deletion .devcontainer/pdf-converter/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"vscode": {
"extensions": [
"dbaeumer.vscode-eslint",
"biomejs.biome",
"mhutchie.git-graph",
"eamodio.gitlens"
],
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:

- name: Lint
run: |
turbo run lint --filter=@growi/app --filter=./packages/*
turbo run lint --filter=!@growi/slackbot-proxy

- name: Slack Notification
uses: weseek/ghaction-slack-notification@master
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:

- name: Test
run: |
turbo run test --filter=@growi/app --filter=./packages/* --env-mode=loose
turbo run test --filter=!@growi/slackbot-proxy --env-mode=loose
env:
MONGO_URI: mongodb://localhost:${{ job.services.mongodb.ports['27017'] }}/growi_test

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-slackbot-proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:

- name: Lint
run: |
turbo run lint --filter=@growi/slackbot-proxy --filter=@growi/slack
turbo run lint --filter=@growi/slackbot-proxy

- name: Slack Notification
uses: weseek/ghaction-slack-notification@master
Expand Down
9 changes: 0 additions & 9 deletions .roo/mcp.json

This file was deleted.

4 changes: 0 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,10 @@

"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit",
"source.fixAll.biome": "explicit",
"source.organizeImports.biome": "explicit",
"source.fixAll.markdownlint": "explicit",
"source.fixAll.stylelint": "explicit"
},

"editor.formatOnSave": true,

"githubPullRequests.ignoredPullRequestBranches": [
"master"
],
Expand Down
43 changes: 1 addition & 42 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,50 +1,9 @@
# Changelog

## [Unreleased](https://github.com/weseek/growi/compare/v7.2.4...HEAD)
## [Unreleased](https://github.com/weseek/growi/compare/v7.2.2...HEAD)

*Please do not manually update this file. We've automated the process.*

## [v7.2.4](https://github.com/weseek/growi/compare/v7.2.3...v7.2.4) - 2025-05-15

### 🐛 Bug Fixes

* fix: Picture size (#9938) @yuki-takei

## [v7.2.3](https://github.com/weseek/growi/compare/v7.2.2...v7.2.3) - 2025-05-14

### 💎 Features

* feat(ai): Unified merge view (#9643) @yuki-takei

### 🚀 Improvement

* imprv(ai): AI models and instructions (#9913) @yuki-takei
* imprv(ai): Evaluate article headers (#9921) @yuki-takei
* imprv(ai): Tidy up instructions (#9918) @yuki-takei
* imprv: Disable page bulk export when file upload settings are not configured (#9900) @arafubeatbox
* imprv: add contributors that has not been added to konami command (#9901) @Ryosei-Fukushima
* imprv(ai): AI models and instructions (#9913) @yuki-takei
* imprv: Hide summary mode switch in editor assistant mode (#9897) @miya
* imprv: User picture tooltip (#9892) @yuki-takei
* imprv: User picture tooltip (2) (#9898) @yuki-takei

### 🐛 Bug Fixes

* fix: PagePathHeader maxWidth for editor (#9930) @yuki-takei
* fix: Pages list API (#9928) @yuki-takei
* fix: Set OpenTelemetry resource attribute `service.instance.id` (#9902) @yuki-takei
* fix: User picture tooltip (2) (#9898) @yuki-takei
* fix: ConfigLoader.loadFromDB for JSON parsing error handling (#9890) @yuki-takei
* fix: Profile image upload functionality and accepted file types (#9886) @yuki-takei
* fix: Tooltip for UserPicture doesn't work (#9884) @yuki-takei

### 🧰 Maintenance

* support: Improve the official docker image size (#9874) @yuki-takei
* support: Upgrade openai package (#9909) @yuki-takei
* support(pdf-converter): Improve the official docker image size for pdf-converter (#9880) @yuki-takei
* support: Improve the official docker image size (#9874) @yuki-takei

## [v7.2.2](https://github.com/weseek/growi/compare/v7.2.1...v7.2.2) - 2025-04-17

### 🐛 Bug Fixes
Expand Down
10 changes: 4 additions & 6 deletions apps/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@growi/app",
"version": "7.2.5-RC.0",
"version": "7.2.3-RC.0",
"license": "MIT",
"private": "true",
"scripts": {
Expand Down Expand Up @@ -64,7 +64,7 @@
"@aws-sdk/client-s3": "3.454.0",
"@aws-sdk/s3-request-presigner": "3.454.0",
"@azure/identity": "^4.4.1",
"@azure/openai": "^2.0.0",
"@azure/openai": "^2.0.0-beta.2",
"@azure/storage-blob": "^12.16.0",
"@browser-bunyan/console-formatted-stream": "^1.8.0",
"@cspell/dynamic-import": "^8.15.4",
Expand Down Expand Up @@ -145,7 +145,6 @@
"is-iso-date": "^0.0.1",
"js-tiktoken": "^1.0.15",
"js-yaml": "^4.1.0",
"jsonrepair": "^3.12.0",
"katex": "^0.16.21",
"ldapjs": "^3.0.2",
"lucene-query-parser": "^1.2.0",
Expand Down Expand Up @@ -177,7 +176,7 @@
"node-cron": "^3.0.2",
"nodemailer": "^6.9.15",
"nodemailer-ses-transport": "~1.5.0",
"openai": "^4.96.2",
"openai": "^4.56.0",
"openid-client": "^5.4.0",
"p-retry": "^4.0.0",
"passport": "^0.6.0",
Expand Down Expand Up @@ -247,8 +246,7 @@
"xss": "^1.0.15",
"y-mongodb-provider": "^0.2.0",
"y-socket.io": "^1.1.3",
"yjs": "^13.6.18",
"zod": "^3.24.2"
"yjs": "^13.6.18"
},
"// comments for defDependencies": {
"bootstrap": "v5.3.3 has a bug. refs: https://github.com/twbs/bootstrap/issues/39798",
Expand Down
6 changes: 1 addition & 5 deletions apps/app/playwright/20-basic-features/use-tools.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,9 @@ const openPutBackPageModal = async(page: Page): Promise<void> => {

// Scroll to the top of the page to prevent the subnav hide the button
await page.evaluate(() => {
document.documentElement.scrollTop = 0;
document.body.scrollTop = 0; // For Safari and older browsers
window.scrollTo(0, 0);
});

// Add a small delay to ensure scrolling is complete and the button is interactive
await page.waitForTimeout(200); // Increased delay

await button.click();
await expect(page.getByTestId('put-back-page-modal')).toBeVisible();
};
Expand Down
30 changes: 5 additions & 25 deletions apps/app/public/static/locales/en_US/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@
"In-App Notification": "Notifications",
"AI Assistant": "AI Assistant",
"Knowledge Assistant": "Knowledge Assistant (Beta)",
"Editor Assistant": "Editor Assistant (Beta)",
"original_path": "Original path",
"new_path": "New path",
"duplicated_path": "Duplicated path",
Expand Down Expand Up @@ -345,7 +344,6 @@
"file": "File only"
},
"editor_config": "Editor Config",
"editor_assistant": "Editor Assistant",
"Show active line": "Show active line",
"auto_format_table": "Auto format table",
"overwrite_scopes": "{{operation}} and Overwrite scopes of all descendants",
Expand Down Expand Up @@ -495,36 +493,19 @@
"latest_revision": "theirs",
"selected_editable_revision": "Selected Page Body (Editable)"
},
"sidebar_ai_assistant": {
"sidebar_aichat": {
"instruction_label": "Assistant instructions",
"reference_pages_label": "Reference pages",
"placeholder": "Ask me anything.",
"knowledge_assistant_placeholder": "Ask me anything.",
"editor_assistant_placeholder": "Can I help you with anything?",
"summary_mode_label": "Summary mode",
"summary_mode_help": "Concise answer within 2-3 sentences",
"extended_thinking_mode_label": "Extended Thinking Mode",
"extended_thinking_mode_help": "When enabled, the AI will take more time to think and provide a more comprehensive answer.",
"caution_against_hallucination": "Please verify the information and check the sources.",
"progress_label": "Generating answers",
"failed_to_create_or_retrieve_thread": "Failed to create or retrieve thread",
"budget_exceeded": "You have reached your usage limit for OpenAI's API. To use the Knowledge Assistant again, please add credits from the OpenAI billing page.",
"budget_exceeded_for_growi_cloud": "You have reached your OpenAI API usage limit. To use the Knowledge Assistant again, please add credits from the GROWI.cloud admin page for Hosted users or from the OpenAI billing page for Owned users.",
"error_message": "An error has occurred",
"show_error_detail": "Show error details",
"discard": "Discard",
"accept": "Accept",
"use_assistant": "Use Assistant",
"remove_assistant": "Deselect the selected assistant",
"preset_menu": {
"summarize": {
"title": "Summarize this article",
"prompt": "Please summarize the markdown content"
},
"correct": {
"title": "Correct errors in the text",
"prompt": "Please correct the errors in the markdown text"
}
}
"show_error_detail": "Show error details"
},
"modal_ai_assistant": {
"header": {
Expand All @@ -550,7 +531,7 @@
"update_failed": "Failed to update assistant"
},
"edit_page_description": "Edit pages that the assistant can reference.<br> The assistant can reference up to {{limitLearnablePageCountPerAssistant}} pages including child pages.",
"default_instruction": "You are the knowledge assistant for this Wiki.\n\n## Multilingual Support:\nRespond in the same language the user uses in their input.\n",
"default_instruction": "You are the knowledge assistant for this Wiki. Please provide support according to the following guidelines:\n\n- Analyze document relevance and connect information\n- Suggest new perspectives\n- Provide accurate information based on understanding the intent of questions\nI will provide information in a structured format when necessary.",
"add_page_button": "Add page",
"page_mode_title": {
"share": "Assistant Sharing",
Expand Down Expand Up @@ -786,8 +767,7 @@
"export_cancel_warning": "The following export in progress will be canceled",
"restart": "Restart",
"format": "Format",
"started_on": "Started on",
"file_upload_not_configured": "File upload settings are not configured"
"started_on": "Started on"
},
"message": {
"successfully_connected": "Successfully Connected!",
Expand Down
31 changes: 6 additions & 25 deletions apps/app/public/static/locales/fr_FR/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@
"In-App Notification": "Notifications",
"AI Assistant": "Assistant IA",
"Knowledge Assistant": "Assistant de Connaissances (Bêta)",
"Editor Assistant": "Assistante de rédaction (Bêta)",
"original_path": "Chemin originel",
"new_path": "Nouveau chemin",
"duplicated_path": "Chemin dupliqué",
Expand Down Expand Up @@ -346,7 +345,6 @@
"file": "Fichier seulement"
},
"editor_config": "Préférences de l'éditeur",
"editor_assistant": "Assistant d'édition",
"Show active line": "Surligner la ligne active",
"auto_format_table": "Formatter les tableaux",
"overwrite_scopes": "{{operation}} et écraser les scopes des pages enfants",
Expand Down Expand Up @@ -490,35 +488,19 @@
"latest_revision": "les autres",
"selected_editable_revision": "Corps de page sélectionné (Modifiable)"
},
"sidebar_ai_assistant": {
"sidebar_aichat": {
"instruction_label": "Instructions pour l'assistant",
"reference_pages_label": "Pages de référence",
"knowledge_assistant_placeholder": "Demandez-moi n'importe quoi.",
"editor_assistant_placeholder": "Puis-je vous aider ?",
"placeholder": "Demandez-moi n'importe quoi.",
"summary_mode_label": "Mode résumé",
"summary_mode_help": "Réponse concise en 2-3 phrases",
"extended_thinking_mode_label": "Mode réflexion approfondie",
"extended_thinking_mode_help": "Lorsqu'activé, l'IA prendra plus de temps pour réfléchir et fournir une réponse plus complète.",
"caution_against_hallucination": "Veuillez vérifier les informations et consulter les sources.",
"progress_label": "Génération des réponses",
"failed_to_create_or_retrieve_thread": "Échec de la création ou de la récupération du fil de discussion",
"budget_exceeded": "Vous avez atteint votre limite d'utilisation de l'API de l'OpenAI. Pour utiliser à nouveau l'assistant de connaissance, veuillez ajouter des crédits à partir de la page de facturation d'OpenAI.",
"budget_exceeded_for_growi_cloud": "Vous avez atteint votre limite d'utilisation de l'API de l'OpenAI. Pour utiliser à nouveau l'assistant de connaissance, veuillez ajouter des crédits à partir de la page d'administration de GROWI.cloud pour les utilisateurs hébergés ou à partir de la page de facturation de l'OpenAI pour les utilisateurs propriétaires.",
"error_message": "Erreur",
"show_error_detail": "Détails de l'exposition",
"discard": "Annuler",
"accept": "Accepter",
"use_assistant": "Utiliser l'assistant",
"remove_assistant": "Désélectionner l'assistant sélectionné",
"preset_menu": {
"summarize": {
"title": "Résumer cet article'",
"prompt": "Veuillez résumer le contenu markdown"
},
"correct": {
"title": "Corriger les erreurs du texte",
"prompt": "Veuillez corriger les erreurs dans le texte markdown"
}
}
"show_error_detail": "Détails de l'exposition"
},
"modal_ai_assistant": {
"header": {
Expand All @@ -544,7 +526,7 @@
"update_failed": "Échec de la mise à jour de l'assistant"
},
"edit_page_description": "Modifier les pages que l'assistant peut référencer.<br> L'assistant peut référencer jusqu'à {{limitLearnablePageCountPerAssistant}} pages, y compris les pages enfants.",
"default_instruction": "Vous êtes l'assistant de connaissances pour ce Wiki.\n\n## Support multilingue :\nRépondez dans la même langue que celle utilisée par l'utilisateur dans sa requête.\n",
"default_instruction": "Vous êtes l'assistant de connaissances pour ce Wiki. Veuillez fournir un support selon les directives suivantes :\n\n- Analyser la pertinence des documents et relier les informations\n- Proposer de nouvelles perspectives\n- Fournir des informations précises en comprenant l'intention des questions\nJe fournirai les informations sous forme structurée si nécessaire.",
"add_page_button": "Ajouter une page",
"page_mode_title": {
"share": "Partage de l'assistant",
Expand Down Expand Up @@ -780,8 +762,7 @@
"export_cancel_warning": "Les exportations suivantes en cours seront annulées",
"restart": "Redémarrage",
"format": "Format",
"started_on": "Commencé le",
"file_upload_not_configured": "Les paramètres de téléchargement de fichiers ne sont pas configurés"
"started_on": "Commencé le"
},
"message": {
"successfully_connected": "Connecté!",
Expand Down
Loading
Loading