Commit Graph
31434 Commits
Author SHA1 Message Date
Matej Bačo 42246c5174 Fix console cl-billing+6 2023-12-19 18:07:07 +01:00
Matej Bačo b3729507de Add cache to console collection 2023-12-19 18:05:39 +01:00
loks0n 1b6a833bed fix: encode session for ssr clients 2023-12-19 15:45:44 +00:00
Eldad Fux 171d46b091 Added test 2023-12-19 16:19:57 +01:00
Eldad Fux 64138d6ccf Added new endpoint 2023-12-19 16:08:09 +01:00
loks0n 2c5c799d13 fix: add account session description 2023-12-19 14:24:49 +00:00
Matej Bačo b301a58b3e Update console cl-billing+5 2023-12-19 14:51:03 +01:00
Prateek Banga 1957bc57c2 makes messaging worker compatible with new messaging lib version 2023-12-19 18:28:25 +05:30
Matej BačoandGitHub 3abb53d3cb Merge pull request #7301 from appwrite/fix-rename-stats
rename stats collection
cl-billing+4
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 DittmannandGitHub 76e05983ff Merge pull request #7293 from appwrite/fix-sms-import
Fix SMS import
cl-1.4.13+15
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 JacobandGitHub 0f0d43298e Merge pull request #7291 from appwrite/update-console
chore: update console
cl-1.4.13+14
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
Jake Barnby fc101b7c05 Update lock 2023-12-15 18:24:37 +13:00
Jake Barnby 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
Jake Barnby 9c79e6bc23 Fix cache purge 2023-12-15 17:45:25 +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
fogelito 4ce312560b Connection problem 2023-12-14 18:17:19 +02:00
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 BarnbyandGitHub 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
fogelito cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
Jake Barnby 944e474ec4 Fix max array size 1 2023-12-15 02:30:44 +13:00
fogelito fa6952c246 Merge remote-tracking branch 'origin/json-parsing' into json-parsing 2023-12-14 14:42:51 +02:00
fogelito 57624ac65e composer updated 2023-12-14 14:42:38 +02:00
Christy JacobandGitHub 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 JacobandGitHub 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