Commit Graph

6937 Commits

Author SHA1 Message Date
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
fogelito b762a9cedd Check user false 2024-02-21 11:48:16 +02:00
fogelito a851a5f244 providerInternalId nulls 2024-02-21 11:43:04 +02:00
Jake Barnby 9498d680fb Add doc refs 2024-02-21 22:04:27 +13:00
Jake Barnby 607ba5b32f Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-21 18:40:01 +13:00
Jake Barnby 3aeb62377c Fix missed update with image 2024-02-21 17:07:52 +13:00
Jake Barnby 41be4da5c9 Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 2024-02-21 13:01:53 +13:00
Jake Barnby a9d1aa5bca Merge pull request #7620 from appwrite/refactor-remove-resource-collection
Refactor remove resource collection
2024-02-21 13:00:48 +13:00
Jake Barnby ad8450af32 Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 2024-02-21 03:29:00 +13:00
Jake Barnby 400b28de8a Replace resourceCollection with switch 2024-02-21 03:25:01 +13:00
Jake Barnby 1c1a2eab2c Format 2024-02-21 03:16:01 +13:00
Jake Barnby 64eaf91ee7 Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-21 03:15:23 +13:00
Jake Barnby 379c79dae9 Consistent naming for device resources 2024-02-21 03:10:51 +13:00
Jake Barnby 35441dc542 Merge remote-tracking branch 'origin/1.5.x' into feat-email-attachments 2024-02-21 02:33:35 +13:00
Jake Barnby b9b54b808c Merge pull request #7618 from appwrite/feat-remove-callback-resources
Remove callback resources from workers
2024-02-21 02:30:32 +13:00
Jake Barnby 439e7b1ccf Merge remote-tracking branch 'origin/feat-remove-callback-resources' into feat-email-attachments
# Conflicts:
#	app/worker.php
#	src/Appwrite/Platform/Workers/Messaging.php
2024-02-21 02:00:46 +13:00
loks0n 1fa0f18e44 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr-dx 2024-02-20 12:43:50 +00:00
Jake Barnby bbce53cda5 Auto trigger messaging events 2024-02-21 01:06:35 +13:00
loks0n fa28496b32 feat: ssr dx changes 2024-02-20 11:45:11 +00:00
Jake Barnby 2f711c84ed Remove callback resources from workers 2024-02-21 00:40:55 +13:00
Jake Barnby 6c4b0ecd5b Simplify allow list 2024-02-20 23:27:40 +13:00
Jake Barnby 5747b33e38 Make self-hosted and cloud specs consistent 2024-02-20 23:15:46 +13:00
Christy Jacob 35562715ad Merge branch 'main' into mock-numbers 2024-02-20 12:27:14 +05:30
Jake Barnby 4bc6c202d9 Use compound ID for push notification image 2024-02-20 18:25:57 +13:00
Jake Barnby 42e1b0dfe3 Merge remote-tracking branch 'origin/feat-email-attachments' into feat-push-images 2024-02-20 18:06:29 +13:00
shimon 1577be9172 usage/usage-dump queue health endpoints 2024-02-19 21:36:14 +02:00
Jake Barnby 022c4678ec Allow attaching files from storage to emails 2024-02-20 00:08:57 +13:00
Jake Barnby 7a420000fa Fix image permissions check and URL 2024-02-19 20:48:52 +13:00
Jake Barnby 1bb75fdd63 Merge remote-tracking branch 'origin/1.5.x' into feat-push-images
# Conflicts:
#	src/Appwrite/Extend/Exception.php
2024-02-19 20:44:11 +13:00
Damodar Lohani 928ae74ffe fix project network usage 2024-02-19 06:04:29 +00:00
Khushboo Verma e4a86d9777 Remove global function 2024-02-19 09:19:54 +05:30
Eldad A. Fux ad78259c10 Merge pull request #7375 from appwrite/fix-sentry-errors
Update exception for github session not found
2024-02-18 22:37:00 +01:00
Khushboo Verma ada1f2abb7 Mark cancelled first, then kill container 2024-02-19 00:44:21 +05:30
Khushboo Verma 12f2e761ef Updated description and response model 2024-02-18 23:25:57 +05:30
Khushboo Verma 3b1233eaa9 Add deviceFunctions and deviceBuilds as well 2024-02-18 18:28:41 +05:30
Khushboo Verma f5919aad4a Merge branch 'main' into feat-cancel-build-deployment 2024-02-18 18:03:21 +05:30
Khushboo Verma ed3d598f2e Added cancel build endpoint 2024-02-18 18:01:25 +05:30
Jake Barnby 14a243cc37 Merge pull request #7457 from appwrite/1.5.x-response-request-models
Update Response and Request filters aswell as Migrations for 1.5.x
2024-02-16 20:58:08 +13:00
Jake Barnby 3c727861bb Fix target permissions 2024-02-16 17:07:16 +13:00
Jake Barnby c192f14d01 Merge remote-tracking branch 'origin/1.5.x' into feat-topic-totals-per-type 2024-02-16 14:08:04 +13:00
Torsten Dittmann 14ecbd6658 fix: 2fa endpoint params 2024-02-15 11:26:34 +00:00
Jake Barnby 2fffbd93f8 Lint fix 2024-02-15 22:41:45 +13:00
Jake Barnby d38197380e Support adding image to push notification via storage file 2024-02-15 22:36:34 +13:00
Khushboo Verma 00db19257d Add health storage check 2024-02-15 11:57:24 +05:30
Jake Barnby 5f59f4c5c8 Fix syntax error 2024-02-15 17:56:06 +13:00
Jake Barnby afba7f75f0 Update appropriate total count when mutating topic 2024-02-15 17:23:30 +13:00
Jake Barnby ae7a5c6c9c Merge pull request #7580 from appwrite/feat-subscribe-permission
Feat subscribe permission
2024-02-15 16:47:44 +13:00
Christy Jacob 48e87cdc7c Merge branch 'main' of github.com:appwrite/appwrite into mock-numbers 2024-02-14 21:24:53 +05:30
fogelito 84acf990ec Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2 2024-02-14 16:53:58 +02:00
Christy Jacob 28a16173ab feat: add tests 2024-02-14 12:10:19 +05:30