Commit Graph
4606 Commits
Author SHA1 Message Date
Damodar Lohani ca1c83c2cf method to reset attachment 2024-02-24 14:33:38 +00:00
Bradley Schofield d13cb6f949 Merge branch '1.5.x' into feat-migrations-service-fixes 2024-02-24 14:20:31 +00:00
Bradley Schofield 37707007a1 Use new migration error handling 2024-02-24 14:18:55 +00:00
Luke B. Silver 34d2dde51d Merge branch '1.5.x' into fix-templates-copy-hidden-files 2024-02-24 13:45:20 +00:00
loks0n 42e9865dff fix: hideServer & hideClient 2024-02-24 13:42:33 +00:00
loks0n 6cc1235e86 chore: fmt 2024-02-24 13:23:16 +00:00
loks0n 5ff2121ef7 fix: sdk.hideServer & sdk.hideClient 2024-02-24 13:17:58 +00:00
loks0n 5ba50c842b chore: remove array sdk method 2024-02-24 12:53:47 +00:00
Jake Barnby 46575b6df7 Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# Conflicts:
#	app/controllers/api/account.php
#	composer.lock
2024-02-25 00:16:40 +13:00
Jake Barnby bae1ba714c Enum format fixes 2024-02-24 14:16:05 +13:00
Jake Barnby 11e9f43982 Allow setting APNS to sandbox mode 2024-02-24 13:34:08 +13:00
Torsten Dittmann f5cdd5e4cc fix: comma in email templates 2024-02-23 14:59:12 +01:00
Torsten Dittmann 9ae2948d0e fix: mfa email template 2024-02-23 14:59:12 +01:00
Jake Barnby ce0afb61dc Merge pull request #7621 from appwrite/feat-fix-1.5.x-migrations
Fix 1.5.x Migrations
2024-02-24 01:08:11 +13:00
Jake Barnby 82efd57146 Fix hidden files not copied when generating SDKs 2024-02-23 18:32:15 +13:00
Jake Barnby 7c42a59c85 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-23 18:01:59 +13:00
Luke B. Silver 5822f22109 Merge branch '1.5.x' into fix-templates-copy-hidden-files 2024-02-22 18:06:09 +00:00
Luke B. Silver 0f09fd5ade Merge branch '1.5.x' into fix-templates-copy-hidden-files 2024-02-22 13:41:16 +00:00
Luke B. Silver f285173f4e Merge branch '1.5.x' into feat-ssr-dx 2024-02-22 13:22:41 +00:00
Bradley Schofield cb110c1481 Merge branch '1.5.x' into feat-fix-1.5.x-migrations 2024-02-22 10:28:06 +00:00
Bradley Schofield bdf044ed8c Update 'email' to 'password' in factors 2024-02-22 10:21:25 +00:00
Christy Jacob a8098831a3 Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
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