Torsten Dittmann
78f7b1897e
fix: hotfix for redirect param in custom templates ( #7437 )
...
* fix: hotfix for redirect param in custom templates
* fix: redirect param variables
* fix: variable typo
* chore: update comments for template variables
2024-01-11 21:36:05 +01:00
Torsten Dittmann
9ba2eafa83
fix: escape html in email params ( #7409 )
...
* fix: escape html in email params
* revert: phpunit stop on failure
* chore: fix linter
2024-01-08 18:08:17 +01: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
2451d9fef1
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-workers-sn
...
Conflicts:
src/Appwrite/Platform/Workers/Deletes.php
2023-10-16 17:06:59 +03:00
shimon
0e2c1c1f2d
small fixes
2023-10-16 16:20:41 +03:00
shimon
94178f8eaf
rollback to Usage
2023-10-15 20:41:09 +03:00
Torsten Dittmann
3778939605
fix: relative links to absolute
2023-10-13 15:43:23 +02: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
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
Steven Nguyen
6b0c24a9d6
Update user creation from teams and users services to not set accessedAt
...
accessedAt should only be updated when a user performs some sort of
action. Creating a user via the users API or by adding them to a team
is an action done by someone else, not the user themselves. As such,
the accessedAt timestamp shouldn't update.
2023-09-12 12:05:11 -07:00
Bradley Schofield
8357d20be7
Make URL optional for API and Serverside Requests
2023-09-05 19:13:47 +01:00
Christy Jacob
21dc3b16b0
chore: update changelog
2023-08-30 18:36:40 -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
75e957ed4a
fix: missing variable in email templates
2023-08-30 17:48:25 -04:00
Jake Barnby
d3929a5bae
Fix forced username and password requirement
2023-08-30 01:31:02 -04:00
Matej Bačo
c98d5bd3cd
Fix SMTP after QA
2023-08-29 11:40:30 +02:00
Matej Bačo
f130a9ebc9
linter fix
2023-08-28 14:21:35 +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
88d48715c5
Run Linter
2023-08-28 06:53:26 +01:00
Bradley Schofield
11dca76a70
Update teams.php
2023-08-28 06:53:02 +01:00
Matej Bačo
596e59f2cc
response format fix, smtp QA fixes
2023-08-25 17:13:25 +02:00
Jake Barnby
537756551e
Fix missing accessedAt
2023-08-22 21:36:04 -04:00
Jake Barnby
942705b5f3
Fix database upgrade
2023-08-21 23:25:55 -04:00
Jake Barnby
a77ff0a9b0
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
...
# Conflicts:
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
2023-08-17 19:54:25 -04:00
Jake Barnby
861ed521a0
Merge branch '1.4.x' into fix-team-update-membership
...
# Conflicts:
# app/config/specs/open-api3-1.4.x-client.json
# app/config/specs/open-api3-1.4.x-console.json
# app/config/specs/open-api3-1.4.x-server.json
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-1.4.x-client.json
# app/config/specs/swagger2-1.4.x-console.json
# app/config/specs/swagger2-1.4.x-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
2023-08-17 17:51:24 -04:00
Steven Nguyen
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x
2023-08-08 08:34:01 -07:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x
2023-08-04 18:07:33 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2
2023-08-04 13:55:07 -07:00
Steven Nguyen
a235024268
Separate OAuth2 info from Sessions into Identities
...
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-02 15:36:06 -07:00
Dakshi
12228ccef4
converted desc to sentence case
2023-08-01 20:56:48 +05:30
Steven Nguyen
611524476b
Merge branch 'master' into feat-master-to-1.4.x
2023-07-26 13:33:49 -07:00
Christy Jacob
0feaf41fcb
Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into feat-db-pools
2023-07-20 11:53:36 +00:00
Steven Nguyen
187f3dc6ff
Update get logs APIs to return userId from data
...
The audit userId is actually the internal id and the user id is in the
data attribute.
2023-07-19 22:49:51 -07:00
Steven Nguyen
2befa60350
Track a user's last activity
...
A user will have an accessedAt timestamp that will update at most once
per day if they make some API call. This timestamp can then be used
find active users and calculate daily, weekly, and monthly active users.
To ensure consistent updates to the user the $user from the resource
is always updated to the user making the request, including requests
like Create Account, Update Team Membership Status, and Create Phone
Session (confirmation). This ensures the shutdown can update the
accessedAt timestamp if there was a $user set.
2023-07-19 22:22:58 -07:00
Eldad A. Fux
66fee90af9
Merge pull request #5199 from appwrite/feat-custom-smtp
...
[FEAT] Custom SMTP and Template support
2023-07-20 07:09:11 +03:00
Damodar Lohani
4fd5c72f34
Merge branch 'master' into feat-1.4.x-with-1.3.x-master
2023-07-19 07:39:37 +00:00
Damodar Lohani
8dc5c2cb4c
Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp
2023-07-19 07:24:58 +00:00
Steven Nguyen
fce230dca8
Fix team delete
...
Ensure all memberships are deleted and the cached users are
invalidated so that the nested memberships will refresh.
2023-07-17 17:21:16 -07:00
jaivix
4db919b42d
linting and wording updates based on stnguyen90 feedback
2023-07-13 00:33:38 +05:30
Steven Nguyen
300d916621
Update get logs APIs to return userId from data
...
The audit userId is actually the internal id and the user id is in the
data attribute.
2023-07-12 10:27:57 -07:00
Damodar Lohani
0cff44b909
update description
2023-07-11 06:41:30 +00:00
Damodar Lohani
1207fb3cb1
Update teams.php
2023-07-11 11:56:42 +05:45
jaivix
a6671a5caa
fixed team creation response if teamId already exists
2023-07-09 16:50:09 +05:30
shimon
57bc7d0584
functions/builds/deletes worker
2023-06-11 17:08:48 +03:00
shimon
f1466c05cf
refactor workers
2023-05-29 16:58:45 +03:00