Commit Graph

4690 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 f8eaf926f2 fix: template name typo for mfa challenge 2024-02-22 14:37:01 +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 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 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 9498d680fb Add doc refs 2024-02-21 22:04:27 +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 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
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 5747b33e38 Make self-hosted and cloud specs consistent 2024-02-20 23:15:46 +13:00
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 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
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
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
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
Jake Barnby 0246fb254a Merge pull request #7578 from appwrite/fix-smtp-provider-update
Fix smtp provider update
2024-02-14 12:48:38 +13:00
Bradley Schofield b60c591f8f Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-13 09:45:59 +00:00
shimon dac0e2a543 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 10:48:47 +02:00
Jake Barnby 1f470aecd2 Add subscribe permission to topics 2024-02-13 17:24:31 +13:00
Jake Barnby 01e88e65d6 Fix swapping options/credentials on create/update smtp provider 2024-02-13 15:16:37 +13:00
Jake Barnby 66e51c0f18 Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models
# Conflicts:
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
2024-02-13 15:07:16 +13:00
Jake Barnby 37522ea66f Merge branch '1.5.x' into fix-catch-exception 2024-02-13 12:47:36 +13:00
Jake Barnby ff1f7e4819 Merge pull request #7569 from appwrite/fix-telesign-params
Fix telesign params
2024-02-13 12:38:49 +13:00
Jake Barnby 0bd3fe6473 Merge pull request #7571 from appwrite/fix-updating-message-status
Fix updating message status
2024-02-13 12:38:39 +13:00
Jake Barnby 06b15c79ff Merge pull request #7572 from appwrite/attributes-query-fix
fix Indexes
2024-02-13 12:37:59 +13:00
Christy Jacob c076dfe6f1 Merge pull request #7576 from appwrite/refactor-usage-sn
Refactor usage sn
2024-02-12 23:05:56 +05:30