1
0
Fork 0
mirror of synced 2024-09-03 03:11:39 +12:00
Commit graph

10118 commits

Author SHA1 Message Date
Steven Nguyen
c1df289df7
Bump appwrite version to 1.4.8 2023-10-27 10:31:43 -07:00
Steven Nguyen
3abb74c937
Bump console to version 3.2.5 2023-10-27 09:33:21 -07:00
Christy Jacob
106f4cfc45
Merge pull request #6487 from appwrite/fix-unique-in-errors
Updated error message to not user magic strings
2023-10-27 20:13:16 +04:00
Christy Jacob
bcdebee598
Merge pull request #7024 from appwrite/fix-cookie-header
Fix: Cookie Header
2023-10-27 19:36:05 +04:00
Matej Bačo
9a6d5f8101 Improve var name 2023-10-27 17:25:19 +02:00
Matej Bačo
71807635b3 Move cookie-header logic to request 2023-10-27 17:23:43 +02: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
Christy Jacob
21220a2051
Merge pull request #6894 from appwrite/refactor-vcs-tests
Add VCS tests
2023-10-27 19:04:44 +04:00
德华 刘
6d237853e6 chore: revert console 2023-10-27 14:38:09 +00:00
Khushboo Verma
cba20d8b96 Addressed PR comments 2023-10-27 19:38:33 +05:30
Khushboo Verma
36fcc6c293 Resolve merge conflicts 2023-10-27 18:13:50 +05:30
Christy Jacob
3700751592
Merge pull request #7016 from appwrite/main
Sync 1.4.x with main
2023-10-27 13:35:54 +04: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
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
Jake Barnby
89236955fb
Fix setting metadata 2023-10-26 22:28:23 +13:00
Jake Barnby
995c404f35
Update db 2023-10-26 21:24:30 +13:00
Torsten Dittmann
404ad8653d fix: worker permissions reset 2023-10-25 19:23:55 +02:00
Torsten Dittmann
f9a3ae1421 chore: bump console version 2023-10-25 13:35:14 +02: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
Torsten Dittmann
fbcbd0d430 feat: realtime error handling 2023-10-24 14:32:22 +02:00
Steven Nguyen
3addf76a2a Bump appwrite version to 1.4.7 2023-10-23 13:36:29 -07:00
Khushboo Verma
2cf8639b68 Resolve merge conflicts 2023-10-23 15:06:01 +05:30
Khushboo Verma
97c1099961 Refactor code and add more assertions 2023-10-23 15:03:24 +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
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
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
shimon
8048766d28 queues fixes 2023-10-19 18:28:01 +03:00
Matej Bačo
20c37db8fc Upgrade executor 2023-10-19 11:54:56 +02:00
Christy Jacob
01e842782f
Merge branch '1.4.x' into feat-1.4.6-release-prep 2023-10-19 05:28:02 -04:00
Christy Jacob
4b08729131
Update app/init.php 2023-10-19 05:27:52 -04:00
Christy Jacob
18dc8749d5 chore: update health API 2023-10-19 09:25:38 +00:00
Christy Jacob
a46b3d088c
Merge branch '1.4.x' into feat-api-db-timeout 2023-10-19 05:15:44 -04:00
Jake Barnby
03b6d65669
Add timeout on vcs project DBs 2023-10-19 17:21:11 +13:00
Jake Barnby
b5cdbb50c7
Use fixed message 2023-10-19 17:12:05 +13:00
Jake Barnby
354211950f
Add timeout test 2023-10-19 17:06:57 +13:00
Jake Barnby
b6b8fe7d51
Allow overriding timeout per request in dev mode 2023-10-19 16:19:40 +13:00
Jake Barnby
b17e24f645
Use const for timeout 2023-10-19 15:45:32 +13:00