loks0n
8ea9706174
feat: Matej renaming plan
2023-11-30 11:35:52 +00:00
loks0n
88aa4d726c
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr
2023-11-21 14:54:57 +00:00
loks0n
830544e245
fix: logged in ssr cases
2023-11-15 11:57:27 +00: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
loks0n
df0271c56a
chore: rename to 'custom' sessions
2023-11-02 13:22:10 +00:00
loks0n
af0d689aff
feat: sessions
scope
2023-10-31 15:05:02 +00:00
loks0n
4559cf77e9
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-31 12:08:48 +00: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
loks0n
49425fb8fc
test: fix
2023-10-26 15:04:47 +01:00
loks0n
3a9202a46b
chore: christy feedback
2023-10-25 13:20:29 +01:00
loks0n
1343d4851a
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-23 09:10:57 +01: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
loks0n
250e9ae9f7
chore: cleanup pr
2023-10-13 16:10:55 +01:00
loks0n
63d3a2bc73
chore: revert abuse-key changes
2023-10-13 11:08:25 +01:00
loks0n
81c4a9bbd5
chore: fmt
2023-10-13 11:05:14 +01:00
loks0n
8ab429b92f
feat: replace session confirmation endpoints
2023-10-12 14:38:32 +01:00
loks0n
b299ed056e
chore: rename $sessionSecret
2023-10-11 17:07:02 +01:00
loks0n
f9d6ebd3a0
docs: add descriptions to universal token endpoints
2023-10-11 16:31:32 +01:00
loks0n
e41fab769f
fix: edge cases
2023-10-11 13:20:25 +01:00
loks0n
c343d7550f
chore: fmt
2023-10-10 14:41:02 +01:00
loks0n
c30c024805
test: fix magic url assertions
2023-10-10 14:36:53 +01:00
loks0n
a88175fc46
fix: unhash session responses
2023-10-10 13:30:42 +01:00
loks0n
c4e82e4191
fix: edge cases
2023-10-09 14:49:07 +01:00
loks0n
e94631f730
fix: token verification
2023-10-05 11:18:19 +01:00
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
loks0n
739be813e0
feat: oauth ssr token flow
2023-09-28 13:45:52 +01:00
loks0n
5ed2da4cf1
feat: add userId to abuse-keys
2023-09-28 11:33:01 +01:00
loks0n
b8f2c1deec
chore: revert oauth workaround
2023-09-28 11:26:44 +01:00
loks0n
ef93c59698
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-09-28 11:21:26 +01: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