Commit Graph

8501 Commits

Author SHA1 Message Date
Khushboo Verma d4626b2039 Follow existing style of code 2024-01-19 18:53:17 +05:30
Bradley Schofield 1e247bdde1 Address Christy's Comments and Update Lib 2024-01-19 13:18:37 +00:00
Khushboo Verma a134ca7efd Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-19 17:12:14 +05:30
Khushboo Verma 3e5443f127 Add env variables to mails worker instead of webhooks worker 2024-01-19 17:09:48 +05:30
Jake Barnby 8fd5a336af Make sure target exists before updating 2024-01-19 20:18:10 +13:00
Jake Barnby 332fddac12 Merge remote-tracking branch 'origin/1.5.x' into feat-maintenance-delete-expired-targets 2024-01-19 19:18:04 +13:00
Jake Barnby 06b2b82fac Fix cc + bcc targets fetched by identifier instead of $id 2024-01-19 17:26:06 +13:00
Jake Barnby 9fc68d23a0 Fix delete type for expired targets 2024-01-19 17:23:44 +13:00
Jake Barnby 4c10e78e42 Merge remote-tracking branch 'origin/1.5.x' into feat-maintenance-delete-expired-targets
# Conflicts:
#	app/init.php
2024-01-19 16:56:51 +13:00
Jake Barnby 59c4f5b9e4 Merge pull request #7431 from appwrite/feat-message-scheduling
Feat message scheduling
2024-01-19 16:55:49 +13:00
Jake Barnby 86ed3fdf55 Merge pull request #7419 from appwrite/feat-query-push-target-type
Allow filtering targets by provider type
2024-01-19 16:54:26 +13:00
Jake Barnby fc9cc3aab1 Merge pull request #7381 from appwrite/fix-list-messages-allowed-queries
Fix list messages allowed queries
2024-01-19 16:53:22 +13:00
Jake Barnby 0d91bb0eaa Merge pull request #7396 from appwrite/feat-delete-subscribers-with-targets
Delete subscribers and update topic totals when deleting target
2024-01-19 16:45:52 +13:00
Jake Barnby d292562090 Throw if status scheduled and no schedule set 2024-01-19 16:16:24 +13:00
Jake Barnby 65573adad6 Use status enum 2024-01-19 16:15:54 +13:00
Jake Barnby a3096bc209 Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling
# Conflicts:
#	app/controllers/api/messaging.php
2024-01-19 15:54:21 +13:00
Steven Nguyen e597def3f3 Remove commented out MessageStatus enum 2024-01-19 01:53:56 +00:00
Jake Barnby 1701606593 Console warning instead of throw so error reporting isn't triggered 2024-01-19 14:41:53 +13:00
Jake Barnby 3b7d3e6139 Merge branch '1.5.x' into feat-draft-messages 2024-01-19 14:19:45 +13:00
shimon 37316f97ff adding debug output to usage-worker 2024-01-18 18:52:20 +02:00
Torsten Dittmann 442451aa42 feat: mfa console 2024-01-18 16:04:18 +01:00
shimon a0b38a5a7c Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn 2024-01-18 14:19:19 +02:00
Torsten Dittmann 1ab3dc2236 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-18 13:10:15 +01:00
shimon 8581df9c14 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc 2024-01-18 14:05:58 +02:00
Khushboo Verma e9aab8d9ee Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-18 15:21:55 +05:30
Khushboo Verma 5eea695921 Merge branch 'fix-limit-failed-webhook-attempts' of github.com:appwrite/appwrite into fix-limit-failed-webhook-attempts 2024-01-18 15:20:13 +05:30
Khushboo Verma 3a1fe3b2a7 Add webhook tests 2024-01-18 15:19:57 +05:30
Matej Bačo 2be504ed8a fix pool is empty webhook worker 2024-01-18 09:13:11 +00:00
Steven Nguyen 34af90b65e Convert MessageStatus to a class
Appwrite is using PHP 8 which doesn't support backed enums.
2024-01-17 17:30:55 -08:00
Steven Nguyen d670c07ca4 Delete subscribers and update topic totals when deleting target 2024-01-17 22:56:56 +00:00
shimon 6bd810cb3a hamster additions 2024-01-17 22:19:00 +02:00
shimon 0d106684ae hamster additions 2024-01-17 22:10:06 +02:00
Shimon Newman e5245909e3 Update src/Appwrite/Platform/Workers/Hamster.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-17 22:09:17 +02:00
Shimon Newman 3f63b87ea6 Update src/Appwrite/Platform/Workers/Hamster.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-17 22:09:02 +02:00
Shimon Newman c1ca623bab Update src/Appwrite/Platform/Workers/Hamster.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-17 22:08:44 +02:00
Shimon Newman 5d164e0592 Update src/Appwrite/Platform/Workers/Hamster.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-17 22:08:37 +02:00
Shimon Newman a954cea8fc Update src/Appwrite/Platform/Workers/Hamster.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-17 22:08:29 +02:00
shimon f9d6da6672 hamster additions 2024-01-17 21:58:16 +02:00
shimon 40e17ad625 hamster additions 2024-01-17 21:53:12 +02:00
loks0n 498ddbf14c test: add create email session test for server 2024-01-17 11:58:40 +00:00
Matej Bačo f64989dd13 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-17 11:26:16 +00:00
loks0n 39a351adc1 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-17 11:22:45 +00:00
Matej Bačo 20322589dd Improve SMTP test email design 2024-01-17 11:22:08 +00:00
loks0n bc1858c516 chore: do not auto create accounts in users endpoints 2024-01-17 11:03:04 +00:00
Jake Barnby 2f786c03a2 Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling
# Conflicts:
#	tests/e2e/Services/GraphQL/Base.php
2024-01-17 19:07:40 +13:00
Steven Nguyen 45ee8a11a5 Update allowed attributes list messages queries
Remove the following because queries on arrays/JSON are not supported:

- topics
- users
- targets
- deliveryErrors
- data

Remove the following because they don't exist:
- providerId
- deliveredTo

Add the following as an allowed attribute so it can be queried on the
Console:

- scheduledAt
- deliveredTotal
- providerType
2024-01-17 02:39:09 +00:00
Jake Barnby 828f214d0f Merge remote-tracking branch 'origin/feat-message-scheduling' into feat-maintenance-delete-expired-targets 2024-01-17 15:06:36 +13:00
Jake Barnby fe0af8e2cd Add missing provider filter for targets 2024-01-17 15:06:10 +13:00
Jake Barnby ad40e0a3c5 Merge remote-tracking branch 'origin/feat-message-scheduling' into feat-maintenance-delete-expired-targets 2024-01-17 15:02:14 +13:00
Jake Barnby a4134d1af1 Merge branch 'feat-message-scheduling' of github.com:appwrite/appwrite into feat-message-scheduling 2024-01-17 15:01:55 +13:00