Commit Graph
17938 Commits
Author SHA1 Message Date
Steven Nguyen 7c1ab91ebc Add support for variables in email template subject 2023-10-26 16:58:31 -07:00
Steven Nguyen fc4fa977a0 Update emails from certificate worker to match pattern of other emails
Since the certificate worker is sending a job to the mails worker just
like the controllers, it should prepare the email in the same way by
localizing and then sending the inner template for the mail worker to
apply the layout and final variables.

This commit also fixes a problem with a missing subject.
2023-10-26 16:56:44 -07:00
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
Christy Jacob ab760ba46b Merge pull request #7017 from appwrite/chore-remove-install-analytics
Remove install analytics
2023-10-27 01:09:51 +04:00
Torsten Dittmann c81b4576b4 chore: remove install analytics 2023-10-26 22:25:35 +02:00
Christy Jacob 16fe42bca9 Merge pull request #6980 from appwrite/feat-support-selfdb
Fix database override
2023-10-27 00:21:59 +04:00
Christy Jacob d16e3f2f56 Merge branch '1.4.x' into feat-support-selfdb 2023-10-27 00:19:02 +04:00
Torsten Dittmann 2910e87c7a Merge pull request #7009 from appwrite/fix-worker-permissions-reset
fix: worker database authorization reset
cl-1.4.7+5
2023-10-25 19:51:20 +02:00
Torsten Dittmann 404ad8653d fix: worker permissions reset 2023-10-25 19:23:55 +02:00
Christy Jacob fa0d9139c1 Merge pull request #7007 from appwrite/chore-bump-console
chore: bump console version
cl-1.4.7+4
2023-10-25 15:36:34 +04:00
Torsten Dittmann f9a3ae1421 chore: bump console version 2023-10-25 13:35:14 +02:00
Christy Jacob db52e047c6 Merge pull request #7006 from appwrite/fix-http-status-code
Updated the error code for unsupported protocol
2023-10-25 14:56:45 +04:00
Khushboo Verma 17de0d1ea7 Updated the error code for unsupported protocol 2023-10-25 15:55:46 +05:30
Jake Barnby 7d10174193 Merge pull request #7002 from appwrite/chore-updates-deps
Update dependencies
2023-10-25 14:32:08 +13:00
Jake Barnby 8db372a7d3 Update dependencies 2023-10-25 13:55:32 +13:00
Torsten Dittmann 5069aef6ac Merge pull request #6998 from appwrite/feat-realtime-error-handling
feat: realtime error handling
2023-10-24 16:12:21 +02:00
Torsten Dittmann fbcbd0d430 feat: realtime error handling 2023-10-24 14:32:22 +02:00
Christy Jacob 3a53dce467 Merge pull request #6994 from appwrite/1.4.x
Update main with 1.4.x
2023-10-24 01:11:13 +04:00
Christy Jacob 3e2b6c4344 Merge pull request #6990 from appwrite/feat-1.4.7-release-prep
Prepare 1.4.7 release
cl-1.4.7+1 1.4.7
2023-10-24 00:49:44 +04:00
Steven Nguyen 84ea81f56d Add 1.4.7 to CHANGES.md 2023-10-23 13:36:29 -07:00
Steven Nguyen 3addf76a2a Bump appwrite version to 1.4.7 2023-10-23 13:36:29 -07:00
Christy Jacob ce8c7e1527 Merge pull request #6988 from appwrite/fix-functions-worker
Fix missing body in async function execution
2023-10-23 23:40:58 +04:00
Torsten Dittmann 342deb4989 Merge pull request #6465 from appwrite/fix-docs-links
Fix docs links CONTRIBUTING.md
2023-10-23 19:24:43 +02:00
shimon 0411f9f530 fix function-worker body param typo 2023-10-23 16:33:26 +03:00
Christy Jacob 45c44bb51c Merge pull request #6986 from appwrite/fix-db-mod
fix mod condition
2023-10-23 12:41:05 +04:00
Christy Jacob 14f35589b3 Merge branch 'main' into fix-db-mod 2023-10-23 12:40:05 +04:00
德华 刘 3dee8d6ecd fix: update incorrect method call cl-1.4.6+5 2023-10-23 08:34:57 +00:00
Shimon NewmanandChristy Jacob 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
shimon b09a254d3c fix mod condition 2023-10-23 10:46:15 +03:00
Christy Jacob e2eccaca8b Merge pull request #6985 from appwrite/fix-db-mod
Fix db mod
2023-10-23 02:07:15 +04:00
shimon a841734d50 fix mod condition 2023-10-23 01:05:10 +03:00
Christy Jacob 765391cd7c Merge branch 'main' into feat-support-selfdb 2023-10-23 01:56:54 +04:00
shimon ac231914d4 fix mod condition 2023-10-23 00:55:57 +03:00
Christy Jacob d1deef43c5 Merge pull request #6984 from appwrite/fix-db-mod
fix mod condition
cl-1.4.6+3
2023-10-23 01:11:05 +04:00
shimon 0d5127d90b fix mod condition 2023-10-23 00:08:55 +03:00
Christy Jacob bb46e3869c Merge pull request #6851 from appwrite/feat-sm-db
update projects database
cl-1.4.6-2
2023-10-22 22:35:54 +04: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
Matej Bačo 1787e57448 Fix database override 2023-10-22 16:18:47 +02:00
Christy Jacob fc35e0f6ff Merge pull request #6954 from appwrite/1.4.x
Merge 1.4.x to main
cl-1.4.6+1 cl-1.4.26
2023-10-20 17:36:56 +04:00
Christy Jacob 3001cac2ba Merge pull request #6967 from appwrite/cl-1.4.x
Cl 1.4.x
cl-1.4.25 1.4.6
2023-10-20 17:03:16 +04:00
Christy Jacob f533ab9324 feat: add swoole hooks 2023-10-20 17:00:45 +04:00
Christy Jacob b9e5d0c890 feat: add swoole hooks 2023-10-20 16:59:07 +04:00
Christy Jacob ce14e05d1d chore: sync with 1.4.x 2023-10-20 16:58:15 +04:00
Christy Jacob df35c79bc2 chore: remove var_dumps 2023-10-20 16:56:34 +04:00
Christy Jacob 3acb68f364 Merge branch 'cl-1.4.x' of github.com:appwrite/appwrite into cl-1.4.x 2023-10-20 16:55:52 +04:00
Christy Jacob 15347cce4b chore: update CI 2023-10-20 16:55:29 +04:00