Commit Graph

7042 Commits

Author SHA1 Message Date
Matej Bačo 95aab45cc2 Fix merge issue 2025-02-19 16:01:05 +01:00
Matej Bačo 47395c5442 Fix failing tests regarding specs and failed builds 2025-02-19 14:58:59 +01:00
Matej Bačo acd1dd2479 Formatting fix 2025-02-19 12:56:27 +01:00
Matej Bačo 3932b8bdc1 Merge branch '1.7.x' into feat-sites 2025-02-19 12:54:05 +01:00
Matej Bačo 165caef9ab Merge branch '1.6.x' into 1.7.x 2025-02-19 12:40:07 +01:00
Christy Jacob d59d6f70a5 Merge pull request #9303 from appwrite/pla-2428
Add support endpoint url for S3
2025-02-18 16:28:44 +05:30
Christy Jacob 27d2cc9f00 Merge pull request #9348 from ChiragAgg5k/pla-2470
Fix resend team invite if already accepted
2025-02-18 15:10:11 +05:30
Jake Barnby 3e02b830ac Fix inject 2025-02-18 18:17:52 +13:00
Matej Bačo 2e4a8dec78 Fix CORS 2025-02-17 15:05:19 +01:00
Jake Barnby d6b9be8799 Merge remote-tracking branch 'origin/feat-key-segmented-usage' into feat-key-segmented-usage 2025-02-18 02:10:37 +13:00
Jake Barnby 0d79ae33ba Lint 2025-02-18 02:10:05 +13:00
Matej Bačo 685c141a59 Merge branch '1.6.x' into feat-key-segmented-usage 2025-02-17 14:06:40 +01:00
Jake Barnby 07a6d60b01 Remove leftover 2025-02-18 02:02:29 +13:00
Jake Barnby 77e83d5cfb Remove unused injections 2025-02-18 01:49:51 +13:00
Jake Barnby fe251c443f Remove leftover 2025-02-18 01:32:48 +13:00
Matej Bačo 2f2a743a7f Merge branch 'feat-sites' into feat-all-rules-in-proxy 2025-02-17 09:47:33 +01:00
Chirag Aggarwal 51438631da chore: added console check to ping 2025-02-14 15:40:08 +00:00
Matej Bačo 94f3cf7baf Merge branch 'feat-sites' into fix-site-cors 2025-02-14 12:05:21 +01:00
Matej Bačo 75320db428 Update transformation lib structure 2025-02-14 10:01:27 +01:00
Chirag Aggarwal 9ebb4b9626 Merge branch '1.6.x' into pla-2428 2025-02-14 09:04:30 +05:30
Matej Bačo a10882d7ee Update general.php 2025-02-13 19:59:29 +01:00
Matej Bačo ec05a3d668 Enable CORS for sites 2025-02-13 19:57:41 +01: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
Matej Bačo 81bfa5c48d Merge branch 'feat-sites' into feat-preview-branding 2025-02-12 16:35:31 +01:00
Matej Bačo e0369ec14f Avoid JS link 2025-02-12 14:09:32 +01:00
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
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
Matej Bačo 86a1fbe86a Fix preview domains 2025-02-11 16:26:00 +01:00
Matej Bačo 084b62116f Convert to library approach 2025-02-11 14:26:49 +01:00
Khushboo Verma 11477d67c9 Address PR comments 2025-02-11 18:20:54 +05:30
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
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 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
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 33f55c73a7 Revert cast Index 2025-02-10 10:42:29 +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 5b786e2a68 Catch index exception 2025-02-10 09:19:56 +02:00