1
0
Fork 0
mirror of synced 2024-08-04 04:52:03 +12:00
Commit graph

18554 commits

Author SHA1 Message Date
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
Christy Jacob
3caa49a547
Merge pull request #6938 from appwrite/fix-gitpod-composer-install
gitpod: fix composer usage
2023-10-27 00:39:32 +04:00
Torsten Dittmann
c81b4576b4 chore: remove install analytics 2023-10-26 22:25:35 +02:00
Christy Jacob
4becf5138d
Merge pull request #7011 from krishvsoni/kvs-patch
added docs url
2023-10-27 00:25:17 +04: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
shimon
45a0954b24 dry run 2023-10-26 21:12:43 +03:00
shimon
fc348b2055 dry run 2023-10-26 21:12:13 +03:00
shimon
7e6378b23b dry run 2023-10-26 20:56:32 +03:00
shimon
0f43aa6872 dry run 2023-10-26 20:53:36 +03:00
Christy Jacob
2b939a57d0
Merge pull request #6198 from appwrite/chhore-parallelize-tests
chore: test parallel executions
2023-10-26 21:28:43 +04:00
德华 刘
c8788e2a13 chore: update CI 2023-10-26 16:43:50 +00:00
德华 刘
09912592cf chore: update CI 2023-10-26 16:27:57 +00:00
德华 刘
c9c688c592 chore: update CI 2023-10-26 16:26:13 +00:00
德华 刘
5d634384c8 chore: update CI 2023-10-26 16:24:14 +00:00
德华 刘
a4c59b838a chore: remove commented files 2023-10-26 16:15:52 +00:00
Matej Bačo
c3a80dcebc Fix GraphQL function test 2023-10-26 16:50:35 +02:00
shimon
831122679f creating script 2023-10-26 17:45:23 +03:00
Prateek Banga
5a9b1f0c24 removes provider from topics 2023-10-26 19:44:06 +05:30
Christy Jacob
1d9b94ee4d
Merge branch 'main' into chhore-parallelize-tests 2023-10-26 14:31:21 +04:00
Jake Barnby
8628e94d0c
Merge pull request #7013 from appwrite/chore-updates-deps
Update database to include listCollections fix
2023-10-26 22:49:55 +13:00
Jake Barnby
89236955fb
Fix setting metadata 2023-10-26 22:28:23 +13:00
Jake Barnby
92062a5463
Merge pull request #7010 from appwrite/review-changes-1.5.x
made review changes
2023-10-26 21:45:39 +13:00
Jake Barnby
995c404f35
Update db 2023-10-26 21:24:30 +13:00
Jake Barnby
2d897889c9
Merge remote-tracking branch 'origin/main' into chore-updates-deps 2023-10-26 21:22:41 +13:00
prateek banga
c2cd544948 review changes 2023-10-26 13:46:45 +05:30
Prateek Banga
34c96e4672 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into review-changes-1.5.x 2023-10-26 12:37:51 +05:30
Prateek Banga
34b3ed68ee adds total count for subscribers in topics model 2023-10-26 12:37:39 +05:30
Jake Barnby
ea76bc6680
Merge pull request #6991 from appwrite/providers-from-attribute
Providers from attribute
2023-10-26 19:52:02 +13:00
Prateek Banga
9545e4ac72
Merge branch '1.5.x' into providers-from-attribute 2023-10-26 02:11:12 +05:30
prateek banga
456654c165 Merge branch 'providers-from-attribute' of https://github.com/appwrite/appwrite into review-changes-1.5.x 2023-10-26 00:03:13 +05:30
prateek banga
f5aa226b57 fix test 2023-10-26 00:02:22 +05:30
KRISH SONI
822596b2c9
Merge branch 'main' into kvs-patch 2023-10-25 23:56:54 +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
KRISH SONI
191235ecaf
added docs url 2023-10-25 23:24:26 +05:30
Torsten Dittmann
2910e87c7a
Merge pull request #7009 from appwrite/fix-worker-permissions-reset
fix: worker database authorization reset
2023-10-25 19:51:20 +02:00
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
Torsten Dittmann
404ad8653d fix: worker permissions reset 2023-10-25 19:23:55 +02:00
prateek banga
2435f722ca fixes test cases 2023-10-25 21:45:55 +05:30
Christy Jacob
fa0d9139c1
Merge pull request #7007 from appwrite/chore-bump-console
chore: bump console version
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
5732171a2a
Merge remote-tracking branch 'origin/1.4.x' into feat-query-metadata
# Conflicts:
#	app/init.php
#	composer.json
#	composer.lock
2023-10-25 18:21:16 +13:00
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