Commit Graph

20012 Commits

Author SHA1 Message Date
Torsten Dittmann 83c5477c79 fix: missing team variable and added mfa templates to config 2024-02-23 01:46:13 +01:00
Torsten Dittmann 917511d87c fix: move comma from language files into templates 2024-02-23 00:52:20 +01:00
Torsten Dittmann f8eaf926f2 fix: template name typo for mfa challenge 2024-02-22 14:37:01 +01:00
Torsten Dittmann a6ac1a7bb2 fix: comma in email templates 2024-02-22 14:34:46 +01:00
Torsten Dittmann e1d42ea4f3 revert: phpunit.xml change 2024-02-22 13:50:38 +01:00
Torsten Dittmann c3b8a694ab fix: formatting on emails 2024-02-22 13:47:01 +01:00
Torsten Dittmann 3975d8de9b fix: mfa email template 2024-02-22 13:03:56 +01:00
Torsten Dittmann e7259f0a3d Merge branch '1.5.x' into feat-rc-sdks 2024-02-21 18:22:17 +01:00
Torsten Dittmann 18e4385ca5 fix: change emailPassword factor from email to password 2024-02-21 18:18:56 +01:00
Torsten Dittmann e7f94d7095 fix: update mfa sdk method name 2024-02-21 18:08:22 +01:00
Torsten Dittmann 6cd456a35e fix: mfa sdk method 2024-02-21 17:54:39 +01:00
Jake Barnby a877850707 Fix GraphQL tests 2024-02-22 02:26:17 +13: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
Jake Barnby 81b9c4dca2 Push SDKs 2024-02-22 00:31:50 +13:00
Jake Barnby ac619f3b89 Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# Conflicts:
#	composer.lock
2024-02-21 22:37:32 +13:00
Jake Barnby 51745580a8 Update DB 2024-02-21 22:13:40 +13:00
Jake Barnby 39f7b3dff2 Update generator 2024-02-21 22:07:35 +13: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 883d9436ea Update specs 2024-02-21 20:03:35 +13:00
Jake Barnby 5123fddd56 Update versions 2024-02-21 20:03:14 +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 bc517ed69b Merge pull request #7594 from appwrite/feat-push-images
Allow push images
2024-02-21 18:36:51 +13:00
Jake Barnby 9b251207cf Merge branch '1.5.x' into feat-push-images 2024-02-21 18:06:58 +13:00
Jake Barnby b1528251bd Merge pull request #7624 from appwrite/fix-duplicate-subscribers
Fix duplicate subscribers
2024-02-21 17:12:05 +13:00
Jake Barnby 3aeb62377c Fix missed update with image 2024-02-21 17:07:52 +13:00
Jake Barnby ca1d66fc7e Fix test 2024-02-21 13:31:48 +13:00
Jake Barnby 81d475d98b Add test 2024-02-21 13:16:25 +13:00
Jake Barnby 52d4b649e4 Add missing unique index 2024-02-21 13:09:14 +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
Eldad A. Fux 14e81c2e27 Merge pull request #6826 from GuptaPratik02/doc-sdks-python-update-getting-started-guide
Update GETTING_STARTED.md
2024-02-20 17:50:41 +01:00
Vincent (Wen Yu) Ge f287e60e87 Merge branch 'main' into doc-sdks-python-update-getting-started-guide 2024-02-20 10:25:16 -05:00
Jake Barnby ad8450af32 Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 2024-02-21 03:29:00 +13:00
Eldad A. Fux 9b8ad99030 Merge pull request #7611 from appwrite/feat-email-attachments
Feat email attachments
2024-02-20 15:27:38 +01: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
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
Jake Barnby 7ad9b1cd5f Try fix phone test 2024-02-21 01:54:17 +13:00
Jake Barnby a8ed45ab47 Merge pull request #7617 from appwrite/feat-consistent-specs
Make self-hosted and cloud specs consistent
2024-02-21 01:36:43 +13:00
Jake Barnby bbce53cda5 Auto trigger messaging events 2024-02-21 01:06:35 +13: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 eb4d6f8e20 Update specs 2024-02-20 23:23:07 +13:00
Jake Barnby 5747b33e38 Make self-hosted and cloud specs consistent 2024-02-20 23:15:46 +13:00