Commit Graph

6310 Commits

Author SHA1 Message Date
shimon 6bb20ca047 Merge branch '1.7.x' of github.com:appwrite/appwrite into delete-project-scope 2025-06-15 12:41:15 +03:00
Steven Nguyen 160c937dc2 fix: prevent 'Attribute "factors" must be an array' error
Because array_unique() preserves keys, the $factors can go from:

[
    0 => 'password',
    1 => 'totp',
    2 => 'totp',
    3 => 'email'
]

to:

[
    0 => 'password',
    1 => 'totp',
    3 => 'email'
]

and because this is not an array list, the validation fails.

Using array_values() after array_unique() will reset the keys to be sequential, resulting in:

[
    0 => 'password',
    1 => 'totp',
    2 => 'email'
]
2025-06-13 09:17:05 -07:00
Khushboo Verma 221f15313c Update var name and generate specs 2025-06-13 15:55:02 +05:30
Khushboo Verma 4099f8968a Merge branch '1.7.x' into feat-ref-param-to-vcs-list-contents 2025-06-13 15:51:35 +05:30
Chirag Aggarwal 851894947f chore: restore unique filename for health check #9842 2025-06-11 03:55:11 +00:00
Khushboo Verma 72090248e5 Add ref param to vcs list contents 2025-06-10 20:37:37 +05:30
shimon c50c0e2da6 Merge branch '1.7.x' of github.com:appwrite/appwrite into delete-project-scope 2025-06-03 10:16:58 +03:00
Khushboo Verma 0ac6decc99 Fix github comments and deployment creation on branch deletion 2025-06-02 14:04:03 +05:30
Darshan e1ee9ba89e fix: logic. 2025-05-30 18:04:57 +05:30
Darshan 4fc84bec7d reset: stuff on target branch. 2025-05-30 14:33:37 +05:30
Darshan f7f746a543 Merge branch '1.7.x' into 'fix-teams-deletion'. 2025-05-30 14:25:22 +05:30
Darshan 65ae22d7cd update: messages because the check is only for console project > organizations. 2025-05-30 14:08:25 +05:30
Darshan 2ef2c59d18 update: exceptions and messages. 2025-05-30 14:03:51 +05:30
Jake Barnby 61f0e5b3f3 Merge pull request #9920 from appwrite/feat-sync-1.6
Feat sync 1.6
2025-05-28 09:12:45 +00:00
shimon 873b30c96d sync against 1.7 2025-05-28 12:11:14 +03:00
shimon 22e28e9151 sync against 1.7 2025-05-28 12:10:31 +03:00
shimon 6b27b727b4 Merge branch '1.7.x' of github.com:appwrite/appwrite into delete-project-scope 2025-05-28 12:06:45 +03:00
Jake Barnby 9cd521390f Merge remote-tracking branch 'origin/1.6.x' into feat-sync-1.6
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Workers/Builds.php
2025-05-28 21:00:38 +12:00
Khushboo Verma 814abddf93 Truncate commit hash to 16 chars 2025-05-28 14:10:12 +05:30
Khushboo Verma aa07ba0027 Update app/controllers/api/vcs.php
Co-authored-by: Matej Bačo <matejbacocom@gmail.com>
2025-05-28 14:01:55 +05:30
Khushboo Verma 66ac440f9d Add missing separator 2025-05-28 12:55:50 +05:30
Khushboo Verma 320bf69208 Shorten commit url 2025-05-28 12:50:47 +05:30
shimon dab57db206 Merge branch '1.7.x' of github.com:appwrite/appwrite into delete-project-scope
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Platform/Workers/Deletes.php
2025-05-28 09:59:09 +03:00
Darshan 7e6f4befa5 reset: stuff from main. 2025-05-27 19:21:28 +05:30
Darshan 2de9b85d6b Merge branch 'main' into 'fix-teams-deletion'. 2025-05-27 19:16:40 +05:30
Jake Barnby d9a02fc0fa Merge branch '1.7.x' into chore-cli-release 2025-05-26 13:53:45 +00:00
Matej Bačo 44e16ce98d Fix commit URLs max length 2025-05-26 12:56:23 +02:00
Jake Barnby 2a5ecb2547 Release cli 2025-05-26 22:25:12 +12:00
Jake Barnby ab97b7cc54 Merge pull request #9877 from appwrite/revert-9871-feat-sync
Revert "Feat sync encrypt updates"
2025-05-26 21:37:41 +12:00
Jake Barnby b7d0c127a3 Revert "Merge pull request #9878 from ArnabChatterjee20k/dat-532"
This reverts commit a366feba80, reversing
changes made to 484988fcd7.
2025-05-26 21:37:21 +12:00
Darshan 64baf1071d fix: wrong variable passed to cache purge. 2025-05-26 11:38:22 +05:30
Darshan 856a9a714b fix: memberships patch and delete logic. 2025-05-26 11:29:46 +05:30
Darshan 24e0b3e8cb fix: missing project check. 2025-05-25 12:19:52 +05:30
Christy Jacob 28d2ed1baa Revert "Feat sequence" 2025-05-23 21:39:56 +04:00
Jake Barnby a366feba80 Merge pull request #9878 from ArnabChatterjee20k/dat-532
updated errro for the string encryption
2025-05-23 15:27:35 +00:00
ArnabChatterjee20k 49f8369fdd updated the message 2025-05-23 20:45:36 +05:30
ArnabChatterjee20k 6af9d1206d added a constant 2025-05-23 20:41:08 +05:30
ArnabChatterjee20k 14fe7a3293 updated errro for the string encryption 2025-05-23 20:35:59 +05:30
Jake Barnby 70feb72de0 Revert "Feat sync encrypt updates" 2025-05-24 03:04:46 +12:00
Jake Barnby d27dba05d2 Merge pull request #9841 from ArnabChatterjee20k/dat-532
added checking for encrypt and plan allowing encryption of string att…
2025-05-23 23:54:18 +12:00
Jake Barnby 1a2a725cb0 Merge pull request #9868 from ArnabChatterjee20k/dat-532
added encrypt property in the attribute string response model
2025-05-23 23:53:23 +12:00
Darshan a413a613f5 Merge branch 'main' into feat-sequence 2025-05-23 15:35:39 +05:30
Jake Barnby 5eab81cf03 Merge pull request #9868 from ArnabChatterjee20k/dat-532
added encrypt property in the attribute string response model
2025-05-23 09:03:42 +00:00
ArnabChatterjee20k b8cb6f281d linting 2025-05-23 14:19:00 +05:30
ArnabChatterjee20k 7c760e4b07 linting 2025-05-23 14:16:35 +05:30
ArnabChatterjee20k e586afceb7 updates 2025-05-23 14:11:57 +05:30
ArnabChatterjee20k 6ea3593921 updated collection filter 2025-05-23 13:40:56 +05:30
ArnabChatterjee20k 73764941b6 updated tests and collection method 2025-05-23 13:23:33 +05:30
Jake Barnby 587b84d04a Merge remote-tracking branch 'origin/1.7.x' into feat-sequence 2025-05-23 19:40:57 +12:00
ArnabChatterjee20k 1d0577b07d added encrypt to the get and list atttributes 2025-05-23 12:51:59 +05:30