Commit Graph

1103 Commits

Author SHA1 Message Date
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
shimon 197e32f128 debug 2025-02-19 13:52:14 +02:00
shimon 39e5c5e734 debug 2025-02-19 10:11:47 +02:00
Matej Bačo 2e4a8dec78 Fix CORS 2025-02-17 15:05:19 +01: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 fe251c443f Remove leftover 2025-02-18 01:32:48 +13:00
shimon a8a8df602f sync against 1.6.x 2025-02-17 10:30:53 +02:00
shimon 463bc4aac3 sync against 1.6.x 2025-02-15 06:28:19 +02: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
Matej Bačo 51e89f5110 Revert "Initial branch rule implementation"
This reverts commit 81a7ba536c.
2025-02-15 04:38:21 +01:00
Matej Bačo 81a7ba536c Initial branch rule implementation 2025-02-15 04:36:38 +01:00
Matej Bačo a6bcc3ce97 Fix bugs 2025-02-15 01:57:41 +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
shimon 00478e8533 _APP_DOMAIN_FUNCTIONS_FALLBACK 2025-02-14 11:08:43 +02:00
Matej Bačo 75320db428 Update transformation lib structure 2025-02-14 10:01:27 +01:00
Chirag Aggarwal 392803b5e8 chore: fix merge conflicts 2025-02-13 19:24:00 +00:00
Chirag Aggarwal a0138455bc fix: queueForStats naming 2025-02-13 19:21:15 +00:00
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 351afffdfe Merge branch '1.6.x' into feat-development-keys 2025-02-13 17:55:37 +00: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
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
Jake Barnby 1c91604c80 Only disable database reads/writes and network stats 2025-02-11 20:56:39 +13:00
Matej Bačo 7be0fbf616 Implementation of authorized previews 2025-02-10 15:07:01 +01:00
Matej Bačo 950255fab9 Merge branch 'feat-sites' into feat-spa 2025-02-10 09:17:28 +01:00
Matej Bačo 5c286c3334 Implement preview branding 2025-02-08 15:53:55 +01:00
Matej Bačo 2f03a33c15 Add template site and domain reclaiming tests 2025-02-08 12:11:09 +01:00
Matej Bačo 21c224709f Finish SPA integration 2025-02-08 10:36:11 +01: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 2af026eabe Revert "feat: custom app schemes" 2025-02-07 09:51:27 +00:00
Matej Bačo e992ed11c1 Fix unwanted redirects in functions 2025-02-06 11:08:28 +01:00
Matej Bačo 5882fda501 Fix site router 2025-02-05 16:17:03 +01:00
shimon 50400c4b43 _APP_DOMAIN_FUNCTIONS_FALLBACK 2025-02-05 13:14:03 +02:00
shimon 3cfb013f1e _APP_DOMAIN_FUNCTIONS_FALLBACK 2025-02-05 12:49:04 +02:00
shimon be27912a6e _APP_DOMAIN_FUNCTIONS_FALLBACK 2025-02-05 11:35:19 +02: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
Matej Bačo 36c9c002d1 Fix frozen 404 errors 2025-02-04 14:16:17 +01:00
Chirag Aggarwal cea308ef71 chore: remove confusing comment 2025-02-04 11:55:05 +00:00
Matej Bačo 3aafceab40 Improve CI/CD flaky tests 2025-02-03 11:38:36 +01:00
Matej Bačo 9f9ce61c3a Post-merge fixes 2025-02-03 10:32:01 +01:00
Matej Bačo f9430d4d20 Merge branch '1.6.x' into fix-site-tests 2025-02-03 10:05:30 +01:00
loks0n 8ab06d053f chore: refactor, dbless approach 2025-01-30 16:58:42 +00:00
Damodar Lohani cb31e7954e refactor rename 2025-01-30 04:53:53 +00:00