Merge pull request #859 from linkwarden/dev

Dev

.github/workflows/check-branch.yml

@@ -0,0 +1,18 @@
+name: Check pull request source branch
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - edited
+jobs:
+  check-branches:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check branches
+        run: |
+          if [ ${{ github.head_ref }} != "dev" ] && [ ${{ github.base_ref }} == "main" ]; then
+            echo "Merge requests to main branch are only allowed from dev branch. Please rebase your changes to dev branch."
+            exit 1
+          fi

components/InstallApp.tsx

@@ -8,7 +8,7 @@ const InstallApp = (props: Props) => {
   const [isOpen, setIsOpen] = useState(true);
 
   return isOpen && !isPWA() ? (
-    <div className="fixed left-0 right-0 bottom-10 w-full">
+    <div className="fixed left-0 right-0 bottom-10 w-full px-5">
       <div className="mx-auto w-fit p-2 flex justify-between gap-2 items-center border border-neutral-content rounded-xl bg-base-300 backdrop-blur-md bg-opacity-80 max-w-md">
         <svg
           xmlns="http://www.w3.org/2000/svg"

lib/shared/schemaValidation.ts

@@ -37,7 +37,7 @@ export const PostUserSchema = () => {
     password: z.string().min(8).max(2048).optional(),
     email: emailEnabled
       ? z.string().trim().email().toLowerCase()
-      : z.string().optional(),
+      : z.string().nullish(),
     username: emailEnabled
       ? z.string().optional()
       : z
@@ -59,7 +59,7 @@ export const UpdateUserSchema = () => {
     name: z.string().trim().min(1).max(50).optional(),
     email: emailEnabled
       ? z.string().trim().email().toLowerCase()
-      : z.string().optional(),
+      : z.string().nullish(),
     username: z
       .string()
       .trim()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkwarden",
-  "version": "v2.8.1",
+  "version": "v2.8.3",
   "main": "index.js",
   "repository": "https://github.com/linkwarden/linkwarden.git",
   "author": "Daniel31X13 <daniel31x13@gmail.com>",

pages/settings/account.tsx

@@ -87,7 +87,7 @@ export default function Account() {
 
     const emailSchema = z.string().trim().email().toLowerCase();
     const emailValidation = emailSchema.safeParse(user.email || "");
-    if (!emailValidation.success) {
+    if (emailEnabled && !emailValidation.success) {
       return toast.error(t("email_invalid"));
     }