1
0
Fork 0
mirror of synced 2024-10-03 19:53:33 +13:00
Commit graph

18769 commits

Author SHA1 Message Date
Damodar Lohani
e8ff828039 fix for file extension not supported
- the error occured with jfif extension, which is essentially a jpeg file
2023-12-28 01:31:25 +00:00
Torsten Dittmann
0fdc28e034
Merge pull request #7280 from appwrite/fix-7190-user-identity-incorrect-user
Fix user identity attaching to wrong user
2023-12-28 01:59:58 +01:00
Torsten Dittmann
d9b300051a
Merge pull request #7292 from appwrite/fix-7147-user-last-activity-not-updating
Fix user last activity not updating
2023-12-28 01:59:23 +01:00
Damodar Lohani
cbd3e85b38 fix formatting 2023-12-25 06:07:28 +00:00
Damodar Lohani
a6b4ade39b update large file upload test to not include update permission 2023-12-25 06:06:18 +00:00
Damodar Lohani
b6b1b396b3 update chunk upload test 2023-12-25 06:00:43 +00:00
Damodar Lohani
26ac88c32e validate create permission while updating chunk uploaded file 2023-12-25 05:54:59 +00:00
fogelito
5d41442838 getPDOAttributes 2023-12-24 11:55:51 +02:00
fogelito
91b53c2a7f remove ATTR_ERRMODE 2023-12-23 17:48:28 +02:00
Utkarsh Ahuja
d9319aa888 feat: added zoho oauth metadata 2023-12-23 17:42:34 +05:30
Christy Jacob
5cd94041dc
Merge pull request #7312 from appwrite/1.4.x
Sync main with 1.4.x
2023-12-21 11:40:35 +04:00
fogelito
babc4f2f76 Remove var dump 2023-12-20 13:54:20 +02:00
fogelito
dc203a494e Syntax change 2023-12-20 12:55:09 +02:00
prateek banga
5d7eca7c99 lint fix and tests fix 2023-12-19 23:45:20 +05:30
Prateek Banga
1957bc57c2 makes messaging worker compatible with new messaging lib version 2023-12-19 18:28:25 +05:30
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
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
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
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
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
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
Jake Barnby
e7edf42947
Merge branch 'json-parsing' of github.com:appwrite/appwrite into json-parsing 2023-12-13 22:45:25 +13:00
Jake Barnby
276d671921
Add temp parsing code 2023-12-13 22:45:01 +13:00
fogelito
c567e31c68 composer.lock 2023-12-13 11:41:35 +02: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
fogelito
310baef77f $queries to String 2023-12-10 20:05:33 +01:00
Christy Jacob
e605beaff2
Merge pull request #7260 from appwrite/fix-cookie-issue
Fix cookie issue
2023-12-09 01:54:56 +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
28d00668bd fix: failing tests 2023-12-09 00:48:34 +01:00
Christy Jacob
aeeb7e1d55 fix: failing tests 2023-12-09 00:36:01 +01:00
Christy Jacob
75e1779921 fix: failing tests 2023-12-09 00:29:14 +01:00