shimon
|
102c86b2a6
|
Merge branch 'main' of github.com:appwrite/appwrite into 1.5.x-response-request-models
Conflicts:
Dockerfile
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/users.php
app/controllers/shared/api.php
app/worker.php
composer.json
composer.lock
src/Appwrite/Event/Mail.php
src/Appwrite/Migration/Migration.php
src/Appwrite/Migration/Version/V20.php
src/Appwrite/Platform/Services/Tasks.php
src/Appwrite/Platform/Services/Workers.php
src/Appwrite/Platform/Workers/Builds.php
src/Appwrite/Platform/Workers/Deletes.php
src/Appwrite/Platform/Workers/Mails.php
|
2024-01-31 20:21:18 +02:00 |
|
Matej Bačo
|
187165f397
|
Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test
|
2024-01-23 09:12:22 +00:00 |
|
Christy Jacob
|
3c3c34add9
|
Merge pull request #7474 from appwrite/fix-email-image-endpoint
Fix: Email image endpoints
|
2024-01-23 00:05:01 +04: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 |
|
Matej Bačo
|
871c29d1a5
|
PR review changes
|
2024-01-22 15:53:11 +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 |
|
Matej Bačo
|
cba974805d
|
PR review changes
|
2024-01-22 14:30:11 +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 |
|
Khushboo Verma
|
5e3212bbff
|
Rename redirect to path
|
2024-01-22 14:26:40 +05:30 |
|
Khushboo Verma
|
506e8c658d
|
Refactored url construction
|
2024-01-22 13:48:19 +05:30 |
|
Matej Bačo
|
284c1746eb
|
Add proper endpoint to email images
|
2024-01-20 11:05:44 +00:00 |
|
Matej Bačo
|
df9bc6df56
|
Implement OTP email endpoint + tests
|
2024-01-19 13:42:26 +00:00 |
|
Matej Bačo
|
31a67a7667
|
Merge remote-tracking branch 'origin/1.5.x' into feat-email-otp
|
2024-01-19 12:12:07 +00:00 |
|
Matej Bačo
|
f2291f1686
|
Add OTP translations
|
2024-01-19 12:11:20 +00:00 |
|
Khushboo Verma
|
3e5443f127
|
Add env variables to mails worker instead of webhooks worker
|
2024-01-19 17:09:48 +05:30 |
|
Matej Bačo
|
20322589dd
|
Improve SMTP test email design
|
2024-01-17 11:22:08 +00:00 |
|
Khushboo Verma
|
c9cd4c126c
|
Move media query to base template
|
2024-01-16 20:43:00 +05:30 |
|
Matej Bačo
|
bb87ca3869
|
Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test
|
2024-01-16 15:04:20 +00:00 |
|
Khushboo Verma
|
2bc50b2cee
|
Send email to all members of the org
|
2024-01-16 19:09:33 +05:30 |
|
Khushboo Verma
|
5f58dd8b9f
|
Merge branch 'feat-migrate-cloud-templates' into fix-limit-failed-webhook-attempts
|
2024-01-16 17:23:36 +05:30 |
|
Khushboo Verma
|
94a45c7829
|
Changed the name to email-base-styled.tpl
|
2024-01-16 17:22:27 +05:30 |
|
Khushboo Verma
|
206a268ff8
|
Merge branch 'feat-migrate-cloud-templates' into fix-limit-failed-webhook-attempts
|
2024-01-16 13:53:25 +05:30 |
|
Khushboo Verma
|
499920fc63
|
email-base for normal and email-base-branded for dev emails
|
2024-01-16 13:52:33 +05:30 |
|
Khushboo Verma
|
302a552d7f
|
Merge branch 'feat-migrate-cloud-templates' into fix-limit-failed-webhook-attempts
|
2024-01-16 13:36:33 +05:30 |
|
Khushboo Verma
|
278f41f0fb
|
Updated templates
|
2024-01-16 13:35:31 +05:30 |
|
Khushboo Verma
|
5904b17b5c
|
Design changes
|
2024-01-15 17:07:12 +05:30 |
|
Matej Bačo
|
ffa4ad09ec
|
Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test
|
2024-01-15 11:07:32 +00:00 |
|
Matej Bačo
|
d5be48a846
|
Finish custom SMTP feature
|
2024-01-15 10:18:17 +00:00 |
|
Khushboo Verma
|
882e049ac9
|
Merge branch 'feat-migrate-cloud-templates' into fix-limit-failed-webhook-attempts
|
2024-01-15 13:05:05 +05:30 |
|
Khushboo Verma
|
088ed95f69
|
Force background color to white for now
|
2024-01-13 01:18:20 +05:30 |
|
Khushboo Verma
|
c2ab8a1472
|
Addressed PR comments
|
2024-01-13 01:08:18 +05:30 |
|
Khushboo Verma
|
a9ccfa1ab0
|
Added cloud base templates to appwrite/appwrite
|
2024-01-12 14:43:17 +05:30 |
|
Khushboo Verma
|
d443602cbc
|
resolve merge conflicts
|
2024-01-12 01:55:32 +05:30 |
|
Matej Bačo
|
931efe24a9
|
Added security phrase to magic URL
|
2024-01-10 14:52:32 +00:00 |
|
Khushboo Verma
|
f6830f4e85
|
Resolve merge conflict
|
2024-01-10 19:38:55 +05:30 |
|
Khushboo Verma
|
7393bfc244
|
Use phtml instead of translation files for webhook email
|
2024-01-10 19:35:25 +05:30 |
|
Matej Bačo
|
4e73c76538
|
Add OTP email template
|
2024-01-10 13:28:49 +00:00 |
|
Khushboo Verma
|
ef88ad6514
|
Updated the email
|
2024-01-10 15:03:36 +05:30 |
|
Khushboo Verma
|
b3e87d7de8
|
Formatted email as per design
|
2024-01-10 01:55:36 +05:30 |
|
Matej Bačo
|
c8b544da03
|
Improve button design
|
2024-01-09 16:06:24 +00:00 |
|
Matej Bačo
|
86158838a1
|
Magic URL improvements
|
2024-01-09 12:23:13 +00:00 |
|
Torsten Dittmann
|
9bc52e8900
|
fix: commatation in email html
|
2023-12-13 18:08:36 +01:00 |
|
Torsten Dittmann
|
7645d6c34a
|
fix: email templates
|
2023-12-13 17:46:14 +01:00 |
|
Jake Barnby
|
781aa8025a
|
Fix style typo
|
2023-08-30 20:39:40 -04:00 |
|
Matej Bačo
|
c98d5bd3cd
|
Fix SMTP after QA
|
2023-08-29 11:40:30 +02:00 |
|
Bradley Schofield
|
c566843518
|
Style Changes
|
2023-08-28 09:35:26 +01:00 |
|
Bradley Schofield
|
82f400d177
|
Add more HTML back
|
2023-08-28 09:03:55 +01:00 |
|
Bradley Schofield
|
1f1e7dd397
|
Remove Testing Bypasses
|
2023-08-28 05:55:40 +01:00 |
|
Bradley Schofield
|
608b6b3847
|
Continue work
|
2023-08-27 23:45:37 +01:00 |
|
Damodar Lohani
|
3469c7ad2f
|
fix word wrap issue
|
2023-06-07 01:03:12 +00:00 |
|