Commit Graph

8501 Commits

Author SHA1 Message Date
Torsten Dittmann e7259f0a3d Merge branch '1.5.x' into feat-rc-sdks 2024-02-21 18:22:17 +01:00
Torsten Dittmann e7f94d7095 fix: update mfa sdk method name 2024-02-21 18:08:22 +01:00
loks0n b2e1c162d2 chore: fmt 2024-02-21 16:27:37 +00:00
loks0n e3c261b9e4 fix: msg91 2024-02-21 16:24:55 +00:00
Jake Barnby 623c82c727 Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/specs/open-api3-1.4.x-client.json
#	app/config/specs/open-api3-1.4.x-console.json
#	app/config/specs/open-api3-1.4.x-server.json
#	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-1.4.x-client.json
#	app/config/specs/swagger2-1.4.x-console.json
#	app/config/specs/swagger2-1.4.x-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.json
#	composer.lock
#	src/Appwrite/Auth/Validator/Phone.php
2024-02-22 01:32:26 +13:00
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
loks0n a3b88f2015 chore: remove x-forwarded-for 2024-02-21 12:18:50 +00:00
Bradley Schofield d020730a74 Address Shimon's comments 2024-02-21 10:20:55 +00:00
Bradley Schofield a2b9dbc208 Update V20.php 2024-02-21 09:42:04 +00:00
Bradley Schofield 370e814b8c Update Factors Session Migration 2024-02-21 09:31:52 +00:00
Jake Barnby 7e7a0cfabe Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks 2024-02-21 22:07:19 +13:00
Jake Barnby 9498d680fb Add doc refs 2024-02-21 22:04:27 +13:00
Jake Barnby e91565ecc9 Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# Conflicts:
#	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
#	composer.lock
2024-02-21 19:17:50 +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
Bradley Schofield a5d6af9ded Add 'factors' migration 2024-02-20 15:47:55 +00:00
Bradley Schofield bfe861f846 Run Linter 2024-02-20 15:05:42 +00: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 379c79dae9 Consistent naming for device resources 2024-02-21 03:10:51 +13:00
Jake Barnby 2667d1fb07 Inject always local file device 2024-02-21 02:50:44 +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
Bradley Schofield 441875e498 Merge branch '1.5.x' into feat-fix-1.5.x-migrations 2024-02-20 13:27:13 +00:00
Jake Barnby b265106af2 Fix tests 2024-02-21 02:20:09 +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 5747b33e38 Make self-hosted and cloud specs consistent 2024-02-20 23:15:46 +13:00
Shimon Newman 3f7d35065e Merge pull request #7614 from appwrite/chore-usage-queue-health
usage/usage-dump queue health endpoints
2024-02-20 09:59:52 +02:00
Jake Barnby d61f4e4d2d Add compound UID to spec generator 2024-02-20 20:15:08 +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
Jake Barnby d15e85d1f6 Fix injecting invalid resource 2024-02-20 17:27:35 +13:00
shimon 22e7c58d7d Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into remove-cloud-scripts 2024-02-19 17:38:13 +02:00
Jake Barnby 710e08c109 Make sure to clear cache if file was downloaded from remote source 2024-02-20 00:11:10 +13:00
Jake Barnby 022c4678ec Allow attaching files from storage to emails 2024-02-20 00:08:57 +13:00
Jake Barnby d3913c422b Add compound UID valdiator 2024-02-19 23:57:54 +13:00
loks0n 050f501186 fix: templates copy hidden files 2024-02-19 09:11:15 +00: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
Khushboo Verma 3471359735 Allow execution filter attributes 2024-02-19 10:24:12 +05:30
Jake Barnby e20f46ba1b Bump response format to fix filters being used 2024-02-19 16:54:53 +13:00
Jake Barnby 98f4178c39 Fix enums for API changes 2024-02-19 16:53:43 +13:00
Eldad A. Fux 44a9aed48e Merge pull request #7165 from appwrite/feat-more-phone-validation
Feat more phone validation
2024-02-18 22:39:45 +01:00
Khushboo Verma 6ebca949c0 Fixed composer error 2024-02-18 18:04:16 +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