Commit graph

4373 commits

Author SHA1 Message Date
Jake Barnby
6159e9caa7
Merge remote-tracking branch 'origin/1.8.x' into feat-expose-sequence 2025-05-27 13:40:01 +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
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
Jake Barnby
554d8365a6
Format 2025-05-26 18:10:08 +12:00
Jake Barnby
d5999fde53
Ignore plan blocked test for cl 2025-05-26 18:03:03 +12:00
Jake Barnby
86f7489640
Internal ID -> sequence 2025-05-26 17:42:11 +12:00
Jake Barnby
c51cf2f3e4
Merge pull request #9878 from ArnabChatterjee20k/dat-532
updated errro for the string encryption
2025-05-26 17:37:57 +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
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
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
Jake Barnby
a8fb467df7
Update test 2025-05-23 22:53:08 +12:00
Jake Barnby
bc778f507d
Update to sequence 2025-05-23 22:51:20 +12:00
Jake Barnby
7861cb7c49
Merge branch 'feat-expose-sequence' into feat/auto-increment 2025-05-23 10:45:47 +00: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
e586afceb7 updates 2025-05-23 14:11:57 +05:30
ArnabChatterjee20k
73764941b6 updated tests and collection method 2025-05-23 13:23:33 +05:30
ArnabChatterjee20k
02426df1ca linting 2025-05-23 12:53:10 +05:30
ArnabChatterjee20k
1d0577b07d added encrypt to the get and list atttributes 2025-05-23 12:51:59 +05:30
ArnabChatterjee20k
1a4a10400b added test for the encrypted string in the server 2025-05-23 12:12:23 +05:30
ArnabChatterjee20k
0cccb75273 added encrypt property in the attribute string response model 2025-05-23 12:05:42 +05:30
ArnabChatterjee20k
70f7f71a95 Merge branch 'main' into feat/auto-increment 2025-05-22 23:56:40 +05:30
Jake Barnby
71e3446498
Change internal ID to sequence 2025-05-23 02:55:29 +12:00
Chirag Aggarwal
eda1bf3207 chore: update test 2025-05-21 11:05:25 +00:00
Jake Barnby
86b64fdee8
Merge pull request #9845 from appwrite/feat-sync-1.6.x
Sync 1.6.x
2025-05-21 09:59:56 +00:00
Jake Barnby
eab446a828
Merge pull request #9841 from ArnabChatterjee20k/dat-532
added checking for encrypt and plan allowing encryption of string att…
2025-05-21 08:51:31 +00:00
Matej Bačo
8734aeb314
Merge pull request #9844 from appwrite/1.7.x
Append build error to build logs
2025-05-21 10:15:20 +02:00
Jake Barnby
3ec0f08db1
Merge remote-tracking branch 'origin/1.6.x' into feat-sync-1.6.x
# Conflicts:
#	composer.lock
#	src/Appwrite/Messaging/Adapter/Realtime.php
#	src/Appwrite/Platform/Workers/Deletes.php
2025-05-21 20:15:08 +12:00
ArnabChatterjee20k
8796670c66 reverted test 2025-05-21 13:19:07 +05:30
ArnabChatterjee20k
9fa6deae61 reverted the tests and updated the plan checking condition 2025-05-21 13:14:22 +05:30
Jake Barnby
20f2cbffda
Merge pull request #9811 from ArnabChatterjee20k/upsert-single-document-route
Upsert single document route
2025-05-21 19:29:31 +12:00
ArnabChatterjee20k
43aae24132 updated tests for the custom server test 2025-05-21 11:38:34 +05:30
ArnabChatterjee20k
f534b9e460 added checking for encrypt and plan allowing encryption of string attribute 2025-05-21 11:00:01 +05:30
Khushboo Verma
3335f56cf6 Append build error to build logs 2025-05-20 21:15:05 +05:30
ArnabChatterjee20k
80e842444b updated test for upsertion 2025-05-20 14:28:16 +05:30
Jake Barnby
534096cac6
Merge branch '1.6.x' into feat-pool-adapter 2025-05-20 07:07:58 +00:00
ArnabChatterjee20k
b5d31d1b76 updated the upsert test for the relationship 2025-05-20 12:11:41 +05:30
ArnabChatterjee20k
559b6024bc linting 2025-05-19 16:00:38 +05:30
ArnabChatterjee20k
256aa684a2 updated tests 2025-05-19 15:59:38 +05:30
ArnabChatterjee20k
08478b8d39 removed document existence check for the document id
updated labels
added tests for upserts
2025-05-19 13:56:11 +05:30
Jake Barnby
bb7055fb47
Lint 2025-05-19 01:59:02 +12:00
Jake Barnby
4307bb8b33
Fix deprecated method usage 2025-05-19 01:56:25 +12:00
Matej Bačo
2bee98afcf Fix remaining tests 2025-05-18 12:51:07 +02:00
Matej Bačo
b228bdd9c7 Fix failing tests 2025-05-18 12:02:32 +02:00