Merge pull request #9936 from weseek/master

Release v7.2.4

.devcontainer/app/postCreateCommand.sh

@@ -11,6 +11,9 @@ 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)"

.roo/mcp.json

@@ -0,0 +1,9 @@
+{
+  "mcpServers": {
+    "fetch": {
+      "command": "uvx",
+      "args": ["mcp-server-fetch"],
+      "alwaysAllow": ["fetch"]
+    }
+  }
+}

CHANGELOG.md

@@ -30,7 +30,6 @@
 * 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: User picture tooltip (2) (#9898) @yuki-takei
 * fix: Tooltip for UserPicture doesn't work (#9884) @yuki-takei
 
 ### 🧰 Maintenance

apps/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/app",
-  "version": "7.2.3",
+  "version": "7.2.4-RC.0",
   "license": "MIT",
   "private": "true",
   "scripts": {

apps/app/playwright/20-basic-features/use-tools.spec.ts

@@ -34,9 +34,13 @@ const openPutBackPageModal = async(page: Page): Promise<void> => {
 
   // Scroll to the top of the page to prevent the subnav hide the button
   await page.evaluate(() => {
-    window.scrollTo(0, 0);
+    document.documentElement.scrollTop = 0;
+    document.body.scrollTop = 0; // For Safari and older browsers
   });
 
+  // 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();
 };

apps/app/src/client/components/Admin/Customize/CustomizeLogoSetting.tsx

@@ -125,7 +125,7 @@ const CustomizeLogoSetting = (): JSX.Element => {
                     {isCustomizedLogoUploaded && (
                       <>
                         <p>
-                          <img src={CUSTOMIZED_LOGO} className="picture picture-lg " id="settingBrandLogo" width="64" />
+                          <img src={CUSTOMIZED_LOGO} id="settingBrandLogo" width="64" />
                         </p>
                         <button type="button" className="btn btn-danger" onClick={onClickDeleteBtn}>
                           { t('admin:customize_settings.delete_logo') }

apps/app/src/client/components/Me/ProfileImageSettings.tsx

@@ -11,7 +11,6 @@ import { toastSuccess, toastError } from '~/client/util/toastr';
 import { useCurrentUser } from '~/stores-universal/context';
 import { generateGravatarSrc, GRAVATAR_DEFAULT } from '~/utils/gravatar';
 
-
 const DEFAULT_IMAGE = '/images/icons/user.svg';
 
 
@@ -113,7 +112,7 @@ const ProfileImageSettings = (): JSX.Element => {
               </a>
             </div>
           </h5>
-          <img src={generateGravatarSrc(currentUser.email)} className="rounded-pill" width="64" data-vrt-blackout-profile />
+          <img src={generateGravatarSrc(currentUser.email)} className="rounded-pill" width="64" height="64" data-vrt-blackout-profile />
         </div>
 
         <div className="col-md-7 mt-5 mt-md-0">
@@ -138,7 +137,9 @@ const ProfileImageSettings = (): JSX.Element => {
               { t('Current Image') }
             </label>
             <div className="col-md-6 col-lg-8">
-              <p className="mb-0"><img src={uploadedPictureSrc ?? DEFAULT_IMAGE} className="picture picture-lg rounded-circle" id="settingUserPicture" /></p>
+              <p className="mb-0">
+                <img src={uploadedPictureSrc ?? DEFAULT_IMAGE} width="64" height="64" className="rounded-circle" id="settingUserPicture" />
+              </p>
               {uploadedPictureSrc && <button type="button" className="btn btn-danger mt-2" onClick={deleteImageHandler}>{ t('Delete Image') }</button>}
             </div>
           </div>

apps/app/src/client/components/Sidebar/SidebarBrandLogo.tsx

@@ -12,7 +12,7 @@ export const SidebarBrandLogo = memo((props: SidebarBrandLogoProps) => {
   return isDefaultLogo
     ? <GrowiLogo />
     // eslint-disable-next-line @next/next/no-img-element
-    : (<div><img src="/attachment/brand-logo" alt="custom logo" className="picture picture-lg p-2" id="settingBrandLogo" /></div>);
+    : (<div><img src="/attachment/brand-logo" alt="custom logo" width="48" className="p-1" id="settingBrandLogo" /></div>);
 });
 
 SidebarBrandLogo.displayName = 'SidebarBrandLogo';

apps/slackbot-proxy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growi/slackbot-proxy",
-  "version": "7.2.3-slackbot-proxy.0",
+  "version": "7.2.4-slackbot-proxy.0",
   "license": "MIT",
   "private": "true",
   "scripts": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "growi",
-  "version": "7.2.3",
+  "version": "7.2.4-RC.0",
   "description": "Team collaboration software using markdown",
   "license": "MIT",
   "private": "true",