Commit Graph

6867 Commits

Author SHA1 Message Date
Prateek Banga a719c3f46b adds event label to create providers endpoint 2023-10-31 23:17:58 +05:30
loks0n af0d689aff feat: sessions scope 2023-10-31 15:05:02 +00:00
loks0n 4559cf77e9 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-31 12:08:48 +00:00
Christy Jacob 9fded16d3f Merge pull request #7053 from appwrite/1.4.x
Sync main with 1.4.x
2023-10-31 12:27:08 +04:00
prateek banga a01d361886 review changes 2023-10-31 01:12:31 +05:30
prateek banga 06daa544e8 review changes 2023-10-30 23:37:57 +05:30
德华 刘 744f2fbc1c chore: update project creation database allocation 2023-10-30 14:46:54 +00:00
Christy Jacob e17bb94e39 Merge pull request #6495 from appwrite/fix-mails
Fix certificate emails and add support for variables in email template subject
2023-10-27 19:17:50 +04:00
Khushboo Verma cba20d8b96 Addressed PR comments 2023-10-27 19:38:33 +05:30
Prateek Banga bc6df4bab7 add recipients array check in API instead of worker 2023-10-27 13:42:27 +05:30
Steven Nguyen 836ce852ed Refactor email templates
Update the mails worker to only be responsible for building the final
email using the base (layout) template and the user, team, project, and
redirect variables.

It is the responsibility of the controller to perform localization and
determine whether a custom or default email template should be used.
If the default one is used, it has to be rendered using the hello,
footer, thanks, and signature variables so that it matches the custom
template. Then, it can be sent to the worker.
2023-10-26 16:47:14 -07:00
Steven Nguyen 3206cee36f Leave user placeholder in default email template
This matches up with the default template and gives the developer an
idea about the available variables and how to use them.
2023-10-26 16:23:58 -07:00
Steven Nguyen 70a3820009 Remove unused mail vars 2023-10-26 16:23:58 -07:00
Prateek Banga 5a9b1f0c24 removes provider from topics 2023-10-26 19:44:06 +05:30
loks0n 49425fb8fc test: fix 2023-10-26 15:04:47 +01:00
prateek banga c2cd544948 review changes 2023-10-26 13:46:45 +05:30
Prateek Banga 34b3ed68ee adds total count for subscribers in topics model 2023-10-26 12:37:39 +05:30
prateek banga f6f4397aab Merge branch 'providers-from-attribute' of https://github.com/appwrite/appwrite into review-changes-1.5.x 2023-10-25 23:55:45 +05:30
prateek banga 887eeef585 review changes 2023-10-25 23:09:38 +05:30
prateek banga fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
loks0n b4773a7fbd Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-25 13:20:42 +01:00
loks0n 3a9202a46b chore: christy feedback 2023-10-25 13:20:29 +01:00
shimon 4c6976488c clean up 2023-10-25 15:06:54 +03:00
shimon b775c53666 clean up 2023-10-25 13:16:25 +03:00
shimon c11b3ff522 workers start hook 2023-10-25 12:46:45 +03:00
shimon b7675df9b9 usage workers 2023-10-25 11:38:44 +03:00
shimon 9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
Jake Barnby d5b6421285 Merge remote-tracking branch 'origin/1.4.x' into sync-1.4.x-to-1.5.x
# Conflicts:
#	composer.lock
2023-10-24 19:46:57 +13:00
prateek banga b60cbcada5 adds from field in remaining providers 2023-10-24 01:05:46 +05:30
loks0n a67ca55af5 fix: use queueForEvents in users 2023-10-23 11:32:09 +01:00
Khushboo Verma 2cf8639b68 Resolve merge conflicts 2023-10-23 15:06:01 +05:30
德华 刘 3dee8d6ecd fix: update incorrect method call 2023-10-23 08:34:57 +00:00
Shimon Newman 808f682fa7 Update app/controllers/api/projects.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-10-23 11:25:31 +03:00
shimon 2ef8490691 fix mod condition 2023-10-23 11:22:28 +03:00
loks0n 1343d4851a Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-23 09:10:57 +01:00
shimon b09a254d3c fix mod condition 2023-10-23 10:46:15 +03:00
shimon a841734d50 fix mod condition 2023-10-23 01:05:10 +03:00
shimon ac231914d4 fix mod condition 2023-10-23 00:55:57 +03:00
shimon 0d5127d90b fix mod condition 2023-10-23 00:08:55 +03:00
德华 刘 00d2a5ffcd chore: update create projects endpoints 2023-10-22 18:33:15 +00:00
德华 刘 79612bd80f Merge branch 'main' of https://github.com/appwrite/appwrite into feat-sm-db 2023-10-22 18:30:14 +00:00
prateek banga af40c63357 review changes 2023-10-20 17:02:13 +05:30
prateek banga 6c260223ba Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 15:00:22 +05:30
prateek banga 161bbfb822 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 14:55:17 +05:30
Prateek Banga d714760eb8 review changeS 2023-10-20 13:51:13 +05:30
prateek banga 24b2d70441 review changes 2023-10-20 13:33:27 +05:30
prateek banga e4d2d15f70 review changes 2023-10-20 13:31:56 +05:30
prateek banga db9e7b0199 review changes 2023-10-20 13:28:23 +05:30
Christy Jacob 21b9716bb2 Merge pull request #6959 from appwrite/chore-update-backup-timings
chore: update backup timings
2023-10-19 20:40:43 +04:00
德华 刘 de8b9638d5 chore: update backup timings 2023-10-19 16:07:54 +00:00