Commit Graph
3988 Commits
Author SHA1 Message Date
Torsten Dittmann 9070dce6ac Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 16:32:12 +01:00
Torsten Dittmann 62e459c581 fix: workers 2024-01-24 12:29:36 +01:00
Torsten Dittmann e148617d3e fix: builds worker 2024-01-24 12:20:13 +01:00
Torsten Dittmann d087a76329 Merge branch '1.5.x' into sync-main-with-1.5.x 2024-01-24 12:06:22 +01:00
Christy Jacob 6f52b5f7a1 Merge pull request #7475 from appwrite/fix-certificate-mail-branding
Fix: Certificate email style
2024-01-24 14:47:21 +04:00
Torsten Dittmann d13023f23c fix: deletes worker 2024-01-24 11:42:04 +01:00
Torsten Dittmann 9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Matej Bačo 8a05b634fe Merge remote-tracking branch 'origin/1.5.x' into fix-certificate-mail-branding 2024-01-23 09:04:20 +00:00
Torsten Dittmann f1293d2636 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 18:32:22 +01:00
Matej Bačo 0c7a69e665 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 16:05:38 +00:00
Christy Jacob cfc25288b5 Merge pull request #7422 from appwrite/feat-email-otp
Feat: Email OTP
2024-01-22 19:18:39 +04:00
Christy Jacob 3656be3da5 Merge pull request #7452 from appwrite/feat-session-renewal
Feat: session renewal
2024-01-22 18:28:55 +04:00
Torsten Dittmann 185e4258df Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 14:45:07 +01:00
shimon d220c2bdd7 Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 14:48:25 +02:00
Matej Bačo 554103687e linter fix 2024-01-22 11:15:55 +00:00
Matej Bačo 724b8c8098 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 10:13:28 +00:00
Matej Bačo 4366f8e5d8 Remove incorrect translations, improve script 2024-01-22 10:01:02 +00:00
shimon 2b865bdf97 Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 11:29:11 +02:00
shimon 19b1de283b Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into hamster-additions 2024-01-22 11:25:37 +02:00
Khushboo Verma 5e3212bbff Rename redirect to path 2024-01-22 14:26:40 +05:30
德华 刘 d04f9f41c3 chore: refactor code 2024-01-22 08:30:48 +00:00
德华 刘 ff7523d6db chore: refactor code 2024-01-22 08:26:38 +00:00
Khushboo Verma 506e8c658d Refactored url construction 2024-01-22 13:48:19 +05:30
Matej Bačo 32cc186ea6 Merge remote-tracking branch 'origin/1.5.x' into feat-session-renewal 2024-01-22 08:17:52 +00:00
shimon 9fc1b0b71b Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 10:09:13 +02:00
shimon 0e30f6533e Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 09:54:09 +02:00
shimon c116de29e1 Added marked_for_deletion and billing_plan_downgrade
to hamster export
2024-01-22 09:28:45 +02:00
Matej Bačo 933b64001c Improve design 2024-01-20 12:49:23 +00:00
Matej Bačo 5e0c3c509d WIP: Certificate branded mail 2024-01-20 12:06:52 +00:00
Matej Bačo df9bc6df56 Implement OTP email endpoint + tests 2024-01-19 13:42:26 +00:00
Khushboo Verma d4626b2039 Follow existing style of code 2024-01-19 18:53:17 +05:30
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 06b2b82fac Fix cc + bcc targets fetched by identifier instead of $id 2024-01-19 17:26:06 +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
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