Merge remote-tracking branch 'origin/main' into Merged-Downstream

# Conflicts:
#	apps/client/src/features/auth/hooks/use-auth.ts
#	apps/client/src/features/editor/extensions/extensions.ts

.env.example

@@ -7,6 +7,18 @@ APP_SECRET=REPLACE_WITH_LONG_SECRET
 
 JWT_TOKEN_EXPIRES_IN=30d
 
+# Use NTLM for user authentication, exposes to browser
+VITE_NTLM_AUTH=false
+
+# LDAP settings for NTLM authentication
+LDAP_BASEDN=
+LDAP_DOMAINSUFFIX=
+LDAP_USERNAME=
+LDAP_PASSWORD=
+# User object attributes for docmost
+LDAP_NAMEATTRIBUTE=
+LDAP_MAILATTRIBUTE=
+
 DATABASE_URL="postgresql://postgres:password@localhost:5432/docmost?schema=public"
 REDIS_URL=redis://127.0.0.1:6379
 

.gitignore

@@ -39,4 +39,3 @@ lerna-debug.log*
 .nx
 .nx/installation
 .nx/cache
-apps/client/dev-dist

apps/client/package.json

@@ -67,7 +67,6 @@
     "postcss-simple-vars": "^7.0.1",
     "prettier": "^3.3.3",
     "typescript": "^5.5.4",
-    "vite": "^5.4.2",
-    "vite-plugin-pwa": "^0.20.5"
+    "vite": "^5.4.2"
   }
 }

apps/client/public/favicon.svg

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   version="1.1"
-   id="svg1"
-   width="160"
-   height="160"
-   viewBox="0 0 160 160"
-   sodipodi:docname="favicon.svg"
-   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="4.6132813"
-     inkscape:cx="65.896698"
-     inkscape:cy="68.931414"
-     inkscape:window-width="1692"
-     inkscape:window-height="1336"
-     inkscape:window-x="9"
-     inkscape:window-y="16"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg1" />
-  <defs
-     id="defs1" />
-  <rect
-     style="fill:#000000;stroke-width:4.06166"
-     id="rect2"
-     width="160"
-     height="160"
-     x="0"
-     y="0" />
-  <g
-     id="g1"
-     transform="matrix(6.2337886,0,0,6.2337886,-16.63421,-20.147723)">
-    <path
-       style="white-space:pre;inline-size:9.70132;fill:#f9f9f9"
-       d="m 22.199219,8.5169334 q 0,1.1894532 -0.521485,2.1562496 -0.515625,0.966797 -1.376953,1.5 -0.597656,0.369141 -1.335937,0.533204 -0.732422,0.164062 -1.933594,0.164062 H 14.828125 V 4.1458397 h 2.179687 q 1.277344,0 2.027344,0.1875 0.75586,0.1816406 1.277344,0.5039062 0.890625,0.5566407 1.388672,1.4824219 0.498047,0.9257813 0.498047,2.1972656 z m -1.212891,-0.017578 q 0,-1.0253906 -0.357422,-1.7285156 Q 20.271484,6.0677147 19.5625,5.6634178 19.046875,5.3704491 18.466797,5.2591209 17.886719,5.1419334 17.078125,5.1419334 h -1.089844 v 6.7324216 h 1.089844 q 0.837891,0 1.458984,-0.123047 0.626953,-0.123046 1.148438,-0.457031 0.65039,-0.416015 0.972656,-1.095703 0.328125,-0.6796874 0.328125,-1.6992186 z"
-       id="text1"
-       transform="matrix(2.3711247,0,0,2.3199061,-27.999288,-3.8192824)"
-       aria-label="D" />
-  </g>
-</svg>

apps/client/public/icons.json

@@ -1,452 +0,0 @@
-{
-  "icons": [
-    {
-      "src": "windows11/SmallTile.scale-100.png",
-      "sizes": "71x71"
-    },
-    {
-      "src": "windows11/SmallTile.scale-125.png",
-      "sizes": "89x89"
-    },
-    {
-      "src": "windows11/SmallTile.scale-150.png",
-      "sizes": "107x107"
-    },
-    {
-      "src": "windows11/SmallTile.scale-200.png",
-      "sizes": "142x142"
-    },
-    {
-      "src": "windows11/SmallTile.scale-400.png",
-      "sizes": "284x284"
-    },
-    {
-      "src": "windows11/Square150x150Logo.scale-100.png",
-      "sizes": "150x150"
-    },
-    {
-      "src": "windows11/Square150x150Logo.scale-125.png",
-      "sizes": "188x188"
-    },
-    {
-      "src": "windows11/Square150x150Logo.scale-150.png",
-      "sizes": "225x225"
-    },
-    {
-      "src": "windows11/Square150x150Logo.scale-200.png",
-      "sizes": "300x300"
-    },
-    {
-      "src": "windows11/Square150x150Logo.scale-400.png",
-      "sizes": "600x600"
-    },
-    {
-      "src": "windows11/Wide310x150Logo.scale-100.png",
-      "sizes": "310x150"
-    },
-    {
-      "src": "windows11/Wide310x150Logo.scale-125.png",
-      "sizes": "388x188"
-    },
-    {
-      "src": "windows11/Wide310x150Logo.scale-150.png",
-      "sizes": "465x225"
-    },
-    {
-      "src": "windows11/Wide310x150Logo.scale-200.png",
-      "sizes": "620x300"
-    },
-    {
-      "src": "windows11/Wide310x150Logo.scale-400.png",
-      "sizes": "1240x600"
-    },
-    {
-      "src": "windows11/LargeTile.scale-100.png",
-      "sizes": "310x310"
-    },
-    {
-      "src": "windows11/LargeTile.scale-125.png",
-      "sizes": "388x388"
-    },
-    {
-      "src": "windows11/LargeTile.scale-150.png",
-      "sizes": "465x465"
-    },
-    {
-      "src": "windows11/LargeTile.scale-200.png",
-      "sizes": "620x620"
-    },
-    {
-      "src": "windows11/LargeTile.scale-400.png",
-      "sizes": "1240x1240"
-    },
-    {
-      "src": "windows11/Square44x44Logo.scale-100.png",
-      "sizes": "44x44"
-    },
-    {
-      "src": "windows11/Square44x44Logo.scale-125.png",
-      "sizes": "55x55"
-    },
-    {
-      "src": "windows11/Square44x44Logo.scale-150.png",
-      "sizes": "66x66"
-    },
-    {
-      "src": "windows11/Square44x44Logo.scale-200.png",
-      "sizes": "88x88"
-    },
-    {
-      "src": "windows11/Square44x44Logo.scale-400.png",
-      "sizes": "176x176"
-    },
-    {
-      "src": "windows11/StoreLogo.scale-100.png",
-      "sizes": "50x50"
-    },
-    {
-      "src": "windows11/StoreLogo.scale-125.png",
-      "sizes": "63x63"
-    },
-    {
-      "src": "windows11/StoreLogo.scale-150.png",
-      "sizes": "75x75"
-    },
-    {
-      "src": "windows11/StoreLogo.scale-200.png",
-      "sizes": "100x100"
-    },
-    {
-      "src": "windows11/StoreLogo.scale-400.png",
-      "sizes": "200x200"
-    },
-    {
-      "src": "windows11/SplashScreen.scale-100.png",
-      "sizes": "620x300"
-    },
-    {
-      "src": "windows11/SplashScreen.scale-125.png",
-      "sizes": "775x375"
-    },
-    {
-      "src": "windows11/SplashScreen.scale-150.png",
-      "sizes": "930x450"
-    },
-    {
-      "src": "windows11/SplashScreen.scale-200.png",
-      "sizes": "1240x600"
-    },
-    {
-      "src": "windows11/SplashScreen.scale-400.png",
-      "sizes": "2480x1200"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-16.png",
-      "sizes": "16x16"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-20.png",
-      "sizes": "20x20"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-24.png",
-      "sizes": "24x24"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-30.png",
-      "sizes": "30x30"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-32.png",
-      "sizes": "32x32"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-36.png",
-      "sizes": "36x36"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-40.png",
-      "sizes": "40x40"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-44.png",
-      "sizes": "44x44"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-48.png",
-      "sizes": "48x48"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-60.png",
-      "sizes": "60x60"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-64.png",
-      "sizes": "64x64"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-72.png",
-      "sizes": "72x72"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-80.png",
-      "sizes": "80x80"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-96.png",
-      "sizes": "96x96"
-    },
-    {
-      "src": "windows11/Square44x44Logo.targetsize-256.png",
-      "sizes": "256x256"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-16.png",
-      "sizes": "16x16"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-20.png",
-      "sizes": "20x20"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-24.png",
-      "sizes": "24x24"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-30.png",
-      "sizes": "30x30"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-32.png",
-      "sizes": "32x32"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-36.png",
-      "sizes": "36x36"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-40.png",
-      "sizes": "40x40"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-44.png",
-      "sizes": "44x44"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-48.png",
-      "sizes": "48x48"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-60.png",
-      "sizes": "60x60"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-64.png",
-      "sizes": "64x64"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-72.png",
-      "sizes": "72x72"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-80.png",
-      "sizes": "80x80"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-96.png",
-      "sizes": "96x96"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-unplated_targetsize-256.png",
-      "sizes": "256x256"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-16.png",
-      "sizes": "16x16"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-20.png",
-      "sizes": "20x20"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-24.png",
-      "sizes": "24x24"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-30.png",
-      "sizes": "30x30"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-32.png",
-      "sizes": "32x32"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-36.png",
-      "sizes": "36x36"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-40.png",
-      "sizes": "40x40"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-44.png",
-      "sizes": "44x44"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-48.png",
-      "sizes": "48x48"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-60.png",
-      "sizes": "60x60"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-64.png",
-      "sizes": "64x64"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-72.png",
-      "sizes": "72x72"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-80.png",
-      "sizes": "80x80"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-96.png",
-      "sizes": "96x96"
-    },
-    {
-      "src": "windows11/Square44x44Logo.altform-lightunplated_targetsize-256.png",
-      "sizes": "256x256"
-    },
-    {
-      "src": "android/android-launchericon-512-512.png",
-      "sizes": "512x512"
-    },
-    {
-      "src": "android/android-launchericon-192-192.png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "android/android-launchericon-144-144.png",
-      "sizes": "144x144"
-    },
-    {
-      "src": "android/android-launchericon-96-96.png",
-      "sizes": "96x96"
-    },
-    {
-      "src": "android/android-launchericon-72-72.png",
-      "sizes": "72x72"
-    },
-    {
-      "src": "android/android-launchericon-48-48.png",
-      "sizes": "48x48"
-    },
-    {
-      "src": "ios/16.png",
-      "sizes": "16x16"
-    },
-    {
-      "src": "ios/20.png",
-      "sizes": "20x20"
-    },
-    {
-      "src": "ios/29.png",
-      "sizes": "29x29"
-    },
-    {
-      "src": "ios/32.png",
-      "sizes": "32x32"
-    },
-    {
-      "src": "ios/40.png",
-      "sizes": "40x40"
-    },
-    {
-      "src": "ios/50.png",
-      "sizes": "50x50"
-    },
-    {
-      "src": "ios/57.png",
-      "sizes": "57x57"
-    },
-    {
-      "src": "ios/58.png",
-      "sizes": "58x58"
-    },
-    {
-      "src": "ios/60.png",
-      "sizes": "60x60"
-    },
-    {
-      "src": "ios/64.png",
-      "sizes": "64x64"
-    },
-    {
-      "src": "ios/72.png",
-      "sizes": "72x72"
-    },
-    {
-      "src": "ios/76.png",
-      "sizes": "76x76"
-    },
-    {
-      "src": "ios/80.png",
-      "sizes": "80x80"
-    },
-    {
-      "src": "ios/87.png",
-      "sizes": "87x87"
-    },
-    {
-      "src": "ios/100.png",
-      "sizes": "100x100"
-    },
-    {
-      "src": "ios/114.png",
-      "sizes": "114x114"
-    },
-    {
-      "src": "ios/120.png",
-      "sizes": "120x120"
-    },
-    {
-      "src": "ios/128.png",
-      "sizes": "128x128"
-    },
-    {
-      "src": "ios/144.png",
-      "sizes": "144x144"
-    },
-    {
-      "src": "ios/152.png",
-      "sizes": "152x152"
-    },
-    {
-      "src": "ios/167.png",
-      "sizes": "167x167"
-    },
-    {
-      "src": "ios/180.png",
-      "sizes": "180x180"
-    },
-    {
-      "src": "ios/192.png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "ios/256.png",
-      "sizes": "256x256"
-    },
-    {
-      "src": "ios/512.png",
-      "sizes": "512x512"
-    },
-    {
-      "src": "ios/1024.png",
-      "sizes": "1024x1024"
-    }
-  ]
-}