From 5087ae61e796674aaff06ac1010c53477168f500 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Thu, 9 Nov 2023 05:51:47 +0000 Subject: [PATCH 1/4] Bump utopia-php/vcs and utopia-php/messaging --- composer.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.lock b/composer.lock index e8334179ff..899db7560d 100644 --- a/composer.lock +++ b/composer.lock @@ -2318,16 +2318,16 @@ }, { "name": "utopia-php/migration", - "version": "0.3.5", + "version": "0.3.6", "source": { "type": "git", "url": "https://github.com/utopia-php/migration.git", - "reference": "b2fd3a8310296f4e44ff0e85b0eb0230ad9a2f83" + "reference": "f78273b38bade23db5866e5c7cb5f55427ba82af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/migration/zipball/b2fd3a8310296f4e44ff0e85b0eb0230ad9a2f83", - "reference": "b2fd3a8310296f4e44ff0e85b0eb0230ad9a2f83", + "url": "https://api.github.com/repos/utopia-php/migration/zipball/f78273b38bade23db5866e5c7cb5f55427ba82af", + "reference": "f78273b38bade23db5866e5c7cb5f55427ba82af", "shasum": "" }, "require": { @@ -2360,9 +2360,9 @@ ], "support": { "issues": "https://github.com/utopia-php/migration/issues", - "source": "https://github.com/utopia-php/migration/tree/0.3.5" + "source": "https://github.com/utopia-php/migration/tree/0.3.6" }, - "time": "2023-09-25T16:51:47+00:00" + "time": "2023-11-02T15:13:03+00:00" }, { "name": "utopia-php/mongo", @@ -2904,16 +2904,16 @@ }, { "name": "utopia-php/vcs", - "version": "0.6.1", + "version": "0.6.2", "source": { "type": "git", "url": "https://github.com/utopia-php/vcs.git", - "reference": "d161d1156ef336d197a8d45384b531e5ec31243d" + "reference": "f135291b87cb45335fc6608722e7f89894bc33ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/vcs/zipball/d161d1156ef336d197a8d45384b531e5ec31243d", - "reference": "d161d1156ef336d197a8d45384b531e5ec31243d", + "url": "https://api.github.com/repos/utopia-php/vcs/zipball/f135291b87cb45335fc6608722e7f89894bc33ee", + "reference": "f135291b87cb45335fc6608722e7f89894bc33ee", "shasum": "" }, "require": { @@ -2947,9 +2947,9 @@ ], "support": { "issues": "https://github.com/utopia-php/vcs/issues", - "source": "https://github.com/utopia-php/vcs/tree/0.6.1" + "source": "https://github.com/utopia-php/vcs/tree/0.6.2" }, - "time": "2023-10-19T07:43:31+00:00" + "time": "2023-11-08T15:36:03+00:00" }, { "name": "utopia-php/websocket", @@ -5822,5 +5822,5 @@ "platform-overrides": { "php": "8.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From f70b418c5c370d7bc741379be17fff70c12393e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=B7=E5=8D=8E=20=E5=88=98?= Date: Thu, 9 Nov 2023 15:57:37 +0000 Subject: [PATCH 2/4] chore: updates for appwrite 1.4.10 --- .gitmodules | 2 +- CHANGES.md | 5 +++++ README-CN.md | 6 +++--- README.md | 6 +++--- app/console | 2 +- app/init.php | 2 +- src/Appwrite/Migration/Migration.php | 1 + 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index fc1a92efee..ff2e0a6aab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "app/console"] path = app/console url = https://github.com/appwrite/console - branch = 3.2.5 + branch = 3.2.6 diff --git a/CHANGES.md b/CHANGES.md index 0363f28683..0e06f734f8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +# Version 1.4.10 + +## Bug fixes + + # Version 1.4.9 ## Bug fixes diff --git a/README-CN.md b/README-CN.md index 4a2f9edd65..da6785c750 100644 --- 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.9 + appwrite/appwrite:1.4.10 ``` ### 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.9 + appwrite/appwrite:1.4.10 ``` #### 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.9 + appwrite/appwrite:1.4.10 ``` 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。 diff --git a/README.md b/README.md index 9b4ba2bb58..9a59f52ec7 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,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.9 + appwrite/appwrite:1.4.10 ``` ### Windows @@ -88,7 +88,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.9 + appwrite/appwrite:1.4.10 ``` #### PowerShell @@ -98,7 +98,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.9 + appwrite/appwrite:1.4.10 ``` 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/console b/app/console index 9810ce8581..f7c34a1b37 160000 --- a/app/console +++ b/app/console @@ -1 +1 @@ -Subproject commit 9810ce85812ca26c95b7d35196848c92e8ba813d +Subproject commit f7c34a1b37d53dd5f28c83b4e12a4e68fcd9b484 diff --git a/app/init.php b/app/init.php index e4b9e7573d..a6809bae36 100644 --- a/app/init.php +++ b/app/init.php @@ -110,7 +110,7 @@ const APP_KEY_ACCCESS = 24 * 60 * 60; // 24 hours const APP_USER_ACCCESS = 24 * 60 * 60; // 24 hours const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours const APP_CACHE_BUSTER = 515; -const APP_VERSION_STABLE = '1.4.9'; +const APP_VERSION_STABLE = '1.4.10'; const APP_DATABASE_ATTRIBUTE_EMAIL = 'email'; const APP_DATABASE_ATTRIBUTE_ENUM = 'enum'; const APP_DATABASE_ATTRIBUTE_IP = 'ip'; diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php index efa0fad8fb..e370f4dc75 100644 --- a/src/Appwrite/Migration/Migration.php +++ b/src/Appwrite/Migration/Migration.php @@ -74,6 +74,7 @@ abstract class Migration '1.4.7' => 'V19', '1.4.8' => 'V19', '1.4.9' => 'V19', + '1.4.10' => 'V19', ]; /** From c014e40c5485fdbf43b2e3605bed6d9e4568dad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=B7=E5=8D=8E=20=E5=88=98?= Date: Thu, 9 Nov 2023 16:05:33 +0000 Subject: [PATCH 3/4] chore: update changelog --- CHANGES.md | 10 +++++++++- src/Appwrite/Migration/Migration.php | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 0e06f734f8..15673a133b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,15 @@ # Version 1.4.10 ## Bug fixes - +* Handle cases where password history could contain NULLs [#7092](https://github.com/appwrite/appwrite/pull/7092) +* Missing functionId error on create execution [#7091] (https://github.com/appwrite/appwrite/pull/7091) +* Ensure usage endpoints don't throw 500 when usage is disabled [#7087](https://github.com/appwrite/appwrite/pull/7087) +* Missing sessionId error when deleting all user sessions [#7085](https://github.com/appwrite/appwrite/pull/7085) +* Domain validation in Create Proxy rule results in 500 error [#7084](https://github.com/appwrite/appwrite/pull/7084) +* Fix optional services [#7078](https://github.com/appwrite/appwrite/pull/7078) +* Fix regression from worker refactor [#7074](https://github.com/appwrite/appwrite/pull/7074) +* Use getQueueSize() in the Health service's get X queue endpoints [#7073](https://github.com/appwrite/appwrite/pull/7073) +* Delete linked VCS repos and comments [#7066](https://github.com/appwrite/appwrite/pull/7066) # Version 1.4.9 diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php index e370f4dc75..929eeb4d36 100644 --- a/src/Appwrite/Migration/Migration.php +++ b/src/Appwrite/Migration/Migration.php @@ -74,7 +74,7 @@ abstract class Migration '1.4.7' => 'V19', '1.4.8' => 'V19', '1.4.9' => 'V19', - '1.4.10' => 'V19', + '1.4.10' => 'V19' ]; /** From f1ea4f761e541ac4f4c762a12e57a091ce52ed8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=B7=E5=8D=8E=20=E5=88=98?= Date: Thu, 9 Nov 2023 16:08:20 +0000 Subject: [PATCH 4/4] chore: fix markdown syntax --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 15673a133b..b5140d7b88 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,7 +2,7 @@ ## Bug fixes * Handle cases where password history could contain NULLs [#7092](https://github.com/appwrite/appwrite/pull/7092) -* Missing functionId error on create execution [#7091] (https://github.com/appwrite/appwrite/pull/7091) +* Missing functionId error on create execution [#7091](https://github.com/appwrite/appwrite/pull/7091) * Ensure usage endpoints don't throw 500 when usage is disabled [#7087](https://github.com/appwrite/appwrite/pull/7087) * Missing sessionId error when deleting all user sessions [#7085](https://github.com/appwrite/appwrite/pull/7085) * Domain validation in Create Proxy rule results in 500 error [#7084](https://github.com/appwrite/appwrite/pull/7084)