Khushboo Verma
bb7278dd12
Merge branch 'refactor-vcs-tests' of github.com:appwrite/appwrite into refactor-vcs-tests
2023-10-27 18:14:47 +05:30
Khushboo Verma
36fcc6c293
Resolve merge conflicts
2023-10-27 18:13:50 +05:30
Matej Bačo
0a1a2af218
Connect VCS base to VCS test
2023-10-27 12:57:26 +02:00
Matej Bačo
84559b8f56
Improve cookie test
2023-10-27 12:01:37 +02:00
Christy Jacob
3700751592
Merge pull request #7016 from appwrite/main
...
Sync 1.4.x with main
2023-10-27 13:35:54 +04:00
德华 刘
2ee505b3f8
chore: update composer
2023-10-27 09:35:36 +00:00
Jake Barnby
26ecad1a6f
Merge pull request #7014 from appwrite/feat-remove-provider-from-topics
...
removes provider from topics
2023-10-27 22:34:21 +13:00
Matej Bačo
740d9def8e
Linter fix
2023-10-27 10:33:08 +02:00
Matej Bačo
94ff3baa9c
Fix cookie headers
2023-10-27 10:26:46 +02:00
Prateek Banga
bc6df4bab7
add recipients array check in API instead of worker
2023-10-27 13:42:27 +05:30
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
Jake Barnby
cb03ad1a15
Merge pull request #7003 from appwrite/feat-query-metadata
...
Feat query metadata
2023-10-27 12:52:34 +13: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
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
