Commit Graph

174 Commits

Author SHA1 Message Date
Jake Barnby 3f3319df20 Merge remote-tracking branch 'origin/1.7.x' into 1.8.x
# Conflicts:
#	composer.lock
2025-08-13 21:04:46 +12:00
Matej Bačo 14faef323c Fix variables sharing across resources 2025-08-12 17:01:13 +02:00
Matej Bačo b816557970 Add fallback locale support + tests 2025-08-12 15:13:08 +02:00
Jake Barnby b418285349 Revert "Merge pull request #10299 from appwrite/feat-functions-redis-queue"
This reverts commit f81fd16d26, reversing
changes made to ec174a15cf.
2025-08-12 23:57:54 +12:00
Jake Barnby 38204a2c23 Merge remote-tracking branch 'origin/1.7.x' into 1.8.x
# Conflicts:
#	composer.lock
#	docker-compose.yml
#	tests/e2e/Services/Migrations/MigrationsBase.php
2025-08-12 17:38:02 +12:00
Matej Bačo 3efd9a778e Reapply "Feat: Make functions worker customizable"
This reverts commit 7e110bf292.
2025-08-11 15:07:05 +02:00
Jake Barnby 7e110bf292 Revert "Feat: Make functions worker customizable" 2025-08-12 00:38:41 +12:00
Matej Bačo 2b3a8527ff Make functions worker customizable 2025-08-08 17:15:14 +02:00
fogelito 6ead087e91 fix nesting if 2025-07-31 14:26:36 +03:00
fogelito eddc782c6e formatting 2025-07-29 11:24:41 +03:00
fogelito 19bd04e8c9 Skip empty queries 2025-07-29 11:10:25 +03:00
Jake Barnby d491a6db2d Fix consumers 2025-07-27 17:12:33 +12:00
Jake Barnby cdbd89b3f3 Merge remote-tracking branch 'origin/1.7.x' into 1.8.x
# Conflicts:
#	app/config/specs/open-api3-1.8.x-client.json
#	app/config/specs/open-api3-1.8.x-console.json
#	app/config/specs/open-api3-1.8.x-server.json
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-1.8.x-client.json
#	app/config/specs/swagger2-1.8.x-console.json
#	app/config/specs/swagger2-1.8.x-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/databases.php
#	composer.lock
#	tests/e2e/Services/Databases/Legacy/DatabasesBase.php
2025-07-27 16:07:04 +12:00
loks0n 1d86cc6010 feat: stats-usage on redis 2025-07-24 16:19:13 +01:00
hmacr 9c0e6f4203 Skip deployment when commit is created by us 2025-07-22 20:39:36 +05:30
Jake Barnby 51c95347a0 Merge remote-tracking branch 'origin/main' into 1.8.x
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/databases.php
2025-07-21 20:42:16 +12:00
Jake Barnby 97a4e5f355 Bump version 2025-07-18 21:38:35 +12:00
Jake Barnby b2fa28754d Merge remote-tracking branch 'origin/1.7.x' into 1.8.x
# Conflicts:
#	.github/workflows/benchmark.yml
#	composer.lock
#	src/Appwrite/Event/Database.php
2025-07-04 10:00:45 -04:00
Chirag Aggarwal df9ef1ace9 Merge branch '1.7.x' into feat-exp-scheme 2025-07-04 15:22:44 +05:30
Jake Barnby 5bb998b02d Add API + CLI stubs 2025-07-03 14:24:40 -04:00
Chirag Aggarwal e721a9f11c Merge branch '1.7.x' into feat-exp-scheme 2025-07-03 22:40:46 +05:30
Ariel Weinberger 199b9f7e6d fix nitpick 2025-07-03 11:06:36 -05:00
Ariel Weinberger d9486f38c4 fix: jwt auth database selection for admin mode
Use dbForPlatform for JWT user lookup in admin mode
2025-07-03 10:54:51 -05:00
Chirag Aggarwal 2d00052db6 fix: general test 2025-06-30 20:50:29 +05:30
Chirag Aggarwal 843d4d9ea0 chore: use origin validator 2025-06-30 19:29:42 +05:30
Chirag Aggarwal bfee98ca87 Merge branch '1.7.x' into feat-exp-scheme 2025-06-30 18:38:25 +05:30
Matej Bačo ba7903af55 Merge branch '1.7.x' into fix-rules-platform-check 2025-06-27 12:46:06 +02:00
Chirag Aggarwal 8027251224 Merge branch '1.7.x' into feat-exp-scheme 2025-06-27 09:21:27 +05:30
Matej Bačo 918ad8979d Fix flakyness of account tests 2025-06-26 18:07:59 +02:00
Matej Bačo df82340dae Improve code quality 2025-06-25 14:22:55 +02:00
Chirag Aggarwal dbc58655b2 Merge branch '1.7.x' into feat-exp-scheme 2025-06-25 07:53:28 +05:30
Matej Bačo b69ff36ddb Manual QA fixes 2025-06-23 11:57:06 +02:00
Matej Bačo c1bd493fbe Move refferer to resource; re-use in OPTIONS; re-use in platform check 2025-06-23 11:28:18 +02:00
Darshan 34e4299e10 Merge branch '1.8.x' into database-aliases 2025-06-17 10:13:38 +05:30
Jake Barnby 3729c6b1c2 Cast sequence 2025-06-16 13:24:48 -04:00
Darshan 6f16895e8b Merge branch '1.8.x' into 'database-aliases'. 2025-06-13 10:44:44 +05:30
Jake Barnby bc7b310c51 Merge remote-tracking branch 'origin/1.7.x' into 1.8.x 2025-06-12 12:20:34 -04:00
loks0n bc41838c66 chore: remove endpoint selector 2025-06-12 14:22:17 +01:00
Darshan 1ac22c0ae0 Merge branch '1.8.x' into 'database-aliases'. 2025-06-11 12:36:33 +05:30
Darshan fcdddf7bf0 address comments. 2025-06-11 12:21:48 +05:30
Jake Barnby c852cb3ed0 Merge remote-tracking branch 'origin/1.7.x' into 1.8.x
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Workers/Audits.php
2025-06-09 20:08:41 -04:00
Christy Jacob b47ab90665 Merge pull request #9940 from appwrite/PLA-2950
fix(gif preview): enable resource limits
2025-06-03 12:56:36 +04:00
Fabian Gruber 584ca3065f fix(gif preview): enable resource limits 2025-06-03 10:35:26 +02:00
Christy Jacob 809d31bba2 Merge branch '1.7.x' into storage-telemetry 2025-06-03 12:06:12 +04:00
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
Fabian Gruber 4fafb47508 Bring back telemetry for storage.
This reverts commit 6906a97c22.
2025-05-26 17:43:29 +02: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 86f7489640 Internal ID -> sequence 2025-05-26 17:42:11 +12:00