Commit Graph

6937 Commits

Author SHA1 Message Date
Christy Jacob bfa253297b Merge branch 'main' of https://github.com/appwrite/appwrite into sync-1.6-main 2024-08-13 15:36:13 +00:00
Matej Bačo c1e62a4e11 Add api group to templates 2024-08-13 12:59:37 +00:00
Matej Bačo 380dc8a106 Fix manual templates 2024-08-13 10:50:58 +00:00
Jake Barnby 52647cef23 Merge remote-tracking branch 'origin/feat-single-shared-metadata-docs' into feat-migration
# Conflicts:
#	composer.json
#	composer.lock
2024-08-13 22:10:57 +12:00
Jake Barnby 73ca1efbeb Catch duplicate db on project create 2024-08-13 21:49:14 +12:00
Matej Bačo 1bf879f16a Merge remote-tracking branch 'origin/main' into fix-16x-qa 2024-08-13 09:05:53 +00:00
Christy Jacob 282f5088db Merge pull request #8523 from appwrite/refactor-console-links
Refactor console links
2024-08-13 01:12:31 +04:00
Binyamin Yawitz 22deb883c1 refactor: console links 2024-08-12 15:59:42 -04:00
Khushboo Verma e4cfcd00fd Updated composer.json 2024-08-12 23:17:22 +05:30
Jake Barnby 8ff72b341e Don't set tenant for project collections creation 2024-08-12 23:46:34 +12:00
Christy Jacob ec56ef9831 Merge pull request #8500 from appwrite/fix-keep-git
Fix keep git
2024-08-12 15:22:00 +04:00
Khushboo Verma 468a97bcd2 Merge branch '1.6.x' into feat-add-multipart-support 2024-08-12 15:39:46 +05:30
Christy Jacob 4f0a265520 Merge pull request #8503 from appwrite/feat-base-runtimes
feat: base runtimes key
2024-08-12 13:41:54 +04:00
Matej Bačo 47a0998211 Merge branch '1.6.x' into fix-4xx-executions-status 2024-08-12 09:54:55 +02:00
Khushboo Verma d895e62c81 Fixed GraphQL tests 2024-08-11 23:06:05 +05:30
Khushboo Verma 8667e9f821 Make application/json as default 2024-08-11 17:56:02 +05:30
Khushboo Verma f3e4987f6c Merge branch '1.6.x' into feat-add-multipart-support 2024-08-09 19:38:26 +05:30
loks0n e1c8cfc4a1 chore: refactor $key/$id names 2024-08-09 12:59:43 +01:00
loks0n f6dec62c50 feat: add base/key runtime 2024-08-09 12:56:55 +01:00
Binyamin Yawitz 95fe939136 feat: adding explanation 2024-08-08 13:50:25 -04:00
Binyamin Yawitz 1c6b735a27 feat: disconnecting git only when provider it is an empty string 2024-08-08 13:48:45 -04:00
Binyamin Yawitz 01f27874b2 fix: Addressing review 2024-08-08 10:03:10 -04:00
Binyamin Yawitz 844ec11bd3 Merge branch 'refs/heads/1.6.x' into feat-extract-team-deletion 2024-08-08 09:58:30 -04:00
Christy Jacob 07b695fae9 Merge pull request #8459 from appwrite/refactor-session-alerts
refactor: no session alerts for otp and magic-url logins
2024-08-08 17:42:43 +04:00
Khushboo Verma 516d05402f Merge branch 'feat-add-multipart-support' of github.com:appwrite/appwrite into feat-add-multipart-support 2024-08-08 15:43:35 +05:30
Khushboo Verma e6473db96c Update create execution body limit to 10MB 2024-08-08 15:42:58 +05:30
Matej Bačo b20ee17fea Merge remote-tracking branch 'origin/1.6.x' into fix-4xx-executions-status 2024-08-08 08:38:20 +00:00
Matej Bačo 25f5c83594 Fix 4XX execution status 2024-08-08 08:38:15 +00:00
Khushboo Verma e297371aa4 Merge branch '1.6.x' into feat-add-multipart-support 2024-08-08 14:07:12 +05:30
Matej Bačo 90c7ab5c05 Rename deployment method 2024-08-08 09:07:27 +02:00
Steven Nguyen 6410b2062c Merge pull request #8472 from ItzNotABug/fix-proxy-rules-check
Fix Domain Check
2024-08-07 22:17:45 -07:00
Bradley Schofield 9900f998bc Merge branch '1.5.x' into feat-runtime-controls-1.5.x 2024-08-08 12:39:56 +09:00
Binyamin Yawitz e672a0ebe2 Merge branch 'refs/heads/1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	src/Appwrite/Auth/Validator/MockNumber.php
2024-08-07 14:01:46 -04:00
Khushboo Verma 2f56c123c9 Merge branch '1.6.x' into feat-add-multipart-support 2024-08-07 18:46:46 +05:30
Khushboo Verma dcf1684c8c Update dynamic response method 2024-08-07 18:45:53 +05:30
Jake Barnby 6b86ed0117 Merge remote-tracking branch 'origin/1.5.x' into feat-migration
# Conflicts:
#	composer.lock
2024-08-07 22:10:04 +12:00
Binyamin Yawitz 9ed43ebbc2 Merge branch 'refs/heads/1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/controllers/api/functions.php
#	app/controllers/general.php
#	app/init.php
#	composer.lock
#	dev/xdebug.ini
#	src/Appwrite/Utopia/Response.php
2024-08-06 14:57:05 -04:00
Khushboo Verma d4cb90c608 Addressed PR comments 2024-08-06 23:01:09 +05:30
Steven Nguyen d900e88e7e Merge pull request #8416 from appwrite/fix-realtime-permission-change
Fix realtime permission change
2024-08-06 09:12:11 -07:00
Christy Jacob a019ada0e7 Merge branch '1.6.x' into feat-mock-numbers-review 2024-08-06 19:32:30 +04:00
Bradley Schofield e51f912ab1 Address Jake's comments and add 0.5 cpu spec 2024-08-06 18:54:46 +09:00
Khushboo Verma ccdfc8b1ea Resolve merge conflicts 2024-08-06 14:02:48 +05:30
Khushboo Verma 6691c985dd Add headers validator 2024-08-06 13:49:28 +05:30
Binyamin Yawitz 834fad78e1 refactor: Variables names 2024-08-05 16:20:52 -04:00
Christy Jacob ad9586e7c7 Merge pull request #8434 from appwrite/fix-redeployments
Fix: function redeployments
2024-08-05 17:38:44 +04:00
Khushboo Verma 6c6ef78238 Resolve conflict 2024-08-05 18:41:35 +05:30
Khushboo Verma 3190384d24 Add multipart support 2024-08-05 18:38:41 +05:30
Jake Barnby e2a45cec8e Merge branch '1.5.x' into feat-migration
# Conflicts:
#	composer.json
#	composer.lock
2024-08-05 21:13:42 +12:00
ItzNotABug b0441e5465 fix: domain check. 2024-08-03 12:26:21 +05:30
Bradley Schofield eaef82b613 Update functions.php 2024-08-02 17:00:42 +09:00