Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v7.1.7 #9524

Merged
merged 30 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
13dbe2e
ci(deps): bump github/codeql-action from 2 to 3
dependabot[bot] Sep 28, 2024
588eb37
ci(deps): bump docker/metadata-action from 4 to 5
dependabot[bot] Sep 28, 2024
4a5b790
Update admin.json
Lanhild Dec 24, 2024
c7d969b
Update commons.json
Lanhild Dec 24, 2024
85d0f86
Update translation.json
Lanhild Dec 24, 2024
3ec3d3f
Bump version
Dec 26, 2024
455da7f
Merge pull request #9523 from weseek/support/prepare-v7.1.7-RC.0
mergify[bot] Dec 26, 2024
33936c8
support(jsdoc): add swagger document to installer.ts
Dec 26, 2024
2c766ff
support(jsdoc): add swagger document to invited.ts
Dec 26, 2024
7ccaba8
Update Swagger documentation for the PUT endpoint to update a page.
tkfm1991 Dec 26, 2024
c1cee14
ci(deps-dev): bump @marp-team/marp-core from 3.9.0 to 3.9.1
dependabot[bot] Dec 26, 2024
e938555
Merge pull request #9530 from weseek/dependabot/npm_and_yarn/marp-tea…
mergify[bot] Dec 26, 2024
46b693b
Merge pull request #9526 from goofmint/fix/doc-v3-installer
yuki-takei Dec 27, 2024
675b6f1
Merge pull request #9527 from goofmint/fix/doc-v3-invited
yuki-takei Dec 27, 2024
b92a4f1
fix i18n of oidc settings
ryu-sato Dec 30, 2024
fb8e59d
Merge pull request #9536 from weseek/fix/i18n-of-oidc-settings
mergify[bot] Dec 31, 2024
3aae360
ci(deps): bump next from 14.2.15 to 14.2.21
dependabot[bot] Jan 4, 2025
eeabc23
Merge pull request #9538 from weseek/dependabot/npm_and_yarn/next-14.…
mergify[bot] Jan 4, 2025
a92911c
fix: make grantedUsers optional in IPage interface and handle potenti…
miya Jan 8, 2025
b51f27f
nullable
miya Jan 8, 2025
3f4b773
add shared directory to compose configuration
yuki-takei Jan 8, 2025
903e5c6
Revert "nullable"
miya Jan 8, 2025
d43bb39
Revert "fix: make grantedUsers optional in IPage interface and handle…
miya Jan 8, 2025
7606aac
impl convertNullToEmptyGrantedArrays
miya Jan 8, 2025
ac27a76
Add comment
miya Jan 9, 2025
cc7a2bc
Merge pull request #9541 from weseek/fix/159936-unable-to-select-grou…
mergify[bot] Jan 9, 2025
a044312
Merge pull request #9521 from Lanhild/patch-2
yuki-takei Jan 16, 2025
b899f74
Merge pull request #9180 from weseek/dependabot/github_actions/github…
yuki-takei Jan 16, 2025
94c42ca
Merge pull request #9181 from weseek/dependabot/github_actions/docker…
yuki-takei Jan 16, 2025
33cb55a
Merge pull request #9529 from tkfm1991/bugfix
yuki-takei Jan 16, 2025
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 .devcontainer/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ services:
- node_modules:/workspace/growi/node_modules
- buildcache_app:/workspace/growi/apps/app/.next
- ../../growi-docker-compose:/workspace/growi-docker-compose:delegated
- ../../share:/workspace/share:delegated
tty: true

mongo:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -58,7 +58,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -72,4 +72,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
4 changes: 2 additions & 2 deletions .github/workflows/release-rc-scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
id: package-json

- name: Docker meta for docker.io
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
id: meta
with:
images: docker.io/weseek/growi
Expand All @@ -36,7 +36,7 @@ jobs:
type=raw,value=${{ steps.package-json.outputs.packageVersion }}.{{sha}}

- name: Docker meta for ghcr.io
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
id: meta-ghcr
with:
images: ghcr.io/weseek/growi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
id: package-json

- name: Docker meta for docker.io
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
id: meta
with:
images: docker.io/weseek/growi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-slackbot-proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: weseek/growi-slackbot-proxy,asia.gcr.io/${{ secrets.GCP_PRJ_ID_SLACKBOT_PROXY }}/growi-slackbot-proxy
tags: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
id: package-json

- name: Docker meta for docker.io
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
id: meta
with:
images: docker.io/weseek/growi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-app-create-manifests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:
- name: Docker meta for extra-images
id: meta-extra-images
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ inputs.registry }}/${{ inputs.image-name }}
sep-tags: ','
Expand Down
1 change: 1 addition & 0 deletions apps/app/bin/swagger-jsdoc/definition-apiv3.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ module.exports = {
'UserGroups',
'Users Management',
'FullTextSearch Management',
'Install',
],
},
{
Expand Down
4 changes: 2 additions & 2 deletions apps/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@growi/app",
"version": "7.1.6",
"version": "7.1.7-RC.0",
"license": "MIT",
"private": "true",
"scripts": {
Expand Down Expand Up @@ -157,7 +157,7 @@
"multer": "~1.4.0",
"multer-autoreap": "^1.0.3",
"mustache": "^4.2.0",
"next": "^14.2.15",
"next": "^14.2.21",
"next-dynamic-loading-props": "^0.1.1",
"next-i18next": "^15.3.1",
"next-superjson": "^0.0.4",
Expand Down
4 changes: 2 additions & 2 deletions apps/app/public/static/locales/en_US/admin.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@
"id_detail": "Specification of the name of attribute which can identify the user in OIDC claims",
"username_detail": "Specification of mappings for <code>username</code> when creating new users",
"name_detail": "Specification of mappings for <code>name</code> when creating new users",
"mapping_detail": "Specification of mappings for %s when creating new users",
"mapping_detail": "Specification of mappings for {{target}} when creating new users",
"register_1": "Contact to OIDC IdP Administrator",
"register_2": "Register your OIDC App with \"Authorization callback URL\" as <code>%s</code>",
"register_2": "Register your OIDC App with \"Authorization callback URL\" as <code>{{url}}</code>",
"register_3": "Copy and paste your ClientID and Client Secret above",
"updated_oidc": "Succeeded to update OpenID Connect",
"Use discovered URL if empty": "Use discovered URL from \"Issuer Host\" if empty"
Expand Down
204 changes: 102 additions & 102 deletions apps/app/public/static/locales/fr_FR/admin.json

Large diffs are not rendered by default.

46 changes: 16 additions & 30 deletions apps/app/public/static/locales/fr_FR/commons.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"Sign out": "Se déconnecter",
"New": "Nouveau",
"Delete": "Supprimer",

"meta": {
"display_name": "Français"
},
Expand All @@ -28,9 +27,8 @@
"email_is_already_in_use": "La configuration SMTP est déjà faite."
},
"headers": {
"app_settings": "Paramètres de l'application"
"app_settings": "Application"
},

"header_search_box": {
"label": {
"All pages": "Toutes les pages",
Expand All @@ -41,55 +39,48 @@
"This tree": "Enfants de cette arbre"
}
},

"search_method_menu_item": {
"search_in_all": "Rechercher dans tout",
"only_children_of_this_tree": "Enfants de cet arbre",
"exact_mutch": "Correspondance exacte"
},

"share_links": {
"Share Link": "Liens de partage",
"Page Path": "Chemin de la page",
"expire": "Expiration",
"description": "Description"
},

"in_app_notification": {
"notification_list": "Notifications d'application",
"see_all": "Voir tout",
"no_notification": "Vous n'avez pas de notifications.",
"no_notification": "Aucune notification.",
"all": "Toutes",
"unopend": "Non-lues",
"mark_all_as_read": "Tout marquer comme lu",
"no_unread_messages": "aucun message non lu"
},

"personal_dropdown": {
"home": "Accueil",
"settings": "Paramètres",
"color_mode": "Couleur",
"sidebar_mode": "Navigation latérale",
"sidebar_mode_editor": "Navigation latérale dans l'éditeur",
"use_os_settings": "Utiliser les paramètres système",
"feedback": "Avis"
"feedback": "Sondage"
},


"create_page_dropdown": {
"new_page": "Créer nouvelle page",
"open_page_create_modal": "Ouvrir une nouvelle page créer une fenêtre modale",
"new_page": "Nouvelle page",
"open_page_create_modal": "Modale de création de page",
"todays": {
"desc": "Créer le mémo du jour",
"desc": "Mémo du jour",
"memo": "mémo"
},
"template": {
"desc": "Créer/modifier page modèle",
"children": "Modèle page enfant",
"descendants": "Modèle pour descendants"
"desc": "Modèles",
"children": "Modèle pour page enfant",
"descendants": "Modèle pour page adjacentes"
}
},

"copy_to_clipboard": {
"Copy to clipboard": "Copier dans le presse-papier",
"Page path": "Chemin de la page",
Expand All @@ -99,30 +90,27 @@
"Markdown link": "Lien Markdown",
"Append params": "Affixer les paramètres"
},

"crop_image_modal": {
"image_crop": "Recadrage d'image",
"crop": "Recadrer",
"save": "Sauvegarder",
"cancel": "Annuler"
},

"handsontable_modal": {
"title": "Modifier table",
"data_import": "Import de données",
"title": "Tableau",
"data_import": "Importer des données",
"save": "Sauvegarder",
"cancel": "Annuler",
"done": "Terminer",
"done": "Mettre à jour",
"data_import_form": {
"select_data_format": "Sélectionner format de données",
"import_data": "Importer données",
"paste_table_data": "Coller les données de la table",
"parse_error": "Erreur d'analyse",
"select_data_format": "Format",
"import_data": "Données du fichier",
"paste_table_data": "Coller les données de la fichier",
"parse_error": "Erreur lors de l'importation des données",
"cancel": "Annuler",
"import": "Importer"
}
},

"questionnaire_modal": {
"required": "Requis",
"submit": "Soumettre",
Expand All @@ -146,11 +134,9 @@
"successfully_submitted": "Questionnaire soumis.",
"thanks_for_answering": "Merci pour votre avis."
},

"not_found_page": {
"page_not_exist": "Cette page est introuvable."
},

"g2g_data_transfer": {
"tab": "Transfert de données",
"data_transfer": "Transfert de données",
Expand Down
Loading
Loading