1
0
Fork 0
mirror of synced 2024-06-14 00:34:51 +12:00
appwrite/app/controllers/api
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.php Merge remote-tracking branch 'origin/main' into 1.5.x 2024-02-22 01:29:28 +13:00
avatars.php Merge remote-tracking branch 'origin/main' into 1.5.x 2024-02-22 01:29:28 +13:00
console.php sync with 1.4 2023-10-02 17:02:48 +03:00
databases.php Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-13 09:45:59 +00:00
functions.php Merge pull request #7620 from appwrite/refactor-remove-resource-collection 2024-02-21 13:00:48 +13:00
graphql.php sync with 1.4 2023-10-02 17:02:48 +03:00
health.php Consistent naming for device resources 2024-02-21 03:10:51 +13:00
locale.php sync with 1.4 2023-10-02 17:02:48 +03:00
messaging.php Add doc refs 2024-02-21 22:04:27 +13:00
migrations.php Merge branch '1.5.x' into fix-catch-exception 2024-02-13 12:47:36 +13:00
project.php fix project network usage 2024-02-19 06:04:29 +00:00
projects.php Simplify allow list 2024-02-20 23:27:40 +13:00
proxy.php Merge branch '1.5.x' into fix-catch-exception 2024-02-13 12:47:36 +13:00
storage.php Merge remote-tracking branch 'origin/main' into 1.5.x 2024-02-22 01:29:28 +13:00
teams.php Merge remote-tracking branch 'origin/main' into 1.5.x 2024-02-22 01:29:28 +13:00
users.php Merge remote-tracking branch 'origin/main' into 1.5.x 2024-02-22 01:29:28 +13:00
vcs.php Remove callback resources from workers 2024-02-21 00:40:55 +13:00