1
0
Fork 0
mirror of synced 2024-08-02 20:12:01 +12:00
Commit graph

18841 commits

Author SHA1 Message Date
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
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
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
Steven Nguyen
6d357d617d Add a flag to install and upgrade commands to not start Appwrite
This can be useful for cases where the developer only wants the files
to be generated and doesn't want to start Appwrite.
2023-12-11 23:37:32 +00:00
Khushboo Verma
ff7cfc6602 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-12-12 00:17:21 +05:30
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
Christy Jacob
72a2a043cd fix: linter 2023-12-09 00:28:10 +01:00
Christy Jacob
aa7d1a87f4 fix: failing tests 2023-12-09 00:27:35 +01:00
Christy Jacob
731e7b86a7 fix: failing tests 2023-12-09 00:17:13 +01:00
Christy Jacob
8b5783d3ff fix: update setParam 2023-12-08 21:02:07 +01:00
Christy Jacob
ab84fa8a4d Merge branch 'fix-cookie-issue' of github.com:appwrite/appwrite into fix-cookie-issue 2023-12-08 20:39:14 +01:00
Christy Jacob
9dca3c4300 fix: linter 2023-12-08 20:38:55 +01:00
Christy Jacob
5606402fa3
Merge branch '1.4.x' into fix-cookie-issue 2023-12-08 20:37:06 +01:00
Christy Jacob
5d121c1887 fix: reset the legacy cookie 2023-12-08 20:36:22 +01:00
Christy Jacob
1e9ee66231 chore: reset old cookie 2023-12-08 20:30:04 +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
Torsten Dittmann
610b9518fb
Merge pull request #7258 from appwrite/feat-upgrade-console-3.2.15
feat: upgrade console to 3.2.15
2023-12-08 18:21:27 +01:00
Torsten Dittmann
c1af9f4201 feat: upgrade console to 3.2.15 2023-12-08 18:09:06 +01:00
Christy Jacob
c60524e11f
Merge pull request #7256 from appwrite/revert-7241-update-swoole-base-image
Revert "Update appwrite base image"
2023-12-07 17:50:48 +01:00
Christy Jacob
ea3b9ca0ec
Revert "Update appwrite base image" 2023-12-07 17:37:15 +01:00
Prateek Banga
194bbbb350 review changes 2023-12-05 19:24:55 +01:00
Torsten Dittmann
14e2488f98 chore: bump version 2023-12-05 18:20:47 +01:00
Christy Jacob
aae672d3be
Merge pull request #7241 from appwrite/update-swoole-base-image
Update appwrite base image
2023-12-05 15:58:32 +01:00
德华 刘
298d6ea917 fix: revert qr code quality 2023-12-05 14:41:05 +00:00
德华 刘
fa7f9be6f7 fix: update image sizes in graphQL test 2023-12-05 14:25:19 +00:00
德华 刘
1595d41490 fix: update qr code test images due to Imagemagic extension upgrade in the base image 2023-12-05 14:13:24 +00:00
Prateek Banga
e7dca6b2d5 adds uniform logic for worker and extra params for email 2023-12-05 15:01:32 +01:00
Jake Barnby
7e8122749b
Merge pull request #7227 from appwrite/frontend-review-changes
misc changes
2023-12-05 12:45:12 +01:00
Prateek Banga
54f574906c review changes 2023-12-05 12:22:32 +01:00
德华 刘
38a3c08772 chore: update docker base image 2023-12-05 09:16:35 +00:00
Christy Jacob
f2d20cc5c2
Merge pull request #7240 from appwrite/update-console
chore: update console version
2023-12-05 05:12:55 +04:00
德华 刘
f127ca651f chore: update console version 2023-12-05 00:54:52 +00:00
Prateek Banga
f9dd40120e resolve update twilio provider 2023-12-04 15:48:37 +01:00
Torsten Dittmann
4e7b61b6c8 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into 1.4.x 2023-12-04 10:45:34 +01:00