Commit Graph
23345 Commits
Author SHA1 Message Date
Jake Barnby 5bb37803ff Merge branch 'feat-migration' into feat-migration-multi-region
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Workers/Certificates.php
2024-10-31 22:50:29 +13:00
Jake Barnby 83e94629dc Merge remote-tracking branch 'origin/feat-custom-cf-hostnames' into feat-migration 2024-10-31 21:49:49 +13:00
Jake Barnby 8aeaabf03a Fix merge 2024-10-31 16:47:37 +13:00
Jake Barnby fca576a1d4 Merge remote-tracking branch 'origin/multi-region-support' into feat-migration-multi-region
# Conflicts:
#	app/controllers/api/projects.php
#	composer.json
#	composer.lock
2024-10-30 16:57:29 +13:00
shimon a6104ad8cd Merge branch '1.6.x' of https://github.com/appwrite/appwrite into multi-region-support
# Conflicts:
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Workers/Functions.php
2024-10-29 18:00:54 +02:00
Fabian Gruber 6e3160c502 Merge branch '1.6.x' into feat-custom-cf-hostnames 2024-10-29 16:15:54 +01:00
Christy Jacob 6bdb1ccabc Merge pull request #8895 from appwrite/PLA-1776
use resource type constants
2024-10-29 19:15:31 +04:00
Fabian Gruber fed9cdb408 use resource type constants 2024-10-29 16:10:57 +01:00
Christy Jacob 3ec21cf906 Merge pull request #8892 from appwrite/fix-translation-commas
fix: translation commas
2024-10-29 18:40:13 +04:00
Fabian Gruber 104ec3188f Merge branch '1.6.x' into feat-custom-cf-hostnames 2024-10-29 15:36:38 +01:00
Christy Jacob 5a3912c415 Merge pull request #8857 from appwrite/PLA-1776
fix: revert function execution order
2024-10-29 18:35:50 +04:00
Fabian Gruber 3d463c5c81 fix: revert function execution order 2024-10-29 13:52:06 +01:00
loks0n edddaa561f fix: remove commas where unusual 2024-10-29 12:46:25 +00:00
loks0n be67725fea feat: localise commas 2024-10-29 12:43:08 +00:00
loks0n 242130a752 fix: otpSession.hello 2024-10-29 11:33:21 +00:00
shimon 4e37699e25 debug 2024-10-29 11:15:55 +02:00
Steven Nguyen 894b6f478d Merge pull request #8889 from appwrite/fix-migrations-queries
Fix missing allow attribute
2024-10-28 20:40:40 -07:00
Jake Barnby 64dd4bdce1 Add response model rule 2024-10-29 15:56:08 +13:00
Jake Barnby 299664d18b Fix missing allow attribute 2024-10-29 15:23:46 +13:00
shimon 118252d3af injecting poolForQueue to schedulers 2024-10-28 12:04:58 +02:00
shimon 509f06c2f0 injecting poolForQueue to schedulers 2024-10-28 11:41:59 +02:00
shimon 12458af84a injecting poolForQueue to schedulers 2024-10-28 11:34:02 +02:00
shimon 66bfc5748b injecting poolForQueue to schedulers 2024-10-28 11:15:41 +02:00
shimon cf32ba0351 debug 2024-10-27 18:10:30 +02:00
Fabian Gruber b47a4703c4 Merge branch '1.6.x' into feat-custom-cf-hostnames 2024-10-25 13:39:12 +02:00
Christy Jacob 52936d7eb5 Merge pull request #8855 from appwrite/PLA-1776
fix(blocks): check if resource is blocked inside functions worker
2024-10-25 15:38:41 +04:00
Fabian Gruber 4313162b5e fix(blocks): check if resource is blocked inside functions worker 2024-10-25 13:25:54 +02:00
Fabian Gruber 4ceff430f9 Merge branch '1.6.x' into feat-custom-cf-hostnames 2024-10-24 12:49:26 +02:00
Christy Jacob 0df3bbec24 Merge pull request #8812 from appwrite/PLA-1776
feat: allow blocking based on resource attributes
2024-10-24 14:47:44 +04:00
Fabian Gruber 225e2c21c3 feat: allow blocking based on resource attributes 2024-10-24 11:26:25 +02:00
Christy Jacob 5603516d88 Merge branch '1.6.x' into feat-custom-cf-hostnames 2024-10-23 23:56:43 +04:00
Christy Jacob 3cc53acbf2 Merge pull request #8848 from appwrite/feat-change-default-function-spec
feat: use 1 instead of 0.5 cpu
2024-10-23 18:56:17 +04:00
loks0n 51fe894a3f Revert "Merge pull request #8757 from ItzNotABug/update-walter-references"
This reverts commit a49c3a33f0, reversing
changes made to 3887ba69d7.
2024-10-23 15:20:45 +01:00
loks0n 6f7d8d7f62 chore: add comment 2024-10-23 15:16:15 +01:00
loks0n f7633c9c3b Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-change-default-function-spec 2024-10-23 15:10:33 +01:00
Christy Jacob 5fa4711247 Merge pull request #8846 from appwrite/PLA-1797
fix: allow '.wav' as 'audio/x-wav' as well
2024-10-23 18:08:41 +04:00
loks0n 62096dc008 chore: use 1 instead of 0.5 cpu 2024-10-23 14:22:37 +01:00
Fabian Gruber de8d0d4406 fix: allow '.wav' as 'audio/x-wav' as well 2024-10-23 11:57:50 +02:00
Jake Barnby 17526500ad Update audit and abuse 2024-10-23 18:42:27 +13:00
Jake Barnby 013d95ebf3 Update audit and abuse 2024-10-23 18:42:00 +13:00
Jake Barnby b80256e196 Merge remote-tracking branch 'origin/multi-region-support' into feat-migration-multi-region
# Conflicts:
#	app/cli.php
#	app/controllers/api/projects.php
#	composer.json
#	composer.lock
2024-10-23 18:33:09 +13:00
Jake Barnby eca8d116c2 Fix attributes 2024-10-23 18:10:41 +13:00
Jake Barnby 8210808db0 Improve logic 2024-10-23 18:00:06 +13:00
Jake Barnby 4a003f2826 Force create audit/abuse metadata documents for shared tables v1 2024-10-23 17:41:44 +13:00
Christy Jacob 54f39494c0 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-custom-cf-hostnames 2024-10-22 19:51:03 +00:00
Christy Jacob ae4edf119f chore: linter 2024-10-22 19:49:10 +00:00
shimon 7be7b3389c debug 2024-10-22 21:31:32 +03:00
shimon 54555cb3cd updates 2024-10-22 19:39:57 +03:00
Fabian Gruber a56293e018 chore: replace 'Expires' with 'Cache-Control: private' header to avoid CDN caching 2024-10-22 12:18:58 +00:00
Christy Jacob 5bec7a2c75 Merge pull request #8836 from appwrite/PLA-1790
chore: replace 'Expires' with 'Cache-Control: private' header to avoid CDN caching
2024-10-22 14:30:16 +04:00