Commit Graph

7006 Commits

Author SHA1 Message Date
Chirag Aggarwal e59d95a108 Merge branch '1.6.x' into feat-development-keys 2025-02-13 18:25:39 +00:00
Chirag Aggarwal 351afffdfe Merge branch '1.6.x' into feat-development-keys 2025-02-13 17:55:37 +00:00
Chirag Aggarwal 2457485230 chore: removed redundant exception 2025-02-13 13:16:29 +00:00
Khushboo Verma f416e39098 Move create rule to module 2025-02-12 23:58:25 +05:30
Jake Barnby 6dbc8c5464 Allow disabling specific metrics in hooks via keys 2025-02-13 00:19:51 +13:00
Chirag Aggarwal e435e457de chore: added check for team membership exists 2025-02-12 09:50:13 +00:00
Khushboo Verma 11477d67c9 Address PR comments 2025-02-11 18:20:54 +05:30
Chirag Aggarwal ec5fd1d798 chore: remove showsensitive 2025-02-11 09:06:11 +00:00
Jake Barnby d04a5cab0d Merge remote-tracking branch 'origin/1.6.x' into feat-key-segmented-usage
# Conflicts:
#	composer.lock
2025-02-11 21:33:34 +13:00
Chirag Aggarwal f723948907 Merge branch '1.6.x' into chore-sensitive-check 2025-02-11 08:29:06 +00:00
Jake Barnby 0634a7eac3 Fix injections 2025-02-11 21:13:01 +13:00
Jake Barnby 1c91604c80 Only disable database reads/writes and network stats 2025-02-11 20:56:39 +13:00
Jake Barnby 2902b1bde8 Merge pull request #9329 from appwrite/catch-invalid-index
Catch invalid index
2025-02-11 20:34:10 +13:00
Jake Barnby 30bc70b9b1 Abstract key decoding and check if usage is enabled 2025-02-11 17:49:22 +13:00
Chirag Aggarwal 375f643214 refactor: triggering realtime events with queueForRealtime 2025-02-11 03:29:32 +00:00
Bradley Schofield d490879615 Update app/controllers/api/databases.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2025-02-11 09:24:35 +09:00
Bradley Schofield 709f616f7f Update app/controllers/api/databases.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2025-02-11 09:24:26 +09: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
Khushboo Verma f1989d0aba Fix project tests 2025-02-10 22:07:07 +05:30
Khushboo Verma 8557a9e1b1 Add secret param to update variable in function and projects 2025-02-10 16:06:31 +05:30
fogelito 7caab2f9ff IndexException 2025-02-10 10:55:37 +02:00
fogelito 23a9b519f6 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into catch-invalid-index 2025-02-10 10:37:05 +02:00
fogelito a032540b3c IndexException 2025-02-10 10:11:52 +02:00
fogelito 27709e7683 IndexException 2025-02-10 10:04:51 +02:00
fogelito 3092e765cc indexException 2025-02-09 18:34:41 +02: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
Damodar Lohani ec9045b488 add stats-resources health queue 2025-02-09 06:36:59 +00:00
Luke B. Silver 975393ae48 Revert "Restore "feat: custom app schemes""" 2025-02-07 17:34:58 +00:00
Matej Bačo 210349dc70 Merge branch '1.6.x' into feat-sites 2025-02-07 12:53:52 +01:00
Matej Bačo f93eb2072c Merge branch '1.6.x' into feat-sites 2025-02-07 11:00:35 +01:00
Luke B. Silver 9788a126a8 Revert "Revert "feat: custom app schemes"" 2025-02-07 09:53:26 +00:00
Luke B. Silver 2af026eabe Revert "feat: custom app schemes" 2025-02-07 09:51:27 +00:00
Chirag Aggarwal 989bbbc261 Merge branch '1.6.x' into pla-2428 2025-02-07 13:25:15 +05:30
Khushboo Verma 11ed6b8f47 Resolve merge conflicts 2025-02-07 11:16:30 +05:30
Khushboo Verma 8dd99b7d2a Add framework detection to Appwrite 2025-02-06 23:59:43 +05:30
Luke B. Silver e6efe5b27e Merge branch '1.6.x' into pla-2428 2025-02-06 13:58:58 +00:00
Matej Bačo 7ac83d7a9f Merge branch '1.6.x' into feat-sites 2025-02-06 14:23:50 +01:00
loks0n a4c8b74501 chore: revert storage 2025-02-06 11:24:29 +00:00
loks0n b69e78e5bf Merge branch '1.6.x' of https://github.com/appwrite/appwrite into fix-redirect-validator-v2 2025-02-06 11:22:49 +00:00
Damodar Lohani c27c3499aa fix endpoint and add test 2025-02-06 04:48:40 +00:00
Damodar Lohani 2efe1ed9dc new health endpoint 2025-02-06 04:24:04 +00:00
Damodar Lohani 87b3f535bd fix renaming 2025-02-06 03:36:53 +00:00
Matej Bačo 2e62837de6 Migrate module names 2025-02-05 11:30:19 +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
Damodar Lohani 4d43b41482 Merge remote-tracking branch 'origin/1.6.x' into feat-logs-db 2025-02-05 08:17:46 +00: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