Commit Graph

6937 Commits

Author SHA1 Message Date
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
Jake Barnby 23b39fee02 FIx FCM tests 2023-12-17 12:41:20 +13:00
Matej Bačo 8c1363529e Add Hooks 2023-12-15 23:19:43 +01: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 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
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
德华 刘 dc89501012 chore: linter 2023-12-14 04:51:36 +00:00
德华 刘 1307f73c31 chore: refactor code 2023-12-14 04:49:16 +00: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
Luke B. Silver 60a0fefe56 Merge branch '1.4.x' into feat-ssr 2023-12-13 10:32:13 +00:00
Jake Barnby 276d671921 Add temp parsing code 2023-12-13 22:45:01 +13:00
德华 刘 f334168f90 fix: remove expired cookie 2023-12-13 08:45:47 +00:00
Khushboo Verma 16addeba10 Fixed some errors 2023-12-13 03:00:16 +05:30
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 063db1e2bf feat: add execution aggregation to project usage 2023-12-12 18:48:21 +01:00
loks0n fda9df069a feat: enable array sdk.method 2023-12-12 11:24:50 +00:00
loks0n fe695314a9 fix: tests 2023-12-11 19:41:58 +00: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
Torsten Dittmann 1794b1395a chore: run formatter 2023-12-11 16:33:15 +01:00
Torsten Dittmann ba75f69969 feat: usage breakdown by project 2023-12-11 16:19:08 +01:00
Torsten Dittmann c37e31e6c3 fix: inconsistent timestamp generation 2023-12-10 20:58:38 +01:00
Torsten Dittmann bb934080ba feat: project usage custom date range 2023-12-10 10:26:33 +01:00
Christy Jacob 4f1d8ed6f4 fix: revert files 2023-12-09 01:36:57 +01:00
Christy Jacob 951a749b50 fix: revert files 2023-12-09 01:19:36 +01:00
Christy Jacob c21a063642 fix: failing tests 2023-12-09 01:02:13 +01:00
Christy Jacob 9dca3c4300 fix: linter 2023-12-08 20:38:55 +01:00
Christy Jacob 5d121c1887 fix: reset the legacy cookie 2023-12-08 20:36:22 +01:00
Christy Jacob eb61d5c25c chore: reset old cookie 2023-12-08 20:24:07 +01:00
Christy Jacob f5c2c8d8f7 chore: reset old cookie 2023-12-08 20:23:04 +01:00
Jake Barnby 4710310629 Check if self-hosted 2023-12-08 18:33:35 +01:00
Prateek Banga b8aa2faa7b adds scheduling commit, still need to resolve pools error 2023-12-07 11:25:19 +01:00
Torsten Dittmann 83c411e5fd fix: some fixes 2023-12-07 10:05:37 +01:00
fogelito 4af00914a5 changes 2023-12-06 16:15:21 +01:00