Commit Graph

696 Commits

Author SHA1 Message Date
Matej Bačo af0c872999 Merge branch '1.6.x' into 1.7.x 2025-05-13 10:11:39 +02:00
Jake Barnby 1a32ce60bd Add on listener 2025-05-08 21:57:20 +12:00
Jake Barnby 9c50d60350 Handle upsert usage 2025-05-08 21:08:23 +12:00
Jake Barnby 572c49cc90 Revert "Don't accumulate docs on update/delete"
This reverts commit 8c1b9044b3.

# Conflicts:
#	app/controllers/api/databases.php
2025-05-07 15:44:58 +12:00
Jake Barnby 8c1b9044b3 Don't accumulate docs on update/delete 2025-05-07 03:10:13 +12:00
Matej Bačo 23c4fa27be Fix tests, linter 2025-04-25 12:57:45 +02:00
Matej Bačo d8103cb57e Merge branch '1.7.x' into 1.6.x 2025-04-25 12:18:04 +02:00
Matej Bačo d5cb9d0f1f Merge branch '1.7.x' into feat-tokens-module 2025-04-22 12:25:51 +02:00
Chirag Aggarwal 6d0d15f469 Merge branch '1.7.x' into feat-tokens-module 2025-04-18 16:01:06 +00:00
Chirag Aggarwal d130e7d3bd chore: add stricter checks according to review 2025-04-18 15:32:25 +00:00
Matej Bačo f8343e01cd PR review suggestions 2025-04-17 16:13:09 +02:00
Matej Bačo 9993cca484 Merge branch '1.7.x' into feat-development-keys 2025-04-17 15:51:31 +02:00
Chirag Aggarwal b2dffe4057 Merge branch '1.7.x' into feat-tokens-module 2025-04-17 06:19:18 +00:00
Jake Barnby cd72d70432 Merge remote-tracking branch 'origin/1.6.x' into feat-bulk-operations 2025-04-17 17:09:51 +12:00
Jake Barnby ba58a372d1 Throw on key not found 2025-04-16 10:50:53 +12:00
Chirag Aggarwal 76c7eb14eb chore: fix sdk fallback back to unknown 2025-04-15 12:08:18 +00:00
Shimon Newman c4a506445d Revert "Revert "Multi region support"" 2025-04-11 17:52:19 +03:00
Christy Jacob ffe153630d Revert "Multi region support" 2025-04-10 22:19:23 +05:30
Chirag Aggarwal 5a5d1752f9 Merge branch '1.7.x' into feat-development-keys 2025-04-09 09:02:20 +00:00
Jake Barnby cfab30b43f Merge remote-tracking branch 'origin/1.6.x' into feat-bulk-operations
# Conflicts:
#	app/init/resources.php
2025-04-09 16:31:52 +12:00
Damodar Lohani 8d0cdb8e7f Merge branch 'feat-sites' into fix-usage-sites 2025-04-08 14:30:43 +05:45
Matej Bačo 8e32ef1851 Merge branch '1.7.x' into feat-sites 2025-04-08 10:41:39 +02:00
shimon 0dc319d244 Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support 2025-04-03 11:30:14 +03:00
Damodar Lohani 1660c0b00c Fix: image transformation cache 2025-04-03 02:44:29 +00:00
Damodar Lohani 1af638deef new resource type metrics 2025-04-01 02:21:52 +00:00
Damodar Lohani ac152a76b5 Fix: usage stats changes 2025-03-31 06:28:58 +00:00
Jake Barnby 5aca1fcfa9 Fix content type usage 2025-03-27 21:03:28 +13:00
shimon cb2d0dc592 adding custom domain validation against _APP_CUSTOM_DOMAIN_DENY_LIST 2025-03-26 09:07:38 +02:00
shimon dedcdc2e0e adding region query to deleteProjectsByTeam 2025-03-25 19:13:11 +02:00
shimon 16aca35bd4 debug 2025-03-24 20:33:51 +02:00
shimon 69bdf50c85 debug 2025-03-20 18:27:23 +02:00
shimon ea02639767 debug 2025-03-20 18:15:51 +02:00
Matej Bačo 725dff7f0f Merge branch '1.7.x' into feat-sites 2025-03-13 11:41:28 +01:00
Chirag Aggarwal 3f133cab74 Merge branch '1.7.x' into feat-tokens-module 2025-03-06 15:25:42 +00:00
shimon 3bc81c82ec Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support
# Conflicts:
#	src/Appwrite/Platform/Workers/Usage.php
2025-03-05 17:29:57 +02:00
Jake Barnby d809ab1ff3 Merge branch 'feat-bulk-operations' of github.com:appwrite/appwrite into feat-bulk-operations
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2025-03-05 12:47:47 +13:00
Jake Barnby a5c4fe0a2d Merge remote-tracking branch 'origin/1.6.x' into feat-bulk-operations
# 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
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
#	docs/references/databases/create-document.md
2025-03-05 12:44:39 +13:00
Chirag Aggarwal 6bc72cf43f Merge branch '1.6.x' into feat-development-keys 2025-03-04 21:28:14 +05:30
shimon b314ae8208 disable transformedAt update for console users 2025-03-03 15:19:49 +02:00
shimon 368b61493f Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support
# Conflicts:
#	composer.lock
2025-02-27 10:29:06 +02:00
Chirag Aggarwal 431eea2787 Merge branch '1.6.x' into feat-development-keys 2025-02-21 09:24:04 +00:00
Matej Bačo 95aab45cc2 Fix merge issue 2025-02-19 16:01:05 +01:00
Matej Bačo 3932b8bdc1 Merge branch '1.7.x' into feat-sites 2025-02-19 12:54:05 +01:00
Jake Barnby 3e02b830ac Fix inject 2025-02-18 18:17:52 +13:00
Jake Barnby 07a6d60b01 Remove leftover 2025-02-18 02:02:29 +13:00
shimon e597ee4493 Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support
# Conflicts:
#	app/http.php
2025-02-15 06:24:48 +02:00
Chirag Aggarwal 392803b5e8 chore: fix merge conflicts 2025-02-13 19:24:00 +00:00
Chirag Aggarwal 351afffdfe Merge branch '1.6.x' into feat-development-keys 2025-02-13 17:55:37 +00:00
Jake Barnby 6dbc8c5464 Allow disabling specific metrics in hooks via keys 2025-02-13 00:19:51 +13:00
Jake Barnby 2449b76676 Format 2025-02-12 21:25:53 +13:00