1
0
Fork 0
mirror of synced 2024-08-04 13:01:45 +12:00
Commit graph

19370 commits

Author SHA1 Message Date
Prateek Banga
1957bc57c2 makes messaging worker compatible with new messaging lib version 2023-12-19 18:28:25 +05:30
Matej Bačo
3abb53d3cb
Merge pull request #7301 from appwrite/fix-rename-stats
rename stats collection
2023-12-18 12:06:55 +01:00
Damodar Lohani
caa5c4e744 making visibility private 2023-12-18 10:20:00 +00:00
Damodar Lohani
1f558442d9 linter fix 2023-12-18 10:18:40 +00:00
Damodar Lohani
5e59d73f78 rename stats collection 2023-12-18 10:11:10 +00:00
Prateek Banga
6de2659793 adds mock providers in project for benchmarking, fixes bug in scheduling
removes scheduling from array in schedulemessage task
2023-12-18 15:27:09 +05:30
shimon
9f1b356a79 combining network inbound
and network outbound on
hamster script
2023-12-18 11:37:54 +02:00
Jake Barnby
23b39fee02
FIx FCM tests 2023-12-17 12:41:20 +13:00
Torsten Dittmann
76e05983ff
Merge pull request #7293 from appwrite/fix-sms-import
Fix SMS import
2023-12-16 19:12:50 +01:00
Steven Nguyen
e41194ee3c
Fix import to match class name
The class is SMS rather than Sms.
2023-12-16 17:42:29 +00:00
Matej Bačo
0aaab63b8c Remove var dumps 2023-12-15 23:37:31 +01:00
Matej Bačo
8c1363529e Add Hooks 2023-12-15 23:19:43 +01:00
Steven Nguyen
6d17f8e877
Fix user last activity not updating
Add back a section of code that was mistakenly removed.
2023-12-15 21:37:26 +00:00
Christy Jacob
0f0d43298e
Merge pull request #7291 from appwrite/update-console
chore: update console
2023-12-15 21:58:28 +01:00
德华 刘
6b6946e39b chore: update console 2023-12-15 20:40:04 +00:00
Jake Barnby
8fc3f99a8e
Update messaging lib 2023-12-15 19:55:50 +13:00
Khushboo Verma
557565b949 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-12-15 01:46:47 +05:30
Khushboo Verma
d5cc9d9eea Addressed PR Comments 2023-12-15 01:45:17 +05:30
Jake Barnby
4e26bdb5df
Update update route params 2023-12-15 03:45:51 +13:00
Jake Barnby
7b99fab512
Use targets for cc/bcc 2023-12-15 03:19:24 +13:00
Jake Barnby
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
Jake Barnby
91e3ea4bae
Merge pull request #7287 from appwrite/fix-list-sizes
Fix max array size 1
2023-12-15 02:42:45 +13:00
Jake Barnby
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
Jake Barnby
944e474ec4
Fix max array size 1 2023-12-15 02:30:44 +13:00
Christy Jacob
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
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
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