121521d7c5
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
...
# Conflicts:
# composer.lock
# src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
# src/Appwrite/Platform/Tasks/Hamster.php
2023-12-15 18:22:08 +13:00
9c79e6bc23
Fix cache purge
2023-12-15 17:45:25 +13:00
557565b949
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2023-12-15 01:46:47 +05:30
d5cc9d9eea
Addressed PR Comments
2023-12-15 01:45:17 +05:30
4ce312560b
Connection problem
2023-12-14 18:17:19 +02:00
4e26bdb5df
Update update route params
2023-12-15 03:45:51 +13:00
7b99fab512
Use targets for cc/bcc
2023-12-15 03:19:24 +13:00
2eace5a627
Merge remote-tracking branch 'origin/1.5.x' into messaging-uniform-logic
...
# Conflicts:
# app/controllers/api/messaging.php
# composer.lock
2023-12-15 02:47:59 +13:00
91e3ea4bae
Merge pull request #7287 from appwrite/fix-list-sizes
...
Fix max array size 1
2023-12-15 02:42:45 +13:00
5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
...
# Conflicts:
# app/config/errors.php
# composer.lock
2023-12-15 02:41:46 +13:00
cc5ae73f57
purgeCached changes
2023-12-14 15:32:06 +02:00
944e474ec4
Fix max array size 1
2023-12-15 02:30:44 +13:00
fa6952c246
Merge remote-tracking branch 'origin/json-parsing' into json-parsing
2023-12-14 14:42:51 +02:00
57624ac65e
composer updated
2023-12-14 14:42:38 +02:00
b36c98af66
Merge pull request #7274 from appwrite/refactor-usage-execution-trigger
...
Refactor usage execution trigger
2023-12-14 06:16:01 +01:00
dc89501012
chore: linter
2023-12-14 04:51:36 +00:00
1307f73c31
chore: refactor code
2023-12-14 04:49:16 +00:00
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
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
9bc52e8900
fix: commatation in email html
2023-12-13 18:08:36 +01:00
06cd61e53a
Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn
2023-12-13 17:47:37 +01:00
7645d6c34a
fix: email templates
2023-12-13 17:46:14 +01:00
1349093b13
chore: fmt
2023-12-13 11:42:45 +00:00
92ccdd5144
fix: account tests
2023-12-13 11:29:30 +00:00
bdcb4c785e
test: account already logged in
2023-12-13 11:01:08 +00:00
3d4701abf4
Merge branch 'feat-ssr' of https://github.com/appwrite/appwrite into feat-ssr
2023-12-13 10:36:57 +00:00
78878c6ba0
chore: fmt
2023-12-13 10:36:49 +00:00
60a0fefe56
Merge branch '1.4.x' into feat-ssr
2023-12-13 10:32:13 +00:00
d623d4dcf9
Revert "test: fix gql tests"
...
This reverts commit 467f4eaa06
2023-12-13 10:26:57 +00:00
0e25d3e1df
fix: scopes
2023-12-13 10:25:20 +00:00
e7edf42947
Merge branch 'json-parsing' of github.com:appwrite/appwrite into json-parsing
2023-12-13 22:45:25 +13:00
276d671921
Add temp parsing code
2023-12-13 22:45:01 +13:00
c567e31c68
composer.lock
2023-12-13 11:41:35 +02:00
e56b30e6a6
Update tr.json
2023-12-13 12:10:44 +03:00
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
fb0cd95b0a
Class constant should be uppercase
2023-12-13 03:02:21 +05:30
16addeba10
Fixed some errors
2023-12-13 03:00:16 +05:30
cc67bcba28
Add group for cloud limit check
2023-12-12 21:33:02 +01:00
41ae96ea77
change execution usage trigger
2023-12-12 21:55:01 +02:00
bdf9a64771
change execution usage trigger
2023-12-12 21:21:47 +02:00
cf87cfab3a
Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn
2023-12-12 18:48:26 +01:00
063db1e2bf
feat: add execution aggregation to project usage
2023-12-12 18:48:21 +01:00
b2f118d23b
fix: specs
2023-12-12 15:42:22 +00:00
fe0001350d
feat: use x-appwrite-session header
2023-12-12 15:39:24 +00:00
2560681555
chore: fmt
2023-12-12 11:54:12 +00:00
db324ba0aa
chore: fmt
2023-12-12 11:54:05 +00:00
467f4eaa06
test: fix gql tests
2023-12-12 11:50:30 +00:00
fc504e3a68
Change collections priority for pricing override
2023-12-12 12:27:04 +01:00
7891f9e74c
refactor deletes worker
2023-12-12 11:26:44 +00:00
Jake Barnby
Khushboo Verma
fogelito
Christy Jacob
Steven Nguyen
Torsten Dittmann
loks0n
Serhat Aksakal
Matej Bačo
shimon
Damodar Lohani