Commit Graph
12952 Commits
Author SHA1 Message Date
Matej Bačo 9c510dace8 Update console 2023-12-20 13:30:15 +01:00
Matej Bačo 56a374e0af Upgrade console 2023-12-20 12:41:07 +01:00
fogelito dc203a494e Syntax change 2023-12-20 12:55:09 +02:00
Matej Bačo 457e47cdd7 Upgrade console 2023-12-20 11:12:16 +01:00
Eldad Fux 90e8e04e08 Fixed test 2023-12-20 00:15:45 +01:00
Eldad Fux ed999031d0 Fixed whitespace 2023-12-19 22:46:35 +01:00
Matej Bačo 683fccc080 Update console 2023-12-19 21:28:51 +01:00
prateek banga 5d7eca7c99 lint fix and tests fix 2023-12-19 23:45:20 +05:30
Matej Bačo 42246c5174 Fix console 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 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 2023-12-19 14:51:03 +01: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
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
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
德华 刘 6b6946e39b chore: update console 2023-12-15 20:40:04 +00: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
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 7645d6c34a fix: email templates 2023-12-13 17:46:14 +01: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. SilverandGitHub 60a0fefe56 Merge branch '1.4.x' into feat-ssr 2023-12-13 10:32:13 +00:00
loks0n 0e25d3e1df fix: scopes 2023-12-13 10:25:20 +00:00
Jake Barnby 276d671921 Add temp parsing code 2023-12-13 22:45:01 +13:00
Serhat AksakalandGitHub e56b30e6a6 Update tr.json 2023-12-13 12:10:44 +03: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