Christy Jacob
39d91aecf1
Merge pull request #7273 from appwrite/damodar/pea-15-refactor-maintenance-deletes-worker
...
PEA-15 Refactor Deletes and maintenance worker
2023-12-14 05:08:11 +01:00
Steven Nguyen
92a307c164
Fix user identity attaching to wrong user
...
Suppose a user has 2 accounts on Appwrite:
1. joe@example.com
2. joe@gmail.com
Prior to this PR, if joe@example.com created a Google OAuth2 session
using his joe@gmail.com email, a new joe@gmail.com identity would be
created linked to joe@example.com .
This is especially problematic because if the user tried to create a
Google OAuth2 session using joe@gmail.com , Appwrite would lookup the
user via email and find the joe@gmail.com user, but then find an
identity from joe@example.com . This mismatching user ID would then
cause an error.
This PR prevents an identity from being created if the email from the
OAuth2 provider matches another user's email.
2023-12-13 18:45:05 +00:00
Torsten Dittmann
9bc52e8900
fix: commatation in email html
2023-12-13 18:08:36 +01:00
Torsten Dittmann
06cd61e53a
Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn
2023-12-13 17:47:37 +01:00
Torsten Dittmann
7645d6c34a
fix: email templates
2023-12-13 17:46:14 +01:00
loks0n
1349093b13
chore: fmt
2023-12-13 11:42:45 +00:00
loks0n
92ccdd5144
fix: account tests
2023-12-13 11:29:30 +00:00
loks0n
bdcb4c785e
test: account already logged in
2023-12-13 11:01:08 +00:00
loks0n
3d4701abf4
Merge branch 'feat-ssr' of https://github.com/appwrite/appwrite into feat-ssr
2023-12-13 10:36:57 +00:00
loks0n
78878c6ba0
chore: fmt
2023-12-13 10:36:49 +00:00
Luke B. Silver
60a0fefe56
Merge branch '1.4.x' into feat-ssr
2023-12-13 10:32:13 +00:00
loks0n
d623d4dcf9
Revert "test: fix gql tests"
...
This reverts commit 467f4eaa06
2023-12-13 10:26:57 +00:00
loks0n
0e25d3e1df
fix: scopes
2023-12-13 10:25:20 +00:00
Jake Barnby
e7edf42947
Merge branch 'json-parsing' of github.com:appwrite/appwrite into json-parsing
2023-12-13 22:45:25 +13:00
Jake Barnby
276d671921
Add temp parsing code
2023-12-13 22:45:01 +13:00
fogelito
c567e31c68
composer.lock
2023-12-13 11:41:35 +02:00
Serhat Aksakal
e56b30e6a6
Update tr.json
2023-12-13 12:10:44 +03:00
Christy Jacob
d1850fca38
Merge pull request #7275 from appwrite/revert-expired-cookie
...
fix: remove expired cookie
2023-12-13 10:01:59 +01:00
德华 刘
f334168f90
fix: remove expired cookie
2023-12-13 08:45:47 +00:00
Khushboo Verma
fb0cd95b0a
Class constant should be uppercase
2023-12-13 03:02:21 +05:30
Khushboo Verma
16addeba10
Fixed some errors
2023-12-13 03:00:16 +05:30
Matej Bačo
cc67bcba28
Add group for cloud limit check
2023-12-12 21:33:02 +01:00
shimon
41ae96ea77
change execution usage trigger
2023-12-12 21:55:01 +02:00
shimon
bdf9a64771
change execution usage trigger
2023-12-12 21:21:47 +02:00
Torsten Dittmann
cf87cfab3a
Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn
2023-12-12 18:48:26 +01:00
Torsten Dittmann
063db1e2bf
feat: add execution aggregation to project usage
2023-12-12 18:48:21 +01:00
loks0n
b2f118d23b
fix: specs
2023-12-12 15:42:22 +00:00
loks0n
fe0001350d
feat: use x-appwrite-session header
2023-12-12 15:39:24 +00:00
loks0n
2560681555
chore: fmt
2023-12-12 11:54:12 +00:00
loks0n
db324ba0aa
chore: fmt
2023-12-12 11:54:05 +00:00
loks0n
467f4eaa06
test: fix gql tests
2023-12-12 11:50:30 +00:00
Matej Bačo
fc504e3a68
Change collections priority for pricing override
2023-12-12 12:27:04 +01:00
Damodar Lohani
7891f9e74c
refactor deletes worker
2023-12-12 11:26:44 +00:00
Damodar Lohani
5512123e04
loop through projects
2023-12-12 11:26:28 +00:00
Damodar Lohani
5c3bd741b4
fix resources
2023-12-12 11:26:14 +00:00
loks0n
fda9df069a
feat: enable array sdk.method
2023-12-12 11:24:50 +00:00
Damodar Lohani
d8fe96e300
set project resource
2023-12-12 11:08:14 +00:00
Damodar Lohani
e5fb743943
Merge pull request #7272 from appwrite/damodar/fla-127-make-maintenance-worker-aware-of-the-projects-plan
2023-12-12 10:47:52 +01:00
Damodar Lohani
9ac57e2e7a
remove unused retention
2023-12-12 08:11:01 +00:00
Damodar Lohani
104b8bb366
provide retention time as queue server resource
2023-12-12 08:07:24 +00:00
Steven Nguyen
6d357d617d
Add a flag to install and upgrade commands to not start Appwrite
...
This can be useful for cases where the developer only wants the files
to be generated and doesn't want to start Appwrite.
2023-12-11 23:37:32 +00:00
loks0n
453c1928ee
fix: teams tests
2023-12-11 20:56:59 +00:00
loks0n
fe695314a9
fix: tests
2023-12-11 19:41:58 +00:00
Torsten Dittmann
3d081e1aa5
fix: allow billingPlan query on teams
2023-12-11 19:48:52 +01:00
Khushboo Verma
ff7cfc6602
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2023-12-12 00:17:21 +05:30
loks0n
cb788b13bf
chore: remove unused imports
2023-12-11 18:36:17 +00:00
loks0n
1e8a931751
chore: format
2023-12-11 17:13:19 +00:00
loks0n
7ee4ad5ba9
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr
2023-12-11 16:52:14 +00:00
loks0n
f0d7312bd3
feat: create session method
2023-12-11 16:24:24 +00:00
Torsten Dittmann
5e74c5bbc4
fix: typo usage
2023-12-11 17:12:43 +01:00
