Commit graph

19 commits

Author SHA1 Message Date
Jake Barnby
dd25072cdf
Merge pull request #9868 from ArnabChatterjee20k/dat-532
added encrypt property in the attribute string response model
# Conflicts:
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
2025-05-27 13:57:51 +12:00
Jake Barnby
3158c15111
Merge remote-tracking branch 'origin/1.7.x' into 1.8.x
# Conflicts:
#	app/controllers/api/functions.php
#	app/controllers/api/project.php
#	app/controllers/api/proxy.php
#	app/controllers/api/storage.php
#	app/controllers/api/vcs.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/init/database/filters.php
#	composer.json
#	composer.lock
#	src/Appwrite/Migration/Migration.php
#	src/Appwrite/Migration/Version/V15.php
#	src/Appwrite/Migration/Version/V16.php
#	src/Appwrite/Migration/Version/V17.php
#	src/Appwrite/Migration/Version/V18.php
#	src/Appwrite/Migration/Version/V19.php
#	src/Appwrite/Migration/Version/V20.php
#	src/Appwrite/Migration/Version/V21.php
#	src/Appwrite/Platform/Tasks/Migrate.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Functions.php
#	src/Appwrite/Platform/Workers/StatsResources.php
#	src/Appwrite/Platform/Workers/StatsUsage.php
2025-05-27 13:36:23 +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
86f7489640
Internal ID -> sequence 2025-05-26 17:42:11 +12:00
Jake Barnby
a616aa0e93
Revert "Merge pull request #9877 from appwrite/revert-9871-feat-sync"
This reverts commit 1a0e82b4e4, reversing
changes made to 8bc5117259.
2025-05-26 17:36:55 +12:00
Christy Jacob
28d2ed1baa
Revert "Feat sequence" 2025-05-23 21:39:56 +04:00
Jake Barnby
70feb72de0
Revert "Feat sync encrypt updates" 2025-05-24 03:04:46 +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
ArnabChatterjee20k
e586afceb7 updates 2025-05-23 14:11:57 +05:30
ArnabChatterjee20k
6ea3593921 updated collection filter 2025-05-23 13:40:56 +05:30
Jake Barnby
04a9b0be34
Fix replace 2025-05-23 03:29:44 +12:00
Jake Barnby
71e3446498
Change internal ID to sequence 2025-05-23 02:55:29 +12:00
Matej Bačo
9993cca484 Merge branch '1.7.x' into feat-development-keys 2025-04-17 15:51:31 +02:00
Darshan
b358dad817 update: merge '1.7.x' on feat-development-keys. 2025-03-22 18:35:10 +05:30
Matej Bačo
2ff339dad4 Re-implement init changes 2025-03-17 11:53:09 +01:00
Eldad Fux
195edd19ac wip 2025-03-15 13:18:34 +01:00
Eldad Fux
50fe0bf98d Code review fix 2025-03-15 12:39:15 +01:00
Eldad Fux
1933e48d9c Cleanups 2025-03-15 12:00:36 +01:00