Commit Graph

750 Commits

Author SHA1 Message Date
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
Jake Barnby 9427b07580 Add expired property directly to key 2025-02-12 21:22:08 +13:00
Jake Barnby 775e6ec9cf Fix role setting 2025-02-12 20:34:38 +13:00
Jake Barnby 5780ec9547 Make sure key has app role before continuing checks 2025-02-12 18:45:06 +13:00
Jake Barnby 1c91604c80 Only disable database reads/writes and network stats 2025-02-11 20:56:39 +13:00
Jake Barnby 7490240397 Fix name shadowing 2025-02-11 18:29:42 +13:00
Jake Barnby e5a3866065 Fix imports 2025-02-11 17:53:40 +13:00
Jake Barnby 30bc70b9b1 Abstract key decoding and check if usage is enabled 2025-02-11 17:49:22 +13:00
Bradley Schofield a27ba015e9 Merge branch '1.6.x' into feat-bulk-operations
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2025-02-11 09:23:49 +09:00
shimon 2106022507 Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support
# Conflicts:
#	composer.json
#	composer.lock
2025-02-09 10:06:56 +02:00
Matej Bačo 7ac83d7a9f Merge branch '1.6.x' into feat-sites 2025-02-06 14:23:50 +01:00
Chirag Aggarwal 24f11dc8d6 Merge branch '1.6.x' into feat-development-keys 2025-02-05 09:58:45 +00:00
Damodar Lohani cf66bee925 Merge remote-tracking branch 'origin/1.6.x' into feat-logs-db 2025-02-05 09:49:11 +00:00
Fabian Gruber a16f26d378 feat: add AMQP queues 2025-02-05 10:29:33 +01:00
shimon 4dc7206e04 Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support
# Conflicts:
#	composer.json
#	composer.lock
2025-02-04 21:12:11 +02:00
Chirag Aggarwal a98f32b5e1 merge with 1.7.x 2025-02-04 16:56:14 +00:00
Jake Barnby 386c6076b2 Merge branch '1.6.x' into feat-bulk-operations
# Conflicts:
#	composer.json
#	composer.lock
2025-02-05 01:52:35 +13:00
Chirag Aggarwal c8afd2c613 Merge branch '1.6.x' into feat-development-keys 2025-02-04 11:21:07 +00:00
Matej Bačo f9430d4d20 Merge branch '1.6.x' into fix-site-tests 2025-02-03 10:05:30 +01:00
Damodar Lohani 63c07a456f Merge branch '1.6.x' into feat-logs-db 2025-02-02 07:08:25 +05:45
Damodar Lohani cb31e7954e refactor rename 2025-01-30 04:53:53 +00:00
Bradley Schofield 9f043a1b58 Merge branch '1.6.x' into feat-migrations-dynamic-keys 2025-01-30 11:26:52 +09:00
Bradley Schofield ecaaa4be53 Make migrations use Dynamic keys for destination 2025-01-30 11:23:39 +09:00
shimon 850737c953 transformedAt for files addition 2025-01-29 22:12:31 +05:30
Shimon Newman f1f660352e Revert "Transformed at addition" 2025-01-29 10:30:35 +02:00
shimon f97b3aaa86 transformedAt for files addition 2025-01-28 16:49:55 +02:00
Damodar Lohani d84f6e4ee0 reset database listeners 2025-01-28 06:40:20 +00:00
Chirag Aggarwal f867fddaae Merge branch '1.6.x' into feat-development-keys 2025-01-27 10:33:58 +00:00
Damodar Lohani 3124554403 remove db listeners as counters are now done separately by usage worker 2025-01-27 07:39:33 +00:00
Bradley Schofield 8fb7a2db32 Merge branch '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/api/functions.php
#	app/controllers/api/migrations.php
#	app/controllers/api/projects.php
#	app/controllers/api/proxy.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	app/controllers/api/vcs.php
#	composer.json
#	composer.lock
#	docs/references/account/create-push-target.md
#	docs/references/account/delete-push-target.md
#	docs/references/account/update-push-target.md
#	src/Appwrite/SDK/Method.php
#	src/Appwrite/Specification/Format/OpenAPI3.php
#	src/Appwrite/Specification/Format/Swagger2.php
2025-01-23 11:19:20 +09:00
Jake Barnby 758d8496c1 Merge pull request #9237 from appwrite/feat-1.6.x-new-sdk-class
Implement new SDK Class on 1.6.x
2025-01-22 20:38:10 +13:00
Darshan bc533aeeaa update: change var name. 2025-01-21 12:11:20 +05:30
Darshan 3c3559aee5 update: apply comment suggestion. 2025-01-21 12:07:03 +05:30
Darshan f8f403a66a remove: comments. 2025-01-21 12:02:08 +05:30
Darshan be2929f07f Merge branch '1.6.x' into add-user-types 2025-01-21 11:56:36 +05:30
shimon b2f920d983 debug 2025-01-20 10:03:54 +02:00
shimon 3c152b8349 debug 2025-01-20 09:25:15 +02:00
Bradley Schofield e7b119abae Merge branch '1.6.x' into feat-1.6.x-new-sdk-class 2025-01-20 14:21:26 +09:00
shimon fe18afcfca Merge branch '1.6.x' of github.com:appwrite/appwrite into multi-region-support 2025-01-19 10:33:47 +02:00
Christy Jacob 5240d0f9c6 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into optimise-webhook-events 2025-01-17 11:48:41 +00:00
Christy Jacob 5b28e7c478 chore: review comments 2025-01-17 11:48:19 +00:00
Bradley Schofield 95dcb67747 Implement new SDK Class on 1.6.x 2025-01-17 13:31:39 +09:00
shimon 1ae7d730ba Merge branch '1.6.x' of https://github.com/appwrite/appwrite into multi-region-support 2025-01-16 15:04:52 +02:00
Darshan 25431adafb address comment: anonymous > guest. 2025-01-14 17:45:49 +05:30
Darshan fabf581d21 fix: tests. 2025-01-14 13:47:01 +05:30
Darshan e9479db0fa add: anonymous user type to audit/activity. 2025-01-14 13:18:11 +05:30
Darshan 377627118f address comments: change type names. 2025-01-12 18:27:58 +05:30