Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,344 Commits 1,269 Branches 495 Tags
1.4.x
Commit Graph

817 Commits

Author SHA1 Message Date
德华 刘 f334168f90 fix: remove expired cookie 2023-12-13 08:45:47 +00:00
Christy Jacob 951a749b50 fix: revert files 2023-12-09 01:19:36 +01:00
Christy Jacob 9dca3c4300 fix: linter 2023-12-08 20:38:55 +01:00
Christy Jacob 5d121c1887 fix: reset the legacy cookie 2023-12-08 20:36:22 +01:00
Christy Jacob eb61d5c25c chore: reset old cookie 2023-12-08 20:24:07 +01:00
Christy Jacob f5c2c8d8f7 chore: reset old cookie 2023-12-08 20:23:04 +01:00
Steven Nguyen 0c264a107a Merge branch '1.4.x' into fix-4797-verified-user-getting-email-verifications 2023-11-08 17:37:43 -08: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 70a3820009 Remove unused mail vars 2023-10-26 16:23:58 -07:00
shimon 593e5ab316 some fixes 2023-10-17 22:08:01 +03:00
shimon 94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
Yatharth Verma 96f389cee5 merge 1.4.x changes to my branch 2023-10-14 11:57:40 +05:30
shimon 429dabaaee sync with 1.4 2023-10-03 19:50:48 +03:00
shimon 2bb4d8fb89 sync with 1.4 2023-10-02 17:02:48 +03:00
shimon b02d51c794 migrations worker 2023-10-01 20:39:26 +03:00
shimon dcf0107a79 sync with master 2023-09-27 20:10:21 +03:00
shimon c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers 
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
 2023-09-27 18:51:17 +03:00
Vincent (Wen Yu) Ge 86f0e6008c Merge branch 'master' into sentence-case 2023-09-27 11:11:58 -04:00
Yatharth Verma 6b47999120 fix conflicts 2023-09-22 22:56:07 +05:30
Yatharth Verma f07f246f8d fix conflicts 2023-09-22 22:53:41 +05:30
Prateek Banga 15dd6863dd removes comments 2023-09-14 01:07:30 +05:30
Prateek Banga f8c9c2f39b fixes manual internal id insertion 2023-09-14 00:48:50 +05:30
Steven 62065a1c33 Fix create phone session abuse key 
Create phone session doesn't have anything to do with email. The key
name should be email just for clarity (even though, technically, it
doesn't matter).
 2023-09-03 21:37:02 +00:00
Christy Jacob 5dbec3d406 chore: remove redundant attribute 2023-08-30 18:43:09 -04:00
Christy Jacob 861921526e fix: remove redundant name property 2023-08-30 18:34:20 -04:00
Christy Jacob 74012158b3 fix: variable names 2023-08-30 17:54:26 -04:00
Christy Jacob 05615d1449 fix: missing variable in email templates 2023-08-30 17:52:55 -04:00
Christy Jacob 75e957ed4a fix: missing variable in email templates 2023-08-30 17:48:25 -04:00
Jake Barnby 3d0ae4b9d9 Remove invites codes 2023-08-30 00:31:38 -04:00
Jake Barnby a1d0b67c6b Fix SMTP 2023-08-30 00:30:44 -04:00
Matej Bačo c98d5bd3cd Fix SMTP after QA 2023-08-29 11:40:30 +02:00
Matej Bačo 89c9f8da6a Implement proper behaviour for SMTP sender 2023-08-28 14:19:37 +02:00
Bradley Schofield 82f400d177 Add more HTML back 2023-08-28 09:03:55 +01:00
Bradley Schofield 1be5f58fd9 Update account.php 2023-08-28 06:14:43 +01:00
Bradley Schofield ee0563c46f Cover other routes and cleanup code 2023-08-28 06:09:28 +01:00
Bradley Schofield 608b6b3847 Continue work 2023-08-27 23:45:37 +01:00
Matej Bačo 596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Jake Barnby 55deaec8b2 Fix missing env 2023-08-23 17:53:24 -04:00
Matej Bačo 43b1c196e0 Merge branch 'feat-git-integration' into feat-git-integration-copy 2023-08-23 10:16:23 +02:00
Jake Barnby a84e669a1f Add missing accessedAt values when creating users 2023-08-22 21:34:23 -04:00
Vincent (Wen Yu) Ge 31b8c77b5c Fix typos, improve a few errors 2023-08-22 20:30:00 +00:00
Vincent (Wen Yu) Ge 07a7a710ee Improve error and copy in params/models 2023-08-22 20:11:33 +00:00
Jake Barnby b48a64d1ad Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration 
# Conflicts:
#	app/controllers/api/functions.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
 2023-08-22 00:59:36 -04:00
Jake Barnby 942705b5f3 Fix database upgrade 2023-08-21 23:25:55 -04:00
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Jake Barnby a3895b041a Apply suggestions from code review 2023-08-17 21:48:21 -04:00
Steven Nguyen 09254aeae0 Add description for the delete account identity's identityId param 2023-08-09 09:25:29 -07:00
Steven Nguyen 5801a2cc39 Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-09 09:01:29 -07:00
Christy Jacob c009a12a25 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into 1.4.x 2023-08-08 20:51:31 +00:00
Christy Jacob 82a206d808 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-08-08 16:48:59 +00:00