Jake Barnby 942847cf3a Merge remote-tracking branch 'origin/main' into 1.5.x ... # Conflicts: # app/config/collections.php # app/config/errors.php # app/config/specs/open-api3-latest-client.json # app/config/specs/open-api3-latest-console.json # app/config/specs/open-api3-latest-server.json # app/config/specs/swagger2-latest-client.json # app/config/specs/swagger2-latest-console.json # app/config/specs/swagger2-latest-server.json # app/controllers/api/account.php # app/controllers/api/teams.php # app/controllers/api/users.php # app/controllers/shared/api.php # app/init.php # app/worker.php # composer.json # composer.lock # docker-compose.yml # src/Appwrite/Extend/Exception.php # src/Appwrite/Platform/Services/Tasks.php # src/Appwrite/Platform/Tasks/Maintenance.php # src/Appwrite/Platform/Workers/Certificates.php # src/Appwrite/Platform/Workers/Deletes.php # src/Appwrite/Platform/Workers/Messaging.php # src/Appwrite/Platform/Workers/Usage.php # src/Appwrite/Platform/Workers/UsageHook.php # src/Appwrite/Specification/Format/OpenAPI3.php # src/Appwrite/Specification/Format/Swagger2.php # tests/e2e/Services/Account/AccountConsoleClientTest.php		2024-02-22 01:29:28 +13:00
..
Account	Merge remote-tracking branch 'origin/main' into 1.5.x	2024-02-22 01:29:28 +13:00
Avatars	rollback to Usage	2023-10-15 20:41:09 +03:00
Console	Fix console test	2023-08-30 01:10:08 -04:00
Databases	Merge branch '1.5.x' of github.com:appwrite/appwrite into json_syntax_error	2024-02-12 17:41:42 +02:00
Functions	Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing	2024-01-25 17:44:05 +02:00
GraphQL	Update tests	2024-02-15 17:30:09 +13:00
Health	Merge main	2024-02-12 14:18:19 +13:00
Locale	PR review changes	2024-01-22 14:30:11 +00:00
Messaging	Fix test	2024-02-21 13:31:48 +13:00
Projects	Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing	2024-01-25 17:44:05 +02:00
Realtime	Remove passwordAgain (#7441)	2024-01-12 14:33:10 +01:00
Storage	Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1	2024-01-30 18:44:16 +13:00
Teams	Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa	2024-02-01 11:57:32 +01:00
Users	Merge remote-tracking branch 'origin/1.5.x' into fix-empty-user-updates	2024-02-05 10:38:48 +00:00
VCS	Fixed linter errors	2023-10-27 19:43:07 +05:30
Webhooks	Fix formatting and remove flaky test	2024-01-18 18:12:58 +05:30