Merge pull request #6072 from appwrite/1.4.x

1.4 Fixes
appwrite · Aug 31, 2023 · aced75f · aced75f
2 parents 6a8b831 + 458dd8c
commit aced75f
Show file tree

Hide file tree

Showing 93 changed files with 356 additions and 211 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "app/console"]
 	path = app/console
 	url = https://github.com/appwrite/console
-	branch = 3.0.1
+	branch = 3.0.2
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,19 @@
+# Version 1.4.1
+
+## Features
+
+- Add upgrade task [#6068](https://github.com/appwrite/appwrite/pull/6068)
+
+## Fixes
+
+- Fix VCS/migration/assistant scopes [#6071](https://github.com/appwrite/appwrite/pull/6071)
+- Add missing parameters required for custom email templates [#6077](https://github.com/appwrite/appwrite/pull/6077)
+- Fix `Call to a member function label() on null` error when using a custom domain [#6079](https://github.com/appwrite/appwrite/pull/6079)
+
+## Changes
+
+- Update console to 3.0.2 [#6071](https://github.com/appwrite/appwrite/pull/6071)
+
 # Version 1.4.0
 
 ## Features

diff --git a/Dockerfile b/Dockerfile
@@ -167,6 +167,7 @@ RUN chmod +x /usr/local/bin/doctor && \
     chmod +x /usr/local/bin/maintenance &&  \
     chmod +x /usr/local/bin/usage && \
     chmod +x /usr/local/bin/install && \
+    chmod +x /usr/local/bin/upgrade && \
     chmod +x /usr/local/bin/migrate && \
     chmod +x /usr/local/bin/realtime && \
     chmod +x /usr/local/bin/schedule && \

diff --git a/README-CN.md b/README-CN.md
@@ -66,7 +66,7 @@ docker run -it --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:1.4.0
+    appwrite/appwrite:1.4.1
 ```
 
 ### Windows
@@ -78,7 +78,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:1.4.0
+    appwrite/appwrite:1.4.1
 ```
 
 #### PowerShell
@@ -88,7 +88,7 @@ docker run -it --rm `
     --volume /var/run/docker.sock:/var/run/docker.sock `
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
     --entrypoint="install" `
-    appwrite/appwrite:1.4.0
+    appwrite/appwrite:1.4.1
 ```
 
 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。

diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ docker run -it --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:1.4.0
+    appwrite/appwrite:1.4.1
 ```
 
 ### Windows
@@ -87,7 +87,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:1.4.0
+    appwrite/appwrite:1.4.1
 ```
 
 #### PowerShell
@@ -97,7 +97,7 @@ docker run -it --rm `
     --volume /var/run/docker.sock:/var/run/docker.sock `
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
     --entrypoint="install" `
-    appwrite/appwrite:1.4.0
+    appwrite/appwrite:1.4.1
 ```
 
 Once the Docker installation is complete, go to http://localhost to access the Appwrite console from your browser. Please note that on non-Linux native hosts, the server might take a few minutes to start after completing the installation.

diff --git a/app/config/locale/templates/email-base.tpl b/app/config/locale/templates/email-base.tpl
@@ -51,7 +51,7 @@
 
 <body style="direction: {{direction}}">
 
-<div style="max-width:650px; word-wrap: break-wrod; overflow-wrap: break-word;
+<div style="max-width:650px; word-wrap: break-word; overflow-wrap: break-word;
   word-break: break-all; margin:0 auto;">
     <table style="margin-top: 32px">
         <tr>

diff --git a/app/config/locale/translations/af.json b/app/config/locale/translations/af.json
@@ -4,7 +4,7 @@
     "settings.direction": "ltr",
     "emails.sender": "%s span",
     "emails.verification.subject": "Rekening Bevestiging",
-    "emails.verification.hello": "Goeie dag {{name}}",
+    "emails.verification.hello": "Goeie dag {{user}}",
     "emails.verification.body": "Volg hierdie skakel om u e-pos adres te bevestig.",
     "emails.verification.footer": "Ignoreer gerus hierdie boodskap as u nie die versoek gestuur het om u adres te bevestig nie.",
     "emails.verification.thanks": "Baie dankie",
@@ -16,7 +16,7 @@
     "emails.magicSession.thanks": "Baie dankie",
     "emails.magicSession.signature": "Die {{project}} span",
     "emails.recovery.subject": "Herstel Wagwoord",
-    "emails.recovery.hello": "Goeie dag {{name}}",
+    "emails.recovery.hello": "Goeie dag {{user}}",
     "emails.recovery.body": "Volg hierdie skakel om u {{project}} wagwoord te herstel.",
     "emails.recovery.footer": "Ignoreer gerus hierdie boodskap as u nie die versoek gestuur het om u wagwoord te herstel nie.",
     "emails.recovery.thanks": "Baie dankie",

diff --git a/app/config/locale/translations/ar.json b/app/config/locale/translations/ar.json
@@ -4,7 +4,7 @@
     "settings.direction": "rtl",
     "emails.sender": "فريق %s",
     "emails.verification.subject": "تأكيد الحساب",
-    "emails.verification.hello": "مرحبا {{name}}",
+    "emails.verification.hello": "مرحبا {{user}}",
     "emails.verification.body": "برجاء اتباع الرابط التالي لتأكيد بريدك الإلكتروني",
     "emails.verification.footer": "لو لم تطلب تأكيد هذا البريد الإلكتروني، يمكنك تجاهل هذه الرسالة",
     "emails.verification.thanks": "شكرا",
@@ -16,7 +16,7 @@
     "emails.magicSession.thanks": "شكرا",
     "emails.magicSession.signature": "فريق {{project}}",
     "emails.recovery.subject": "تغيير كلمة السر",
-    "emails.recovery.hello": "أهلا {{name}}",
+    "emails.recovery.hello": "أهلا {{user}}",
     "emails.recovery.body": "برجاء اتباع الراط التالي لتغيير كلمة السر الخاصة بـ{{project}}",
     "emails.recovery.footer": "لولم تطلب تغيير كلمة السر، يمكنك تجاهل هذه الرسالة",
     "emails.recovery.thanks": "شكرا",

diff --git a/app/config/locale/translations/as.json b/app/config/locale/translations/as.json
@@ -4,7 +4,7 @@
     "settings.direction": "ltr",
     "emails.sender": "%s দল",
     "emails.verification.subject": "একাউণ্ট প্ৰমাণীকৰণ",
-    "emails.verification.hello": "নমস্কাৰ {{name}}",
+    "emails.verification.hello": "নমস্কাৰ {{user}}",
     "emails.verification.body": "আপোনাৰ ইমেইল ঠিকনা প্ৰমাণিত কৰিবলৈ এই লিংকটো অনুসৰণ কৰক।",
     "emails.verification.footer": "যদি আপুনি এই ঠিকনাটো সত্যাপিত কৰিবলৈ কোৱা নাই, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
     "emails.verification.thanks": "ধন্যবাদ",
@@ -16,7 +16,7 @@
     "emails.magicSession.thanks": "ধন্যবাদ",
     "emails.magicSession.signature": "{{project}} দল",
     "emails.recovery.subject": "পাছৱাৰ্ড ৰিছেট",
-    "emails.recovery.hello": "ধন্যবাদ {{name}}",
+    "emails.recovery.hello": "ধন্যবাদ {{user}}",
     "emails.recovery.body": "আপোনাৰ {{project}} পাছৱৰ্ড ৰিছেট কৰিবলৈ এই লিংকটো অনুসৰণ কৰক।.",
     "emails.recovery.footer": "যদি আপুনি আপোনাৰ পাছৱৰ্ড ৰিছেট কৰিবলৈ কোৱা নাছিল, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
     "emails.recovery.thanks": "ধন্যবাদ",

diff --git a/app/config/locale/translations/az.json b/app/config/locale/translations/az.json
@@ -4,7 +4,7 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Komandası",
     "emails.verification.subject": "Hesab Doğrulama",
-    "emails.verification.hello": "Salam {{name}}",
+    "emails.verification.hello": "Salam {{user}}",
     "emails.verification.body": "E-poçt ünvanınızı təsdiq etmək üçün bu linki izləyin.",
     "emails.verification.footer": "Bu ünvanı doğrulamağı xahiş etməmisinizsə, bu mesajı gözardı edə bilərsiniz.",
     "emails.verification.thanks": "Təşəkkürlər",
@@ -16,7 +16,7 @@
     "emails.magicSession.thanks": "Təşəkkürlər",
     "emails.magicSession.signature": "{{project}} komandası",
     "emails.recovery.subject": "Şifrə Sıfırlanması",
-    "emails.recovery.hello": "Salam {{name}}",
+    "emails.recovery.hello": "Salam {{user}}",
     "emails.recovery.body": "{{project}} şifrənizi sıfırlamaq üçün bu linki izləyin.",
     "emails.recovery.footer": "Şifrənizi sıfırlamağı xahiş etməmisinizsə, bu mesajı gözardı edə bilərsiniz.",
     "emails.recovery.thanks": "Təşəkkürlər",

diff --git a/app/config/locale/translations/be.json b/app/config/locale/translations/be.json
@@ -4,7 +4,7 @@
     "settings.direction": "ltr",
     "emails.sender": "Каманда %s",
     "emails.verification.subject": "Верыфікацыя акаўнта",
-    "emails.verification.hello": "Прывітанне {{name}}",
+    "emails.verification.hello": "Прывітанне {{user}}",
     "emails.verification.body": "Перайдзіце па гэтай спасылцы, каб пацвердзіць свой адрас электроннай пошты",
     "emails.verification.footer": "Калі вы не запытвалі пацвярджэнне гэтага адрасу, праігнаруйце гэтае паведамленне.",
     "emails.verification.thanks": "Дзякуем",
@@ -16,7 +16,7 @@
     "emails.magicSession.thanks": "Дзякуем",
     "emails.magicSession.signature": "каманда {{project}}",
     "emails.recovery.subject": "Скід пароля",
-    "emails.recovery.hello": "Прывітанне, {{name}}",
+    "emails.recovery.hello": "Прывітанне, {{user}}",
     "emails.recovery.body": "Перайдзіце па гэтай спасылцы, каб скінуць пароль для праекта {{project}}.",
     "emails.recovery.footer": "Калі вы не прасілі скінуць пароль, вы можаце праігнараваць гэта паведамленне.",
     "emails.recovery.thanks": "Дзякуем",

diff --git a/app/config/locale/translations/bh.json b/app/config/locale/translations/bh.json
@@ -4,7 +4,7 @@
     "settings.direction": "ltr",
     "emails.sender": "%s टीम",
     "emails.verification.subject": "खाता प्रमाणिकरण",
-    "emails.verification.hello": "नमस्ते {{name}}",
+    "emails.verification.hello": "नमस्ते {{user}}",
     "emails.verification.body": "ईमेल प्रमाणिकरण करे क लेल दिहल गइल लिंक फॉलो करें|",
     "emails.verification.footer": "अगर ई पता को सत्यापित करे के लिए ना कहाले, तो आप ई संदेश क अनदेखा कर सकत अछि।",
     "emails.verification.thanks": "धन्यवाद",
@@ -16,7 +16,7 @@
     "emails.magicSession.thanks": "धन्यवाद",
     "emails.magicSession.signature": "{{project}} टीम",
     "emails.recovery.subject": "पासवर्ड बदल क लेल|",
-    "emails.recovery.hello": "प्रणाम {{name}}",
+    "emails.recovery.hello": "प्रणाम {{user}}",
     "emails.recovery.body": "पासवर्ड बदल क लेल दिहल गइल लिंक फॉलो करें|",
     "emails.recovery.footer": "अगर पासवर्ड बदल क लेल ना कहाले, तो आप ई संदेश क अनदेखा कर सकत अछि।",
     "emails.recovery.thanks": "धन्यवाद",

diff --git a/app/config/locale/translations/bn.json b/app/config/locale/translations/bn.json
@@ -4,7 +4,7 @@
     "settings.direction": "ltr",
     "emails.sender": "%s টীম",
     "emails.verification.subject": "বিষয়",
-    "emails.verification.hello": "নমস্কার {{name}}",
+    "emails.verification.hello": "নমস্কার {{user}}",
     "emails.verification.body": "এই লিঙ্কের মাধ্যমে ইমেইল যাচাই করুন।",
     "emails.verification.footer": "আপনি যদি এই ঠিকানা যাচাই করতে না বলেন, তাহলে আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
     "emails.verification.thanks": "ধন্যবাদ",
@@ -16,7 +16,7 @@
     "emails.magicSession.thanks": "ধন্যবাদ",
     "emails.magicSession.signature": "{{project}} টীম",
     "emails.recovery.subject": "পাসওয়ার্ড রিসেট",
-    "emails.recovery.hello": "নমস্কার {{name}}",
+    "emails.recovery.hello": "নমস্কার {{user}}",
     "emails.recovery.body": "এই লিঙ্কের মাধ্যমে আপনার {{project}} পাসওয়ার্ড পুনরায় সেট করুন।",
     "emails.recovery.footer": "আপনি যদি আপনার পাসওয়ার্ড পুনরায় সেট করতে না বলেন, তাহলে আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
     "emails.recovery.thanks": "ধন্যবাদ",

diff --git a/app/config/locale/translations/ca.json b/app/config/locale/translations/ca.json
@@ -4,7 +4,7 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Equip",
     "emails.verification.subject": "Verificació del compte",
-    "emails.verification.hello": "Hola {{name}}",
+    "emails.verification.hello": "Hola {{user}}",
     "emails.verification.body": "Accedeix a aquest enllaç per tal de verificar la teva adreça electrònica.",
     "emails.verification.footer": "Si no has sol·licitat la verificació d'aquesta adreça electrònica, pots ignorar aquest missatge.",
     "emails.verification.thanks": "Gràcies",
@@ -16,7 +16,7 @@
     "emails.magicSession.thanks": "Gràcies",
     "emails.magicSession.signature": "Equip {{project}}",
     "emails.recovery.subject": "Reinicialitzar contrasenya",
-    "emails.recovery.hello": "Hola {{name}}",
+    "emails.recovery.hello": "Hola {{user}}",
     "emails.recovery.body": "Accedeix a aquest enllaç per a reinicialitzar la teva contrasenya de {{project}}.",
     "emails.recovery.footer": "Si no has sol·licitat reinicialitzar la teva contrasenya, pots ignorar aquest missatge.",
     "emails.recovery.thanks": "Gràcies",

diff --git a/app/config/locale/translations/da.json b/app/config/locale/translations/da.json
@@ -4,7 +4,7 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Konto Verifikation",
-    "emails.verification.hello": "Hej {{name}}",
+    "emails.verification.hello": "Hej {{user}}",
     "emails.verification.body": "Følg dette link, for at verificere din email adresse.",
     "emails.verification.footer": "Hvis du ikke har bedt om at verificere denne adresse, ignorer venligst denne besked.",
     "emails.verification.thanks": "Tak",
@@ -16,7 +16,7 @@
     "emails.magicSession.thanks": "Tak",
     "emails.magicSession.signature": "{{project}} team",
     "emails.recovery.subject": "Nulstil Password",
-    "emails.recovery.hello": "Hej {{name}}",
+    "emails.recovery.hello": "Hej {{user}}",
     "emails.recovery.body": "Følg dette link for at nulstille koden til {{project}}.",
     "emails.recovery.footer": "Hvis du ikke har bedt om at nulstille dit password, ignorer venligst denne besked.",
     "emails.recovery.thanks": "Tak",

diff --git a/app/config/locale/translations/de.json b/app/config/locale/translations/de.json
@@ -4,7 +4,7 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Kontoverifizierung",
-    "emails.verification.hello": "Hey {{name}}",
+    "emails.verification.hello": "Hey {{user}}",
     "emails.verification.body": "Folge diesem Link, um deine E-Mail-Adresse zu bestätigen.",
     "emails.verification.footer": "Solltest du keine Verifizierung dieser E-Mail-Adresse angefordert haben, kannst du diese Nachricht ignorieren.",
     "emails.verification.thanks": "Danke",
@@ -16,7 +16,7 @@
     "emails.magicSession.thanks": "Danke",
     "emails.magicSession.signature": "{{project}}-Team",
     "emails.recovery.subject": "Kennwort zurücksetzen",
-    "emails.recovery.hello": "Hallo {{name}}",
+    "emails.recovery.hello": "Hallo {{user}}",
     "emails.recovery.body": "Folge diesem Link, um dein {{project}}-Kennwort zurückzusetzen.",
     "emails.recovery.footer": "Solltest du keine Kennwort-Zurücksetzung angefordert haben, kannst du diese Nachricht ignorieren.",
     "emails.recovery.thanks": "Danke",

diff --git a/app/config/locale/translations/el.json b/app/config/locale/translations/el.json
@@ -4,7 +4,7 @@
     "settings.direction": "ltr",
     "emails.sender": "Ομάδα %s",
     "emails.verification.subject": "Επαλήθευση Λογαριασμού",
-    "emails.verification.hello": "Γεια σου {{name}}",
+    "emails.verification.hello": "Γεια σου {{user}}",
     "emails.verification.body": "Ακολουθήστε αυτό το link για να επαληθεύσετε τη δ/νση του email σας",
     "emails.verification.footer": "Εάν δεν ζητήσατε επαλήθευση αυτής της δ/νσης email, μπορείτε να αγνοήσετε αυτό το μήνυμα",
     "emails.verification.thanks": "Ευχαριστούμε",
@@ -16,7 +16,7 @@
     "emails.magicSession.thanks": "Ευχαριστούμε",
     "emails.magicSession.signature": "Η ομάδα του {{project}}",
     "emails.recovery.subject": "Αλλαγή κωδικού πρόσβασης",
-    "emails.recovery.hello": "Γεια σου {{name}}",
+    "emails.recovery.hello": "Γεια σου {{user}}",
     "emails.recovery.body": "Ακολουθήστε αυτό το link για να αλλάξετε τον {{project}} κωδικό σας",
     "emails.recovery.footer": "Εάν δεν ζητήσατε αλλαγή του κωδικού σας πρόσβασης, μπορείτε να αγνοήσετε αυτό το μήνυμα",
     "emails.recovery.thanks": "Ευχαριστούμε",

diff --git a/app/config/locale/translations/en.json b/app/config/locale/translations/en.json
@@ -4,7 +4,7 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Account Verification",
-    "emails.verification.hello": "Hey {{name}}",
+    "emails.verification.hello": "Hey {{user}}",
     "emails.verification.body": "Follow this link to verify your email address.",
     "emails.verification.footer": "If you didn’t ask to verify this address, you can ignore this message.",
     "emails.verification.thanks": "Thanks",
@@ -16,7 +16,7 @@
     "emails.magicSession.thanks": "Thanks",
     "emails.magicSession.signature": "{{project}} team",
     "emails.recovery.subject": "Password Reset",
-    "emails.recovery.hello": "Hello {{name}}",
+    "emails.recovery.hello": "Hello {{user}}",
     "emails.recovery.body": "Follow this link to reset your {{project}} password.",
     "emails.recovery.footer": "If you didn’t ask to reset your password, you can ignore this message.",
     "emails.recovery.thanks": "Thanks",

diff --git a/app/config/locale/translations/eo.json b/app/config/locale/translations/eo.json
@@ -3,7 +3,7 @@
      "settings.direction": "ltr",
      "emails.sender": "Teamo %s",
      "emails.verification.subject": "Konta Konfirmo",
-     "emails.verification.hello": "Saluton {{name}}",
+     "emails.verification.hello": "Saluton {{user}}",
      "emails.verification.body": "Alklaku ĉi tiun ligon por kontroli vian retpoŝtan adreson.",
      "emails.verification.footer": "Se vi ne petis ĉi tiun konfirmon de ĉi tiu retpoŝto, vi povas ignori ĉi tiun mesaĝon.",
      "emails.verification.thanks": "Dankegon.",
@@ -15,7 +15,7 @@
      "emails.magicSession.thanks": "Dankegon",
      "emails.magicSession.signature": "Teamo {{project}}",
      "emails.recovery.subject": "Parsvorta Restarigo",
-     "emails.recovery.hello": "Saluton {{name}}",
+     "emails.recovery.hello": "Saluton {{user}}",
      "emails.recovery.body": "Alklaku ĉi tiun ligon por reagordi vian pasvorton. {{project}}",
      "emails.recovery.footer": "Se vi ne petis reagordi vian pasvorton, vi povas ignori ĉi tiun mesaĝon.",
      "emails.recovery.thanks": "Dankegon",