1
0
Fork 0
mirror of synced 2024-07-24 07:46:14 +12:00
Commit graph

3187 commits

Author SHA1 Message Date
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 89f778014a Fix invalid specs 2024-01-23 09:27:25 +00: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
Torsten Dittmann a9f1e4d78d
feat: delete account (#7392)
* feat: delete account

* fix: new endpoint only for console sdk

* fix: hide endpoint from public sdks

* fix: account delete scope
2024-01-22 18:29:10 +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
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 05a83d6d1b Merge branch 'feat-email-otp' of https://github.com/appwrite/appwrite into feat-email-otp 2024-01-22 15:02:51 +00:00
Matej Bačo fc3fa8f1d7 PR review changes 2024-01-22 15:02:33 +00:00
Matej Bačo f7e9d8fc19
Update app/config/locale/translations/en.json
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-22 15:57:06 +01:00
Matej Bačo cba974805d PR review changes 2024-01-22 14:30:11 +00:00
Christy Jacob 3656be3da5
Merge pull request #7452 from appwrite/feat-session-renewal
Feat: session renewal
2024-01-22 18:28:55 +04:00
Matej Bačo 33e1d61bd9 Fix missing languages 2024-01-22 13:18:19 +00:00
Matej Bačo 58fa2efad2 Translate new keys 2024-01-22 11:15:24 +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
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 32cc186ea6 Merge remote-tracking branch 'origin/1.5.x' into feat-session-renewal 2024-01-22 08:17:52 +00:00
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 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 59c4f5b9e4
Merge pull request #7431 from appwrite/feat-message-scheduling
Feat message scheduling
2024-01-19 16:55:49 +13:00
Jake Barnby c5c832eff6
Merge pull request #7382 from appwrite/feat-search-subscribers
Add search param for list subscribers endpoint
2024-01-19 16:31:48 +13:00
Jake Barnby d292562090
Throw if status scheduled and no schedule set 2024-01-19 16:16:24 +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
Khushboo Verma e9aab8d9ee Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-18 15:21:55 +05:30
Matej Bačo 1948ecf9a4 Update specs 2024-01-17 13:21:10 +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 0092af7ac6 chore: rename new scopes 2024-01-17 11:17:03 +00:00
Jake Barnby 58f87ef27f
Fix account target route not added to specs 2024-01-17 22:21:15 +13:00
Jake Barnby 47c4272686
Add latest specs for pulling in SDK generator 2024-01-17 22:02:07 +13:00
Jake Barnby b74733102e
Merge branch '1.5.x' into feat-message-scheduling 2024-01-17 15:51:29 +13: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
loks0n 77b1762514 chore: fix token event 2024-01-16 10:40:49 +00:00
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
Matej Bačo 4f5755e7d0 Implement session renewal 2024-01-15 13:43:21 +00:00